gentoo auto-resync : 30:10:2022 - 03:02:28

4 files changed, 113 insertions, 4 deletions

diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index afa4b062e436..429996db28a1 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,6 +1,9 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
 AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
 AUX exempi-2.4.5-gcc11.patch 346 BLAKE2B 022ca9284b3415b2a24c1aca421488e0741cd42784cdf1c24753d5a3941274f4adad87474e72f45286dba907641101d27ca5047cfa6e8f3b36dfba470db14f32 SHA512 2ca5dc6f1147c11a8ce4911b5b5b6d52ffedc6925ea2c13bd46e074320020b3e7ef52bc405fad9214a35fc47e8087f49258660750e65f168afc8517c49629947
+AUX exempi-2.6.2-arm-static-build.patch 1785 BLAKE2B 2624ac36cdcbf8230af643f99250c9c755c5650d38a4d427125b60245dbfb79cf4d94ad135f043ddde956d3241c091f901d7243b99d26c70c88af44414a7b674 SHA512 49004cea850f2e51a4266a574e7453e21afe1a7032e7a925717c7b0df3bbe187c5c0b79dddabbd002ce662fe4055171cc72ddff6985f611cc4b8c3280dda1fc9
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
+DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
 EBUILD exempi-2.4.5-r1.ebuild 1200 BLAKE2B 2be269505b74dc4c0d8a2f2f05a0f99a2796b9a09a9711fd2e64926daa5c9126822c0e9e6e3550fe421a272c597dbfe74283c389b887b1001722198f15282616 SHA512 600901867f7a75d18fc727df7f379bf3e0c9b4a1dfbda64f157299347e6d3a50377951db7ea4ea056ab40559e3b1ab3b45810abfcda2169bd9723b6d4943746c
-MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
+EBUILD exempi-2.6.2.ebuild 1360 BLAKE2B 62282164080032cf52b222ad50e785c0c2cfd417e544a0eee19b146cc0b2259195323dd83df5dcda0c3165fe64fadd197c5a76550e38b39744073720d01c4d17 SHA512 9f178126f990964ee5a37d2e3ddd442c1f83914a6cfb3728ed2a6fb7afcedf42c19c4ea091ddf789ab4fdd21727c5efda7d3c5d8be6e5667b330a6c295b44fdc
+MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392
diff --git a/media-libs/exempi/exempi-2.6.2.ebuild b/media-libs/exempi/exempi-2.6.2.ebuild
new file mode 100644
index 000000000000..1adde8f42473
--- /dev/null
+++ b/media-libs/exempi/exempi-2.6.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 ~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}"/${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/files/exempi-2.6.2-arm-static-build.patch b/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch
new file mode 100644
index 000000000000..7abd23a5a405
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch
@@ -0,0 +1,35 @@
+https://gitlab.freedesktop.org/libopenraw/exempi/-/issues/28
+
+From 269b68aaaaaa9af0caf50678e820181c0694ebf7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+--- 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/metadata.xml b/media-libs/exempi/metadata.xml
index d0b58801b31a..bb93177fcfa4 100644
--- a/media-libs/exempi/metadata.xml
+++ b/media-libs/exempi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">libopenraw/exempi</remote-id>
+	</upstream>
 </pkgmetadata>