gentoo resync : 29.01.2021

4 files changed, 94 insertions, 11 deletions

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 6be4e633d120..0fe62daa5db2 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,6 @@
+DIST libheif-1.10.0.tar.gz 1681115 BLAKE2B d9dc8c630f76d0f8df33e644fbbd589a92aab62927b72f7cc49b0ac9b65141979250c7fecbc4f119d62e5cc4386803580bff10accb3a0a4a04aa9c74ada9a146 SHA512 85550afe4d2c4a0af16213f51b7c9e9478f87199941d125aa7622ee42e5473a2344f3460d9c684b1805d45f903a98b77b4081f539d5b8c445fbf9443c8341629
 DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
+EBUILD libheif-1.10.0.ebuild 1799 BLAKE2B d2aa12a8d13d921528ca4649f2ac9445443c666908e946773e88eeeed3da8af7bb98aaf64340b9ec426086fe3dfcf764351e15bf3b5d45bd0da6609038b1da18 SHA512 48ff3b07952fcb6f9a73f300f546602d84156078ae50d8804ceaf13c6a0318c9ac5d985b7fcce36e17b5df0e7e1887133b9b9c336712951b14692ea36660e9ce
 EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf
-EBUILD libheif-9999.ebuild 1597 BLAKE2B 7cc9e56415e52d885e159897fee4ef8e1da9d8d8e3a545d409692f64d01f0cc23da0dbc994d725afd7090051dc790fc8e1e466bebfcbc9df7e53a336c1879f0f SHA512 5b9b509908870e681e34c7f037fec5682d1b18deefe3cfbbbbbfd73f9e1c0da6fb731c5aa0436c0f70544fbfaec4ec93e8ef85c7b807b7d285bb3d82bb75aea6
-MISC metadata.xml 686 BLAKE2B f28565928ef395759abf7b1cbc0bafede7f9299f74b8748534135379d1778f24af394dde234e6d727cbead1a345d2c86c7dc3d93cabf81441ff072a38e7c571a SHA512 b06a9e574156521aa7ef763aae5fb2a83c20aa7265043f3992a9b4acae775f747d7ffbbe2fe5ef57e5e04dc89906c71c9ea1c7bc8ed76f94c347b78d7115ac4f
+EBUILD libheif-9999.ebuild 1799 BLAKE2B d2aa12a8d13d921528ca4649f2ac9445443c666908e946773e88eeeed3da8af7bb98aaf64340b9ec426086fe3dfcf764351e15bf3b5d45bd0da6609038b1da18 SHA512 48ff3b07952fcb6f9a73f300f546602d84156078ae50d8804ceaf13c6a0318c9ac5d985b7fcce36e17b5df0e7e1887133b9b9c336712951b14692ea36660e9ce
+MISC metadata.xml 1008 BLAKE2B efdcb0e8e478a1c4959b60f942b45feb79f9209157e29b8be19ca862a1f19b4ffad223a531fbb400351650db09285e12007a4d5f55c7762806496cdd8d520e72 SHA512 fd7c1bf830f32c9a9d13cd2471c403ce889dda643027b191e36cc6c1dd9fac4c481946c221cbf186b380bf26cb816b7f8695ea3aa5f57fde15a366c21197203d
diff --git a/media-libs/libheif/libheif-1.10.0.ebuild b/media-libs/libheif/libheif-1.10.0.ebuild
new file mode 100644
index 000000000000..d68ecc0dddea
--- /dev/null
+++ b/media-libs/libheif/libheif-1.10.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~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.10"
+IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local econf_args=(
+		--disable-static
+		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable libde265)
+		$(use_enable gdk-pixbuf)
+		$(use_enable rav1e)
+		$(use_enable threads multithreading)
+		$(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 20821993904a..d68ecc0dddea 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools xdg multilib-minimal
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
 	inherit git-r3
 else
@@ -17,23 +17,23 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.9"
-IUSE="gdk-pixbuf go static-libs test +threads"
+SLOT="0/1.10"
+IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
 REQUIRED_USE="test? ( go )"
-
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
-	>=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}]
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )
-"
+	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -49,10 +49,14 @@ src_prepare() {
 
 multilib_src_configure() {
 	local econf_args=(
+		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable libde265)
 		$(use_enable gdk-pixbuf)
-		$(use_enable static-libs static)
+		$(use_enable rav1e)
 		$(use_enable threads multithreading)
+		$(use_enable x265)
 	)
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
 }
@@ -63,5 +67,6 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
+	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index 5ae142ce31e4..1b9b2ce7ad74 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -10,8 +10,12 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+	<flag name="aom">Use <pkg>media-libs/libaom</pkg> for AVIF encoding/decoding</flag>
 	<flag name='gdk-pixbuf'>Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
 	<flag name='go'>Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
+	<flag name="libde265">Use <pkg>media-libs/libde265</pkg> for HEIF decoding</flag>
+	<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
+	<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/strukturag/libheif/issues</bugs-to>