From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7670015800A for ; Tue, 22 Aug 2023 07:24:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A92992BC016; Tue, 22 Aug 2023 07:24:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86B672BC016 for ; Tue, 22 Aug 2023 07:24:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75AD234125E for ; Tue, 22 Aug 2023 07:24:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 849141051 for ; Tue, 22 Aug 2023 07:24:14 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1692686995.ad4d831484211ce970eb3028a8b4a3dc8e05044b.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/exempi/exempi-2.6.3-r1.ebuild media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch X-VCS-Directories: media-libs/exempi/files/ media-libs/exempi/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: ad4d831484211ce970eb3028a8b4a3dc8e05044b X-VCS-Branch: master Date: Tue, 22 Aug 2023 07:24:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f8f499a-0648-4972-9f5b-af70b0161263 X-Archives-Hash: f46a3e5a9d7641b9b5dfc630a4b61f62 commit: ad4d831484211ce970eb3028a8b4a3dc8e05044b Author: Brahmajit Das gmail com> AuthorDate: Sat Jul 22 09:24:48 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 22 06:49:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4d8314 media-libs/exempi: Fix no template named binary_function in namespace Closes: https://bugs.gentoo.org/910494 Signed-off-by: Brahmajit Das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31997 Signed-off-by: Joonas Niilola gentoo.org> media-libs/exempi/exempi-2.6.3-r1.ebuild | 68 ++++++++++++++++++++++ .../exempi-2.6.3-clang16-binary_function.patch | 33 +++++++++++ 2 files changed, 101 insertions(+) diff --git a/media-libs/exempi/exempi-2.6.3-r1.ebuild b/media-libs/exempi/exempi-2.6.3-r1.ebuild new file mode 100644 index 000000000000..e5669843463f --- /dev/null +++ b/media-libs/exempi/exempi-2.6.3-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 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 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="examples test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/expat-2:= + sys-libs/zlib + virtual/libiconv +" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/boost ) +" +BDEPEND=" + sys-devel/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.3-clang16-binary_function.patch b/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch new file mode 100644 index 000000000000..bbe535ed1380 --- /dev/null +++ b/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch @@ -0,0 +1,33 @@ +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 ++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 );