From 734d2dac3e96161f025c33aa2d518d798cd06580 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Nov 2023 05:13:16 +0000 Subject: gentoo auto-resync : 22:11:2023 - 05:13:16 --- media-gfx/exiv2/Manifest | 3 +- media-gfx/exiv2/exiv2-0.28.1-r1.ebuild | 132 ++++++++++++++++++++++ media-gfx/exiv2/exiv2-0.28.1.ebuild | 129 --------------------- media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch | 31 +++++ 4 files changed, 165 insertions(+), 130 deletions(-) create mode 100644 media-gfx/exiv2/exiv2-0.28.1-r1.ebuild delete mode 100644 media-gfx/exiv2/exiv2-0.28.1.ebuild create mode 100644 media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch (limited to 'media-gfx/exiv2') diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 87d48565e938..3cd00795355b 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,7 +1,8 @@ +AUX exiv2-0.28.1-exiv2lib.patch 1234 BLAKE2B 9e1763763e5bbb84850152b9d67bd1a8f20df6e8936d4bed7809214a80cb25f4d8512b98ddea47463401f1736f55c064752799082b164f43e122ae2057686fe2 SHA512 21228d11844b0868073f26b0d4817e82a2e4219af21902547bfc1d11447d5bffe4931f7d3dcf0abd68a08ed0ae3f6e762e46edb854b8f24b71bb1da771bb91e1 DIST exiv2-0.27.7-Source.tar.gz 32290404 BLAKE2B ac83c36dd15c7f6aa2d6607542a12b981d1b58bed671047d3dbfdc9eea64a977630863e4c4abe1e9c2e3e8af05adf6849a05d70e42cde4bb0d6f4a3fbb9b2e49 SHA512 8f12b056439867a05b6dfe4b93a82e02d9e5032554b590e399bcf38d73208a783f8349e66870cc030ad2a47650389d96522b60086b308145121646c9fa93d8ae DIST exiv2-0.28.0.tar.gz 45138274 BLAKE2B 6ccdc4e6a7dbd4aa2a892e61306f0c63659d804075cae9e771096cfdc21ec0aff0df22232c036551f4e321f497184e7ad100fb9c2011c14cd0315e8118c3e85f SHA512 35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad DIST exiv2-0.28.1.tar.gz 45225200 BLAKE2B a26f8e54cf6284c56ff429c13d5a8985dc6181a36b4c13ea6f2e59bc00016a2a8d915ddbc0cedb441b8283e30f18312a500900ffd89ca984006ac84807a03852 SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b EBUILD exiv2-0.27.7.ebuild 2806 BLAKE2B f562fe2587be570e17da851d505c1a3a0dbdd06a800ae9b563375d85e8ee726b984c576875a6f2e215d0097b1846a36155f742e3a770e41873badaad3a5d06ab SHA512 88b0e6b3721916791f91d5028d5b7a237141bf9520750fc33b989072a310cc40a934f8876723db2cc170af32340a0f6376ee58c0bc956a158f0eb945a4cced44 EBUILD exiv2-0.28.0.ebuild 3171 BLAKE2B ab540aa9f8ee8f7876ecf8304818cc650840554ab6b1e4065c05d5c3d7c13c1d3db971984494e0f6b5a549d8ad5b71cc67ceff05a10856f102a6c0b7ef27a068 SHA512 bd858b12c5554eb1ed1d1ed857c7bf4576d4289a61d2bffcd694f13db542c855fbc03c9efa1276e5b4145a584316933a992888f0663ed180ef7c5106dd86d0e6 -EBUILD exiv2-0.28.1.ebuild 3176 BLAKE2B 4611b54d438ffb9f375f56c3a62938e574304cc0467e5b05a9f03e934adc00db5bd3eef91953cecde97b7a3d37dbef56acbec5a0285b6f99720c5701717c8283 SHA512 88324d792263d8a43d3c329517c73e9dce754c5094dae664f3623b1c500d790684f66c5722940e7650ecc5e75fb897496d6a7fccdef59f0ca32a6914b7606f44 +EBUILD exiv2-0.28.1-r1.ebuild 3279 BLAKE2B a239c3b9d9a9801743590e40d82194e5129873690378347d9989b8e91e5d3d5a5c0595dbc3acef41e28f5a7f13bc1e1525cdb7142d2e48c3d90c719bc744cabe SHA512 39f27ddfc654ec239cc712dcdf05eb055eab469bedc8cffffbe1b59c8ff13c2dd5648f632f4ce1a56cab50cec9bc33e54026e5af59ae969856899b57770d0943 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e diff --git a/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild new file mode 100644 index 000000000000..a099676b0818 --- /dev/null +++ b/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit cmake-multilib python-any-r1 + +DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" +HOMEPAGE="https://exiv2.org/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" + inherit git-r3 +else + SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +LICENSE="GPL-2" +# Upstream hope to have stable ABI in 1.0. Until then, go off ${PV}. +# We may be able to change it to $(ver_cut 1-2) once e.g. +# https://github.com/Exiv2/exiv2/pull/917 is merged. +SLOT="0/$(ver_cut 1-2)" +IUSE="+bmff doc examples nls +png test webready +xmp" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + png? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + webready? ( + net-misc/curl[${MULTILIB_USEDEP}] + ) + xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${DEPEND} + test? ( dev-cpp/gtest ) +" +BDEPEND=" + doc? ( + ${PYTHON_DEPS} + app-doc/doxygen + dev-libs/libxslt + media-gfx/graphviz + virtual/pkgconfig + ) + test? ( ${PYTHON_DEPS} ) + nls? ( sys-devel/gettext ) +" + +DOCS=( README.md doc/ChangeLog doc/cmd.txt ) + +# https://github.com/Exiv2/exiv2/pull/2832 +PATCHES=( "${FILESDIR}/${P}-exiv2lib.patch" ) # bug 917483 + +pkg_setup() { + if use doc || use test ; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + # 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 + + cmake_src_prepare + + sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die +} + +multilib_src_configure() { + local mycmakeargs=( + -DEXIV2_BUILD_SAMPLES=NO + -DEXIV2_ENABLE_BROTLI=OFF + -DEXIV2_ENABLE_NLS=$(usex nls) + -DEXIV2_ENABLE_PNG=$(usex png) + -DEXIV2_ENABLE_CURL=$(usex webready) + -DEXIV2_ENABLE_INIH=OFF # multilib/libdir logic is broken + -DEXIV2_ENABLE_WEBREADY=$(usex webready) + -DEXIV2_ENABLE_XMP=$(usex xmp) + -DEXIV2_ENABLE_BMFF=$(usex bmff) + + # We let users control this. + -DBUILD_WITH_CCACHE=OFF + # Our toolchain sets this by default. + -DBUILD_WITH_STACK_PROTECTOR=OFF + + $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) + $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) + $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test)) + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html + ) + + if use doc || use test ; then + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + ) + fi + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + + if multilib_is_native_abi; then + use doc && eninja doc + fi +} + +multilib_src_test() { + if multilib_is_native_abi; then + cd "${BUILD_DIR}"/bin || die + ./unit_tests || die "Failed to run tests" + fi +} + +multilib_src_install_all() { + use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) + + einstalldocs + find "${D}" -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc samples/*.cpp + fi +} diff --git a/media-gfx/exiv2/exiv2-0.28.1.ebuild b/media-gfx/exiv2/exiv2-0.28.1.ebuild deleted file mode 100644 index cb55ac39ccf5..000000000000 --- a/media-gfx/exiv2/exiv2-0.28.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake-multilib python-any-r1 - -DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" -HOMEPAGE="https://exiv2.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" - inherit git-r3 -else - SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" -fi - -LICENSE="GPL-2" -# Upstream hope to have stable ABI in 1.0. Until then, go off ${PV}. -# We may be able to change it to $(ver_cut 1-2) once e.g. -# https://github.com/Exiv2/exiv2/pull/917 is merged. -SLOT="0/$(ver_cut 1-2)" -IUSE="+bmff doc examples nls +png test webready +xmp" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - png? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) - webready? ( - net-misc/curl[${MULTILIB_USEDEP}] - ) - xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${DEPEND} - test? ( dev-cpp/gtest ) -" -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - app-doc/doxygen - dev-libs/libxslt - media-gfx/graphviz - virtual/pkgconfig - ) - test? ( ${PYTHON_DEPS} ) - nls? ( sys-devel/gettext ) -" - -DOCS=( README.md doc/ChangeLog doc/cmd.txt ) - -pkg_setup() { - if use doc || use test ; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - # 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 - - cmake_src_prepare - - sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die -} - -multilib_src_configure() { - local mycmakeargs=( - -DEXIV2_BUILD_SAMPLES=NO - -DEXIV2_ENABLE_BROTLI=OFF - -DEXIV2_ENABLE_NLS=$(usex nls) - -DEXIV2_ENABLE_PNG=$(usex png) - -DEXIV2_ENABLE_CURL=$(usex webready) - -DEXIV2_ENABLE_INIH=OFF # multilib/libdir logic is broken - -DEXIV2_ENABLE_WEBREADY=$(usex webready) - -DEXIV2_ENABLE_XMP=$(usex xmp) - -DEXIV2_ENABLE_BMFF=$(usex bmff) - - # We let users control this. - -DBUILD_WITH_CCACHE=OFF - # Our toolchain sets this by default. - -DBUILD_WITH_STACK_PROTECTOR=OFF - - $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) - $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) - $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test)) - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html - ) - - if use doc || use test ; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - ) - fi - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if multilib_is_native_abi; then - use doc && eninja doc - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - cd "${BUILD_DIR}"/bin || die - ./unit_tests || die "Failed to run tests" - fi -} - -multilib_src_install_all() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - - 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.28.1-exiv2lib.patch b/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch new file mode 100644 index 000000000000..dba8fd3e2896 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch @@ -0,0 +1,31 @@ +From 4f6d0b806714a702ccbe9e10c5155eb6a1699380 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 14 Nov 2023 07:23:32 +0100 +Subject: [PATCH] cmake: restore a "exiv2lib" target + +Commit a8c3455e5cd7ee65acc5f398581e1386f7df5108 and +commit eb05551ed2d21079299f2f4da2f463df6857b884 changed the target of +the exiv2 library ("exiv2lib"), exporting it in the "Exiv2" namespace, +so making it usable as "Exiv2::exiv2lib" instead. An ALIAS to "exiv2lib" +was added, however cmake does not install or export ALIAS targets [1]. + +Hence, restore compatibility with the existing cmake users of exiv2: +manually create an ALIAS target in the cmake config files after all the +targets are loaded and checked. + +[1] https://cmake.org/cmake/help/latest/command/add_library.html +--- + cmake/exiv2Config.cmake.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cmake/exiv2Config.cmake.in b/cmake/exiv2Config.cmake.in +index 63c9362ff7..c9e2eba9b5 100644 +--- a/cmake/exiv2Config.cmake.in ++++ b/cmake/exiv2Config.cmake.in +@@ -14,3 +14,6 @@ endif() + include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake") + + check_required_components(exiv2) ++ ++# compatibility with non-aliased users ++add_library(exiv2lib ALIAS Exiv2::exiv2lib) -- cgit v1.2.3