* [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/
@ 2017-04-16 18:25 Gilles Dartiguelongue
0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2017-04-16 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 34b7e89302085c215bd19f307c4ea914287d3d9d
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 18:20:30 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 18:24:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b7e893
media-libs/exempi: version bump 2.2.1 → 2.4.2
Bump to EAPI=6. Add missing dependency on autoconf-archive. Switch
eutils to ltprune. Enable unittests.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-libs/exempi/Manifest | 1 +
media-libs/exempi/exempi-2.4.2.ebuild | 52 ++++++++++++++++++++++++
media-libs/exempi/files/exempi-2.4.2-iconv.patch | 41 +++++++++++++++++++
3 files changed, 94 insertions(+)
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 97322306fcb..5fa206457af 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1 +1,2 @@
DIST exempi-2.2.1.tar.gz 3566843 SHA256 a99e1569047988200e4935cf4395667341a5bd8d6067847a08df4304546cc362 SHA512 f4b97ec7af89924755a0695464bad5081de6a5d6a6f28c06984c051d677f8771c39df12951761ecd28d6ff520ddec4e21179dcba8b58f0ef649bbdad1a53aa9c WHIRLPOOL 622d23cb519f2dda988b7d13dd26be55dd207bfe8ec2f2c0b8b568974571780b51b5284d871a310e461041f1054265efb199cf5c21fcf6eee6619cb85dc335e9
+DIST exempi-2.4.2.tar.gz 3911796 SHA256 2016738b16c371179f745a556dc8ccc95ba2323e933fa1b3f4cbbd469516e343 SHA512 47d0737a95dbd31c3c39ef9a9a8c00e87135c2eb909bea1d89fa8df31c0e73dadd7e9f9f0e6445d3b17457396e0c1381b93f5751494e1061822df47f7099b568 WHIRLPOOL 50bff108827ea794aacb1becee05b0864a694b6744be4471d9e16bccd5143d3957f8d5e41cd946df1e453a9c1abfeaa11cf170ddbd4db6e339b85d7e7bac1930
diff --git a/media-libs/exempi/exempi-2.4.2.ebuild b/media-libs/exempi/exempi-2.4.2.ebuild
new file mode 100644
index 00000000000..cbc59b14fc9
--- /dev/null
+++ b/media-libs/exempi/exempi-2.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune
+
+DESCRIPTION="Exempi is a 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.gz"
+
+LICENSE="BSD"
+SLOT="2/3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="examples static-libs test"
+
+RDEPEND="
+ >=dev-libs/expat-2:=
+ virtual/libiconv
+ sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+ sys-devel/autoconf-archive
+ sys-devel/gettext
+ test? ( >=dev-libs/boost-1.48 )
+"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${PN}-2.4.2-iconv.patch
+ cp /usr/share/gettext/config.rpath . || die
+ eautoreconf
+}
+
+src_configure() {
+ # Valgrind detection is "disabled" due to bug #295875
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test unittest) \
+ VALGRIND=""
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+
+ if use examples; then
+ emake -C samples/source distclean
+ rm -f samples/{,source,testfiles}/Makefile*
+ insinto /usr/share/doc/${PF}/examples
+ doins -r samples/*
+ fi
+}
diff --git a/media-libs/exempi/files/exempi-2.4.2-iconv.patch b/media-libs/exempi/files/exempi-2.4.2-iconv.patch
new file mode 100644
index 00000000000..9f9fc42e5bf
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.4.2-iconv.patch
@@ -0,0 +1,41 @@
+From a2b822c85c52c96b04192a4923c9edbf9d144343 Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <ssuominen@gentoo.org>
+Date: Sun, 16 Apr 2017 20:11:57 +0200
+Subject: [PATCH] Fix build on systems not using glibc's libiconv
+
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=242812
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+
+---
+ XMPFiles/source/Makefile.am | 3 ++-
+ configure.ac | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/XMPFiles/source/Makefile.am b/XMPFiles/source/Makefile.am
+index 6d1a1d3..d1020d0 100644
+--- a/XMPFiles/source/Makefile.am
++++ b/XMPFiles/source/Makefile.am
+@@ -53,5 +53,6 @@ libXMPFiles_la_SOURCES = WXMPFiles.cpp XMPFiles.cpp \
+ libXMPFiles_la_LIBADD = ./FileHandlers/libxmpfilehandlers.la \
+ ./FormatSupport/libformatsupport.la \
+ ./PluginHandler/libpluginhandler.la \
+- ./NativeMetadataSupport/libnativemetadata.la
++ ./NativeMetadataSupport/libnativemetadata.la \
++ @LTLIBICONV@
+ #libXMPFiles_la_LDFLAGS = -version-info @LIBXMPCORE_VERSION_INFO@
+diff --git a/configure.ac b/configure.ac
+index a4ee14f..e1033c1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,6 +115,8 @@ AC_CHECK_HEADER(iconv.h, ,
+ AC_CHECK_HEADER(zlib.h, ,
+ AC_MSG_ERROR([zlib headers missing]))
+
++AM_ICONV_LINK
++
+ dnl Blatently copied from iconv.m4 to remove the crack about libtool
+ dnl But check for constness of the iconv parameters.
+ AC_MSG_CHECKING([for iconv declaration])
+--
+2.12.2
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/
@ 2018-09-30 16:48 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-09-30 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 73a84757832eef175ea2b082378277d546c8accc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 16:46:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 16:46:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a84757
media-libs/exempi: Fix CVE-2018-12648
Bug: https://bugs.gentoo.org/659038
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-libs/exempi/exempi-2.4.5-r1.ebuild | 58 ++++++++++++++++++++++
.../exempi/files/exempi-2.4.5-CVE-2018-12648.patch | 42 ++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
new file mode 100644
index 00000000000..234df5a17a5
--- /dev/null
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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.gz"
+
+LICENSE="BSD"
+SLOT="2/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="examples static-libs test"
+
+RDEPEND="
+ >=dev-libs/expat-2:=
+ sys-libs/zlib
+ virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/autoconf-archive
+ sys-devel/gettext
+ test? ( >=dev-libs/boost-1.48 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.2-iconv.patch
+ "${FILESDIR}"/${P}-CVE-2018-12648.patch
+)
+
+src_prepare() {
+ default
+ cp /usr/share/gettext/config.rpath . || die
+ eautoreconf
+}
+
+src_configure() {
+ # Valgrind detection is "disabled" due to bug #295875
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test unittest) \
+ VALGRIND=""
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+
+ if use examples; then
+ emake -C samples/source distclean
+ rm samples/{,source,testfiles}/Makefile* || die
+ insinto /usr/share/doc/${PF}/examples
+ doins -r samples/*
+ fi
+}
diff --git a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
new file mode 100644
index 00000000000..36f0d073435
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
@@ -0,0 +1,42 @@
+From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
+From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
+Date: Sat, 18 Aug 2018 13:54:55 +0000
+Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The WEBP::GetLE32 function in
+XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
+NULL pointer dereference.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=106981
+https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
+
+Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
+Signed-off-by: Hubert Figuière <hub@figuiere.net>
+---
+ XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
+index ffaf220..4fe705b 100644
+--- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
++++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
+@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
+ }
+ void VP8XChunk::xmp(bool hasXMP)
+ {
+- XMP_Uns32 flags = GetLE32(&this->data[0]);
+- flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
+- PutLE32(&this->data[0], flags);
++ if (&this->data[0] != NULL) {
++ XMP_Uns32 flags = GetLE32(&this->data[0]);
++ flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
++ PutLE32(&this->data[0], flags);
++ }
+ }
+
+ Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
+--
+2.18.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/
@ 2021-04-29 17:38 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2021-04-29 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 0375c5e5f93e3b108b77c3d7575499df94a8c638
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 17:37:51 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 17:37:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0375c5e5
media-libs/exempi: Fix building against GCC 11
Closes: https://bugs.gentoo.org/786495
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/exempi/exempi-2.4.5-r1.ebuild | 1 +
media-libs/exempi/files/exempi-2.4.5-gcc11.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index 30c580e232d..049365af8dd 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -30,6 +30,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.4.2-iconv.patch
"${FILESDIR}"/${P}-CVE-2018-12648.patch
+ "${FILESDIR}"/${P}-gcc11.patch
)
src_prepare() {
diff --git a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
new file mode 100644
index 00000000000..259c05d5cbd
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
@@ -0,0 +1,11 @@
+--- a/XMPFiles/source/FormatSupport/P2_Support.hpp
++++ b/XMPFiles/source/FormatSupport/P2_Support.hpp
+@@ -79,7 +79,7 @@
+ }; // class P2_Clip
+ struct P2SpannedClip_Order
+ {
+- bool operator()( P2_Clip* lhs, P2_Clip* rhs)
++ bool operator()( P2_Clip* lhs, P2_Clip* rhs) const
+ {
+ return lhs->GetOffsetInShot() < rhs->GetOffsetInShot();
+ }
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/
@ 2023-02-07 20:09 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-02-07 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 6f492d0793709293271563e8ee7453b0a096187f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 19:54:38 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 20:08:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f492d07
media-libs/exempi: Cleanup vulnerable 2.4.5-r1
Bug: https://bugs.gentoo.org/878757
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/exempi/Manifest | 1 -
media-libs/exempi/exempi-2.4.5-r1.ebuild | 61 ----------------------
.../exempi/files/exempi-2.4.5-CVE-2018-12648.patch | 42 ---------------
media-libs/exempi/files/exempi-2.4.5-gcc11.patch | 11 ----
4 files changed, 115 deletions(-)
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 7094e24be0f7..c470d9f1e4a4 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,3 +1,2 @@
-DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
deleted file mode 100644
index 9d36d341cc38..000000000000
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.gz"
-
-LICENSE="BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv 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}"/${P}-CVE-2018-12648.patch
- "${FILESDIR}"/${P}-gcc11.patch
-)
-
-src_prepare() {
- default
-
- config_rpath_update .
- eautoreconf
-}
-
-src_configure() {
- # Valgrind detection is "disabled" due to bug #295875
- econf \
- --disable-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
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
deleted file mode 100644
index 36f0d0734350..000000000000
--- a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
-From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Date: Sat, 18 Aug 2018 13:54:55 +0000
-Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The WEBP::GetLE32 function in
-XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
-NULL pointer dereference.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=106981
-https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
-
-Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Signed-off-by: Hubert Figuière <hub@figuiere.net>
----
- XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-index ffaf220..4fe705b 100644
---- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
- }
- void VP8XChunk::xmp(bool hasXMP)
- {
-- XMP_Uns32 flags = GetLE32(&this->data[0]);
-- flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
-- PutLE32(&this->data[0], flags);
-+ if (&this->data[0] != NULL) {
-+ XMP_Uns32 flags = GetLE32(&this->data[0]);
-+ flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
-+ PutLE32(&this->data[0], flags);
-+ }
- }
-
- Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
---
-2.18.0
diff --git a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
deleted file mode 100644
index 259c05d5cbd2..000000000000
--- a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/XMPFiles/source/FormatSupport/P2_Support.hpp
-+++ b/XMPFiles/source/FormatSupport/P2_Support.hpp
-@@ -79,7 +79,7 @@
- }; // class P2_Clip
- struct P2SpannedClip_Order
- {
-- bool operator()( P2_Clip* lhs, P2_Clip* rhs)
-+ bool operator()( P2_Clip* lhs, P2_Clip* rhs) const
- {
- return lhs->GetOffsetInShot() < rhs->GetOffsetInShot();
- }
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/
@ 2023-08-22 7:24 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2023-08-22 7:24 UTC (permalink / raw
To: gentoo-commits
commit: ad4d831484211ce970eb3028a8b4a3dc8e05044b
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Jul 22 09:24:48 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> 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 <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31997
Signed-off-by: Joonas Niilola <juippis <AT> 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<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 );
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-22 7:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-29 17:38 [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-08-22 7:24 Joonas Niilola
2023-02-07 20:09 Andreas Sturmlechner
2018-09-30 16:48 Andreas Sturmlechner
2017-04-16 18:25 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox