gentoo auto-resync : 16:08:2022 - 08:29:51

5 files changed, 148 insertions, 4 deletions

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 376763b9212f..0ca301322bbb 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,8 @@
 AUX libheif-1.12.0-dav1d-1.0.0.patch 1569 BLAKE2B 1cd1629a3d519ef574a5b98ce5cfc5b8f074847b5d4fc6544fdeab3476c35b764739c98fda9a8d0a4f4921fd25412b08e124118f07694fe540b04f306716f6c2 SHA512 62a1afe3f42d1a61b3c314aaae9804dbd436f141075fa4daac415db07a1542c1033dd42cef6906b29ea0f072726888f5ef5f9b7c13c6ec8dca57b6e2bfdfd119
+AUX libheif-1.12.0-fix-bashism.patch 1325 BLAKE2B 5a43b5f2611e256a48603ce9f5d59ae9e08fec30c58af829a82d62ba04e09eb263d0f439b3aecd39d8a053ccfdb4b4f5dbdc5ec8792cd5ffb767e0c2c64e4e66 SHA512 47250ccf9ad920f2067477728f79d46cf9ee70d581b72fecacd33b927c77cb3af2744a6995c7f6b21aad64a9477bcdf702a3cea30bebf99980d93c8c3a560718
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.12.0-r1.ebuild 1798 BLAKE2B 737d57dde4f9a3a0566c0a91b1d6ec0c167dc6bb59c16b3acb9ffa28135eac395328b41418381ac2e22999852d1182580845d2227b9fa8e2c0e13bd4eff42e63 SHA512 112f937a560ef0e3dd666c7e4c7e0e973738fd31942cfd52e3c5f27b1e4aa4c3305e4a0d9ee66d6a24f3a02d47a895f511684688fdbed88ad709ff1be783309a
-EBUILD libheif-1.12.0-r2.ebuild 1871 BLAKE2B c4061747e049526201cfd77e1996cf9e52d7f8395d658d4f03bf56d31181db72401949c666e099214f7f716168bed3edf41427453056fb18de05233d3c06c09a SHA512 4844745aa4eaeecfa2ed679a0e1a4b3745712982d7a5c5adbad7521e9b8d66469c598b1ac54d604e6913cc5fd6006e40549c54ffda4d162938a9b19b8b214dc4
-EBUILD libheif-9999.ebuild 1822 BLAKE2B 087d9bef42be7bf7bc4668fb8944f43465fbba753fcfa433bf50a1d978849b0f662789af00af9c9a131d33e216ea6f774910dab7c6d100c5fb60dff60303261a SHA512 6d5071608b4781114839f994ef7b55e34621f3c42ef9b7d7d5faa422923d0a41c5a58f42c94cca760d337dca891e4a3cd929df392c6c5d4cde902acbf22e8574
+EBUILD libheif-1.12.0-r2.ebuild 1895 BLAKE2B 22e34da2f3c0512e86b02c7b6e0e2fdf118d899b06f584d4b74a3dcdf15dcfe1c5dcaf17661633dc8807270c581c6400fbdf671b0c33400778e0a4cd48e7ce04 SHA512 41d8674f6f5ef8e93dbd50b01cae52bdd18e0b741a7396ff952c75d3cd8c4ab63013d96baaae269da39f3e1b0ea3af77a63d96809a37c594a6a692df65211033
+EBUILD libheif-1.12.0-r3.ebuild 2098 BLAKE2B 91e8397a6cc92d9c572995c1ba754c96fc78abf31aebdd3ab7176756a5233cc76f9306a4282a4eed12c00d9d6d54c9d973fb599367bee27ebbbd4f0215f8c6bc SHA512 f25e1194186b95ceb70ca437566eca639da45f5ac5d6f3fda29fbb539085d51896a2655470e14a37dbd90372317b0678921cf90673b3c4b6a0c5d2105b24aa8c
+EBUILD libheif-9999.ebuild 2060 BLAKE2B a8609b3bd278265e09c3152e96c712bb800d14f0a3d97a629252ee45b877ae26cf4805f69b845c8bff1d57b822855792f13284be5ee44ead16b63d356e256e85 SHA512 83a48b52f508b0411bd3fac84e23f829fc8e50399f16b5f72e8bb01abdfd077f648276cbd8e12b42dc6241dfaab91333897f3856e0e691d9e33dd27b21a931de
 MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f
diff --git a/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch b/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch
new file mode 100644
index 000000000000..3d4d12495051
--- /dev/null
+++ b/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch
@@ -0,0 +1,37 @@
+https://github.com/strukturag/libheif/pull/660
+
+From a50ef159794ff66fc0a03d5269b1c36a000673ea Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 16 Aug 2022 02:23:13 +0100
+Subject: [PATCH] configure.ac: fix bashism
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes errors/warnings like:
+```
+checking for pthread_create in -lpthread... yes
+checking for simple visibility declarations... yes
+/var/tmp/portage/media-libs/libheif-1.12.0-r2/work/libheif-1.12.0/configure: 18821: test: x: unexpected operator
+checking pkg-config is at least version 0.9.0... yes
+checking for aom... yes
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,7 +85,7 @@ AS_IF([test "x$enable_tests" = "xyes"], [
+     HAVE_VISIBILITY=0
+     CFLAG_VISIBILITY=
+ ])
+-AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_TESTS" == "x1"])
++AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_TESTS" = "x1"])
+ 
+ AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"])
+ if eval "test x$enable_visibility = x" ; then enable_visibility=yes ; fi
+
diff --git a/media-libs/libheif/libheif-1.12.0-r2.ebuild b/media-libs/libheif/libheif-1.12.0-r2.ebuild
index e2759984de2b..0b5dfbc4051e 100644
--- a/media-libs/libheif/libheif-1.12.0-r2.ebuild
+++ b/media-libs/libheif/libheif-1.12.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -61,6 +61,7 @@ multilib_src_configure() {
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
+		$(use_enable test tests)
 		$(use_enable x265)
 	)
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
diff --git a/media-libs/libheif/libheif-1.12.0-r3.ebuild b/media-libs/libheif/libheif-1.12.0-r3.ebuild
new file mode 100644
index 000000000000..f6505de170a5
--- /dev/null
+++ b/media-libs/libheif/libheif-1.12.0-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.12"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3
+		dev-lang/go
+	)
+"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dav1d-1.0.0.patch
+	"${FILESDIR}"/${PN}-1.12.0-fix-bashism.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	if use test ; then
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local econf_args=(
+		--enable-libde265
+		--disable-static
+		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable gdk-pixbuf)
+		$(use_enable rav1e)
+		$(use_enable threads multithreading)
+		$(use_enable test tests)
+		$(use_enable x265)
+	)
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index b2726cb668a0..457096c4b4e2 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -22,7 +22,12 @@ IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
 REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( dev-lang/go )"
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3
+		dev-lang/go
+	)
+"
 DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
@@ -36,11 +41,20 @@ DEPEND="
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.0-fix-bashism.patch
+)
+
 src_prepare() {
 	default
 
 	sed -i -e 's:-Werror::' configure.ac || die
 
+	if use test ; then
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
 	eautoreconf
 
 	# prevent "stat heif-test.go: no such file or directory"
@@ -57,6 +71,7 @@ multilib_src_configure() {
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
+		$(use_enable test tests)
 		$(use_enable x265)
 	)
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"