diff options
author | Aric Belsito <lluixhi@gmail.com> | 2017-11-06 12:35:50 -0800 |
---|---|---|
committer | Aric Belsito <lluixhi@gmail.com> | 2017-11-06 12:35:50 -0800 |
commit | 1163a7d82b2f7d3f99a9edb4f6f34d257eba9b83 (patch) | |
tree | 4369cf3cbb29c8a483724370924b500ec8bf1396 /media-gfx | |
parent | sys-apps/smartmontools: fix metadata.xml (diff) | |
download | musl-1163a7d82b2f7d3f99a9edb4f6f34d257eba9b83.tar.gz musl-1163a7d82b2f7d3f99a9edb4f6f34d257eba9b83.tar.bz2 musl-1163a7d82b2f7d3f99a9edb4f6f34d257eba9b83.zip |
media-gfx/exiv2: add most recent version
Use patch from upstream to close #51
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/exiv2/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/exiv2/exiv2-0.26_p20171104.ebuild | 129 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch | 83 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-musl.patch | 33 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch | 28 |
5 files changed, 278 insertions, 0 deletions
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 54fa081d..ce16398e 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -5,6 +5,11 @@ AUX exiv2-0.25-fvisibility-hidden.patch 700 SHA256 2d0eb374e3df7dd58a513b616786e AUX exiv2-0.25-hide-symbols.patch 4098 SHA256 b6fe63951717360caad547275c3810c42803ef2d8dea25c75e02b45b9d7add9e SHA512 aed6746329b12769d8084ca79a99eccd6b52449b80c0b3d1c1d6b22294c2b62398366f0715efa207e2ace0ed52740a8eb81af58d17322d42a4674336fd24e725 WHIRLPOOL ac8e900303ac0b19f24b5eff13791dd42459395763d4c8795ff978c1f2c05431b3f3586dedd2b7df375452d3826d7356fc190c4ba3bc8fc4713792bc9d31d033 AUX exiv2-0.25-musl.patch 464 SHA256 c32333fa1d157bd2b14aaf18e19c2a67511baad89a9b526d6f984bb955dbf9ee SHA512 25e7d53fd2840d1166795a0a27c07de9370f493b1c8a047a020b73fe9330303d97a48414937c25e5aa5961fa7d416b10e4e3ea6b35008e4d9705ed19d71bb85d WHIRLPOOL 0e71a59b5fa87633c98e46385260835077e3a93c7a9aad9022c58060efbfecba295c37726d248580b9a79ee7cecdc8f0e23f24cfcaa1085ab33e44f33bbc5d49 AUX exiv2-0.25-tools-optional.patch 1332 SHA256 6c9a3ed5c2b9acff10c3b2f2dd2ca639936beaf6263526b9d85ede579a1d67e1 SHA512 14a8703b86dc4a7a1f210e26bd6532c529f850dd1b25ef116c703a576c389a120e3f8b1087e289cd8b44073071ac88a97503dc2c0cf72f21d32094b2cabbc58c WHIRLPOOL dc7efa7ddcaf1be665cd79aff0b36a0f2b135a87a3a93f9cb6091105b965b4b009e569c447d54d602482410ec59d674d99a71bee2699e8007575b8e2cc727998 +AUX exiv2-0.26-fix-docs.patch 2532 SHA256 57c5033858334a7590592f60fbd0461f96a998b11d36255a2710378382d37561 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4 WHIRLPOOL 8f13c9e536a51e465e6496879487a61f36713439ae274cae2000c7c4969b3b69fd3b94f60db4b5a6e23380b8a9a134d959542b7fdba1338b8d32270373eec01f +AUX exiv2-0.26-musl.patch 1123 SHA256 a4b19fdf80b0c5c8573494d70871b16fc1dc880a91f57c5db3b08d85d9996fdc SHA512 bf8244585e5667b667da8925b4c638ace7a523d9e3d22d9eedc63af0011d2b7ed500b027bdb058906b431a28fc1a5b2b39be0cb44b430891576a5767722c23a7 WHIRLPOOL 9d29394816c4585de7734113af572c45b8f01f3675f92f748654b8c7855e548a6d15253d63f381cfff404d47d15b5497cc6218199fa38d4252907c5d575a4dd0 +AUX exiv2-0.26-tools-optional.patch 1386 SHA256 6d036435885f0b9be480410732e4a8a0d787903c25f4b9dd89a1bf69a37012d2 SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483 WHIRLPOOL f40003b04f3b5b751dba392e07b06c97a5a41eada24154e962ca41cd2473ecf43f866808ac930a0c9da8c2b82a85416a47c8e298e01723e3cd2f217fd4bf3667 DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac +DIST exiv2-0.26_p20171104.tar.gz 28368697 SHA256 f7a46c0b1d3d3c30518202e62dbe086029f584a064bbb531a0ab11270a454007 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474 WHIRLPOOL 7baf5fcde327b2e1decde48f44b616f98fab7c65d22ee5e94e0b356fad4d7950c116db17a94b3c91954ac1565c3fe2853b83262c0a4597744dea708b304dce09 EBUILD exiv2-0.25-r2.ebuild 3104 SHA256 790f4ad93ca7799eba393f76a30e3dcdf5148834ce85b2a2e8f095da8ca9c0b9 SHA512 7ef6da58f714555f7065891a984e83e19e14c22e71a45d4ec4f1aff7a49404628b07f8b371efb26ad06f53e452a8ee61cb556df20c8c0706be3990716a823402 WHIRLPOOL cf3f43c404d456bfd989fb0bb620db4fc12d7297adf68f6e90b10fd1b59a43b34dc8fe14483e03a2983bc9df704e6963505ce693bbdb42b3b1b111bd81d6961e +EBUILD exiv2-0.26_p20171104.ebuild 3198 SHA256 f0d33a0b4c5209bf8ed9bd18932a3e14ec0e2774963cf27b29132d0eb8a294e2 SHA512 f62e555f9cf33da0ec1fa9b1b02e6cc915787845a0ca762aa5ad23dc34c0e8ab94a6eff262f3a414dda0054c65ee7e93c7eea8c8885c89c6e4edf5e2025183a6 WHIRLPOOL 635312514526d53a918e381985724b496e1a46ca870465af851cee8f4688e832ef52474cf3976bdbce5cd5fe98927fbd4cd3a92ef2bd119db5c1612f04250c80 MISC metadata.xml 612 SHA256 2700f3a6eb0fea03635790e9e55611f58a19dace74c70d0e0106bd70ef825c60 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 WHIRLPOOL 0996d01f595fe4ab40a65fcc19d2eced4dc31a1c8efddddca353828447ff3ca974499dcc81482d47a3470d9530a1886abde9acfaa2ac75df0e845f1a70402056 diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild new file mode 100644 index 00000000..6ca49219 --- /dev/null +++ b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" + EGIT_BRANCH="0.26" + GIT_ECLASS=git-r3 +else + COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d + SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +fi +inherit cmake-multilib python-any-r1 vcs-snapshot + +DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" +HOMEPAGE="http://www.exiv2.org/" + +LICENSE="GPL-2" +SLOT="0/26" +IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})" + +RDEPEND=" + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + webready? ( + net-libs/libssh[${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] + ) + xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + doc? ( + ${PYTHON_DEPS} + app-doc/doxygen + dev-libs/libxslt + media-gfx/graphviz + virtual/pkgconfig + ) + nls? ( sys-devel/gettext ) +" + +DOCS=( README doc/ChangeLog doc/cmd.txt ) + +PATCHES=( + # TODO: Take to upstream + "${FILESDIR}"/${PN}-0.26-fix-docs.patch + "${FILESDIR}"/${PN}-0.26-tools-optional.patch + "${FILESDIR}"/${PN}-0.26-musl.patch +) + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != *9999 ]] ; then + if [[ -d po ]] ; then + pushd po > /dev/null || die + local lang + for lang in *.po; do + if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then + case ${lang} in + CMakeLists.txt | \ + ${PN}.pot) ;; + *) rm -r ${lang} || die ;; + esac + fi + done + popd > /dev/null || die + else + die "Failed to prepare LINGUAS - po directory moved?" + fi + fi + + # FIXME @upstream: + einfo "Converting doc/cmd.txt to UTF-8" + iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die + mv -f doc/cmd.txt.tmp doc/cmd.txt || die + + if use doc; then + einfo "Updating doxygen config" + doxygen &>/dev/null -u config/Doxyfile || die + fi + + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DEXIV2_ENABLE_BUILD_SAMPLES=NO + -DEXIV2_ENABLE_BUILD_PO=$(usex nls) + -DEXIV2_ENABLE_NLS=$(usex nls) + -DEXIV2_ENABLE_PNG=$(usex png) + -DEXIV2_ENABLE_CURL=$(usex webready) + -DEXIV2_ENABLE_SSH=$(usex webready) + -DEXIV2_ENABLE_WEBREADY=$(usex webready) + -DEXIV2_ENABLE_XMP=$(usex xmp) + -DEXIV2_ENABLE_LIBXMP=NO + $(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO) + ) + + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile + + if multilib_is_native_abi; then + use doc && emake -j1 doc + fi +} + +multilib_src_install_all() { + use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) + use doc && HTML_DOCS=( "${S}"/doc/html/. ) + + einstalldocs + find "${D}" -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc samples/*.cpp + fi +} diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch new file mode 100644 index 00000000..05ea18d6 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch @@ -0,0 +1,83 @@ +--- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200 ++++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200 +@@ -216,9 +216,7 @@ + ADD_SUBDIRECTORY( xmpsdk ) + ADD_SUBDIRECTORY( src ) + +-IF( EXIV2_ENABLE_BUILD_SAMPLES ) +- ADD_SUBDIRECTORY( samples ) +-ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) ++ADD_SUBDIRECTORY( samples ) + + IF( EXIV2_ENABLE_BUILD_PO ) + ADD_SUBDIRECTORY( po ) +--- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200 ++++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200 +@@ -21,6 +21,10 @@ + include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") + +-SET( SAMPLES addmoddel.cpp ++SET( SAMPLES taglist.cpp ) ++ ++IF( EXIV2_ENABLE_BUILD_SAMPLES ) ++ SET( SAMPLES ${SAMPLES} ++ addmoddel.cpp + convert-test.cpp + easyaccess-test.cpp + exifcomment.cpp +@@ -38,7 +42,6 @@ + mmap-test.cpp + prevtest.cpp + stringto-test.cpp +- taglist.cpp + tiff-test.cpp + werror-test.cpp + write-test.cpp +@@ -47,6 +50,7 @@ + xmpparser-test.cpp + xmpsample.cpp + ) ++ENDIF() + + FOREACH(entry ${SAMPLES}) + STRING( REPLACE ".cpp" "" target ${entry}) +@@ -63,6 +67,7 @@ + SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c ) + ENDIF( MSVC ) + ++IF( EXIV2_ENABLE_BUILD_SAMPLES ) + SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp ) + ADD_EXECUTABLE( metacopy ${MC_SRC} ) + TARGET_LINK_LIBRARIES( metacopy exiv2lib ) +@@ -79,6 +84,7 @@ + # ****************************************************************************** + # Man page + INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) ++ENDIF() + + # That's all Folks! + ## +--- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200 ++++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200 +@@ -143,7 +143,7 @@ + xmp_mwg-rs \ + xmp_mwg-kw + +-TAGLIST = ../../bin/taglist ++TAGLIST = ../../src/bin/taglist + + # ********************************************************************** + # ====================================================================== +diff --git a/doc/cmake_doc.sh b/doc/cmake_doc.sh +index 44dd6760..5910a86d 100755 +--- a/doc/cmake_doc.sh ++++ b/doc/cmake_doc.sh +@@ -16,7 +16,7 @@ if [ $# == 1 ]; then + mv src/exv_conf.h.keep src/exv_conf.h + fi + mkdir -p src/bin/ +- cp -f "${CMAKE_BINARY_DIR}/bin/taglist" src/bin/ ++ cp -f "${CMAKE_BINARY_DIR}/samples/taglist" src/bin/ + make doc + fi + diff --git a/media-gfx/exiv2/files/exiv2-0.26-musl.patch b/media-gfx/exiv2/files/exiv2-0.26-musl.patch new file mode 100644 index 00000000..ed4f0108 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-musl.patch @@ -0,0 +1,33 @@ +From d775683f579543c35463ab2a8d9425da10d2f016 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Wed, 4 Oct 2017 00:15:30 -0500 +Subject: [PATCH] Amend fix for #9 to apply to other Unix systems + +At least the musl libc on Linux has the same issue as Mac OS X: the +PTHREAD_RECURSIVE_* static initialiser does not exist. This is a +documented and purposeful omission: + +http://www.openwall.com/lists/musl/2017/02/20/3 + +This commit uses similar logic to the Apple test on other Unixes. +--- + src/actions.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/actions.cpp b/src/actions.cpp +index fe14de40..aa15ec7d 100644 +--- a/src/actions.cpp ++++ b/src/actions.cpp +@@ -2051,7 +2051,11 @@ namespace { + static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; + #endif + #else +- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++ #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) ++ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++ #else ++ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; ++ #endif + #endif + #endif + diff --git a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch new file mode 100644 index 00000000..686b37ff --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt 2017-06-07 00:14:25.374608170 +0200 ++++ b/CMakeLists.txt 2017-06-07 00:17:00.680483299 +0200 +@@ -60,6 +60,7 @@ + OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) + SET ( EXIV2_ENABLE_DYNAMIC_RUNTIME OFF ) + ENDIF() ++OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON ) + + # set include path for FindXXX.cmake files + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") +--- a/src/CMakeLists.txt 2017-06-07 00:14:25.368608098 +0200 ++++ b/src/CMakeLists.txt 2017-06-07 00:16:06.710831682 +0200 +@@ -317,10 +317,12 @@ + + # ****************************************************************************** + # exiv2 application +-ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) ++IF(EXIV2_ENABLE_TOOLS) ++ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) + target_compile_definitions(exiv2 PRIVATE EXV_LOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}" ) +-TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) +-INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) ++ INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ENDIF( EXIV2_ENABLE_TOOLS ) + + # ****************************************************************************** + # connection test application |