[gentoo-commits] repo/gentoo:master commit in: media-libs/libheif/

["David Seifert" <soap@gentoo.org>]

commit:     22872704250ac5716fd33186098f1acefc981bd4
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Jan 23 10:43:25 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 10:43:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22872704

media-libs/libavif: Sync live ebuild

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-libs/libheif/libheif-9999.ebuild | 23 ++++++++++++++---------
 media-libs/libheif/metadata.xml        |  4 ++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 20821993904..d68ecc0ddde 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 5ae142ce31e..1b9b2ce7ad7 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>