commit: 89f586d08c11f851de2da35ab5fd2ce55dc52048 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Jun 5 16:11:41 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Jun 5 16:11:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f586d0
media-libs/exempi: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-libs/exempi/Manifest | 2 - media-libs/exempi/exempi-2.6.2.ebuild | 68 ---------------------- media-libs/exempi/exempi-2.6.3-r1.ebuild | 68 ---------------------- media-libs/exempi/exempi-2.6.4.ebuild | 68 ---------------------- .../files/exempi-2.6.2-arm-static-build.patch | 35 ----------- .../exempi-2.6.3-clang16-binary_function.patch | 33 ----------- 6 files changed, 274 deletions(-) diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest index 8689e72934ec..c12112b43343 100644 --- a/media-libs/exempi/Manifest +++ b/media-libs/exempi/Manifest @@ -1,4 +1,2 @@ -DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4 -DIST exempi-2.6.4.tar.xz 2843304 BLAKE2B 35ae01db243825eea05fe946a958be78ee75c3e6bc3cd02bf5596bd0c9543ccecb285c93e2533c7ceba1e42b25266834bddfd6eda4fef351b384298cc638cfb2 SHA512 86e41e24e34150f398dffe3219f1530fbf14606feeee9953395bfedb335316ec90ac88e2843f2c037a564909fc3cc82a5cce53edb18219663a1b454cda6bef72 DIST exempi-2.6.5.tar.xz 2843132 BLAKE2B bc8c347af4c9c7bf085311ce055bd1c7cd5c2b845c723dd74bbcdf104be018885a82180333dbdda3cf9a64a4125dfe0fa0904fbd05663c3a6c32e6a60a8ca2d3 SHA512 71a0830c7a547bd7304e38f307a17a5ca70d6d22bb94db93f7e6c0903d1a1a1e211487cd530ec81fb058d0b45224018d23aab9a9394b6cfa025c50f0d77b5002 diff --git a/media-libs/exempi/exempi-2.6.2.ebuild b/media-libs/exempi/exempi-2.6.2.ebuild deleted file mode 100644 index 3d4670ec3175..000000000000 --- a/media-libs/exempi/exempi-2.6.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"; -# TODO: switch to xz for 2.6.3 -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.bz2"; - -LICENSE="BSD" -SLOT="2/8" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc64 ~riscv x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost ) -" -BDEPEND=" - dev-build/autoconf-archive - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch - "${FILESDIR}"/${PN}-2.6.2-arm-static-build.patch -) - -src_prepare() { - default - - config_rpath_update . - eautoreconf -} - -src_configure() { - # - --enable-static as --disable-static breaks build - # - Valgrind detection is "disabled" due to bug #295875 - econf \ - --enable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - # --disable-static breaks tests - rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/exempi-2.6.3-r1.ebuild b/media-libs/exempi/exempi-2.6.3-r1.ebuild deleted file mode 100644 index de69a15c9199..000000000000 --- a/media-libs/exempi/exempi-2.6.3-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"; -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"; - -LICENSE="BSD" -SLOT="2/8" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost ) -" -BDEPEND=" - dev-build/autoconf-archive - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch - "${FILESDIR}"/${PN}-2.6.3-clang16-binary_function.patch -) - -src_prepare() { - default - - # Needed for autoconf 2.71 - config_rpath_update . - eautoreconf -} - -src_configure() { - # - --enable-static as --disable-static breaks build - # - Valgrind detection is "disabled" due to bug #295875 - econf \ - --enable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - # --disable-static breaks tests - rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/exempi-2.6.4.ebuild b/media-libs/exempi/exempi-2.6.4.ebuild deleted file mode 100644 index de69a15c9199..000000000000 --- a/media-libs/exempi/exempi-2.6.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"; -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"; - -LICENSE="BSD" -SLOT="2/8" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost ) -" -BDEPEND=" - dev-build/autoconf-archive - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch - "${FILESDIR}"/${PN}-2.6.3-clang16-binary_function.patch -) - -src_prepare() { - default - - # Needed for autoconf 2.71 - config_rpath_update . - eautoreconf -} - -src_configure() { - # - --enable-static as --disable-static breaks build - # - Valgrind detection is "disabled" due to bug #295875 - econf \ - --enable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - # --disable-static breaks tests - rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch b/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch deleted file mode 100644 index 7abd23a5a405..000000000000 --- a/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://gitlab.freedesktop.org/libopenraw/exempi/-/issues/28 - -From 269b68aaaaaa9af0caf50678e820181c0694ebf7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Thu, 17 Mar 2022 17:27:28 +0100 -Subject: [PATCH] XMPFiles/source/XMPFiles_Impl.cpp: fix arm build with gcc 10 - -Fix the following build failure with exempi on arm with gcc 10 raised -since version 2.6.0 and -https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f -https://github.com/adobe/XMP-Toolkit-SDK/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../XMPFiles/source/.libs/libXMPFiles.a(XMPFiles_Impl.o):(.rodata+0x5c): multiple definition of `typeinfo name for TXMPMeta<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >'; XMPFilesCoverage.o:(.rodata+0x0): first defined here - -More information can be found on a similar issue here: -https://github.com/OpenKinect/libfreenect2/issues/157 - -Fixes: - - http://autobuild.buildroot.org/results/c440719de02a154c6bdae11bda06ea30c131c71d - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- a/XMPFiles/source/XMPFiles_Impl.cpp -+++ b/XMPFiles/source/XMPFiles_Impl.cpp -@@ -47,7 +47,9 @@ using namespace std; - /// This file ... - /// - // ================================================================================================= --#include "public/include/XMP.incl_cpp" -+#if ! XMP_StaticBuild -+ #include "public/include/XMP.incl_cpp" -+#endif - - #if XMP_WinBuild - #pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) - diff --git a/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch b/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch deleted file mode 100644 index bbe535ed1380..000000000000 --- a/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch +++ /dev/null @@ -1,33 +0,0 @@ -Bug: https://bugs.gentoo.org/910494 ---- a/XMPFiles/source/PluginHandler/XMPAtoms.h -+++ b/XMPFiles/source/PluginHandler/XMPAtoms.h -@@ -83,8 +83,12 @@ enum - - #define XMPAtomNull emptyStr_K - --struct StringCompare : std::binary_function<const std::string &, const std::string &, bool> -+struct StringCompare - { -+ public: -+ using first_argument_type = const std::string &; -+ using second_argument_type = const std::string &; -+ using result_type = bool; - bool operator() (const std::string & a, const std::string & b) const - { - return ( a.compare(b) < 0 ); ---- a/XMPFilesPlugins/api/source/PluginRegistry.h -+++ b/XMPFilesPlugins/api/source/PluginRegistry.h -@@ -68,8 +68,12 @@ public: - - private: - -- struct StringCompare : std::binary_function< const std::string &, const std::string &, bool > -+ struct StringCompare - { -+ public: -+ using first_argument_type = const std::string &; -+ using second_argument_type = const std::string &; -+ using result_type = bool; - bool operator()( const std::string & a, const std::string & b ) const - { - return ( a.compare(b) < 0 );
