gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 131 insertions, 5 deletions

diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 1afbca202280..62b038899e54 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,8 +1,10 @@
 DIST libavif-0.10.1.tar.gz 2085698 BLAKE2B 5be3f9adf7e0a5747e42c90ce2768eba90053c821805cc8e39915d6cbc4cd42554b1473118b41eb25010d20a2b5a3c141b9cbd6ff55c46abd79eb97cdee6b0e5 SHA512 2f6f248c56c983761149d3c201fc2a2ea5072a32516578a7fdb2c66e3cd22491540f400e23581f873b15454250eeec8d433924ae2c1de9371b7924a5d82bef6b
 DIST libavif-0.11.1.tar.gz 5826813 BLAKE2B 8fcbc9e1655546b7f4e62882b44d07b8bcfceef599e0feb5658c475cbc35cbb27bae0ad58475c2657351a890ccb957fa8a0e28328bbb5664cd8a57cedfb58019 SHA512 4a9e2711fccddf35c477db6e2fa2f76c0648aafaa98b4e3f34df62c0fbd02ddcd57762f1f8149822da4f1bc3757ee75ec1d9ced5e56a54dbe9d0b43265aacd4c
 DIST libavif-1.0.4.tar.gz 10575992 BLAKE2B 69b7f376e8254f1f6b5df727e572e6aeef02710d8a09ad3289a71a38c2632b2cfdbee9284fcf08fccc5f072dc3aa2109f44b41ae10f0dad8cb299040ffc71c23 SHA512 37f0de757180c6414778e688006940395960b316c25192d6beb97a07942aff4bd3b712dec2eff52cd26f5d72c352731442175dfeb90e2e1381133539760142b0
+DIST libavif-1.1.1.tar.gz 13644189 BLAKE2B c0a473b172206ea32358c28e7b94d8038b24030e4845611341076518cd82fd2bea78eb8e22e5481062b893ffb70789619ce4f85129a94a0db70a667c000f4fd0 SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21
 EBUILD libavif-0.10.1.ebuild 2497 BLAKE2B 7f827aa9192800d611f52349bc5510d061564097797b053da93e9193bcf2cbfd4cc5c846f0711c8292cc54ac75424e1061fb6ebdcb0db95a9c9d34edbdf75e8a SHA512 3f52b71121d1bf7acd9567f8e7cc9edd0d5be226d3c4088f2e9dd4752a564012ac66304a8bd05ecb40d3985a24ee2caae09a4f4a61bedff07591fe9b349e4acd
 EBUILD libavif-0.11.1.ebuild 2595 BLAKE2B 7b22b323ec56ec3dc80fa56d952675e05f22d2d8d522778bc7c3593a14bf242c6d2aa73e6141fd12b1948b901482b6f400cd97267a1cb3ed3ef37482d91e0368 SHA512 ea62b941733271a18279d9d47b91bac106f4ee972ec43fc62a2b6a39a688b3aaa099462b0aa8e242816fe192aa8e0d84b04c3f94c3d7b7c63258687ddf271e7d
 EBUILD libavif-1.0.4.ebuild 2698 BLAKE2B 56fbba300754a7a53c8ff689fd310ddaebe8e9939de6ca649e281f5a8313605304d427ea7afab5658a3a3c20ff0f23d517bd17869294186f83b369e04fa233f9 SHA512 4a73c1a1936721409efeaf2971128758a77214cec341c0e74ad30cc6201f9232854e8af47868d0ea592ab9127deaf38643010c57712aeb45b96f005385d4c21b
-EBUILD libavif-9999.ebuild 2618 BLAKE2B 2599f61eab7fbe8f8bf54cb4a5eb74e0fa143a7454d3bd0ee734972a5be1dbae429d69e6b5251be4a27cd4368127275641a56be3bbf9a4098c57289efa1a4824 SHA512 a6ee8791eb4f82a2f8971df8bb9c103e25acd2e7f29c6ddc650f60e7317f8d966f3e619a5bc7979981215246e3a95282598d3db6ce058d328741b9d575b3150b
-MISC metadata.xml 963 BLAKE2B 4951865af2ec64924c0abc18c82f8df0da437545867a78e097f055a803a1017759ee165e9a49234fd683ad674f044cfdade33e7e6e72a3d2fdfb71cfff4cee28 SHA512 dbcc0d05970073d286d9e389d9e8797023d728a0067886ec25c61f5c65324e85ed8015111b45e43387e3b75fe7ad5ef5ca1cbd93ce56994b02589f1520e78116
+EBUILD libavif-1.1.1.ebuild 2866 BLAKE2B ebcab75be7f707dbcd48a5c38db7a59d02ee949672ca34a6d6be48f5b06904c60a581b8f4c16fd2931eaa1d919b8694574b36cea164a1e2776e20dcab69a94ed SHA512 fa19df78e9196d06589792c8b3cca440ca1530379e9e88b6db734ab62ffae1a7d2a502c6c355e514b9a1b04df996e2014db98973b525c645b4b2eaba533254ea
+EBUILD libavif-9999.ebuild 2752 BLAKE2B 4fbb6d0057e19ce2e33034b52d8ff087c938a413508a1f9f6d3c77db281ed66d8372d8bd2e57267618dbae96b68844da83991e3abc84c34be9da9947f95eb687 SHA512 125cfe78ed9190c7c375c062ed02836d615bdc92a5a0e74525bf4cf96a811e24962878c8949a8c614689666d2167d9fd4ce5a9fd71296c0d66572209861eb9cb
+MISC metadata.xml 1033 BLAKE2B 94be58c7c8d0ea88d86c1203b3f77ce4a2bd699360ceba9991b4de77ab626c707941ef79d57f189510de2e43da641d2ce836bcc50df0db4e105f4d6274183653 SHA512 0073116364038e100579fd0db821552a285c5bfc85f2cd20b2b2ff21cc5740df01c59f23964189912d6cc9700515bd604b0fb1efd951f08c6e181bf47b3b59d7
diff --git a/media-libs/libavif/libavif-1.1.1.ebuild b/media-libs/libavif/libavif-1.1.1.ebuild
new file mode 100644
index 000000000000..7c3cf825e032
--- /dev/null
+++ b/media-libs/libavif/libavif-1.1.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="
+	https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+# See bug #822336 re subslot
+SLOT="0/16.1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1 test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( aom dav1d )"
+
+DEPEND="
+	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-3.3.0:=[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-1.0.0:=[${MULTILIB_USEDEP}] )
+	extras? (
+		test? (
+			dev-cpp/gtest
+			media-gfx/imagemagick[lcms]
+		)
+	)
+	gdk-pixbuf? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	)
+	rav1e? ( >=media-video/rav1e-0.5.1:=[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.9.1 )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_LIBGAV1=OFF
+
+		# bug 916948
+		-DAVIF_LIBYUV=OFF
+
+		# Use system libraries.
+		-DAVIF_CODEC_AOM=$(usex aom SYSTEM OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d SYSTEM OFF)
+		-DAVIF_ZLIBPNG=SYSTEM
+		-DAVIF_JPEG=SYSTEM
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=$(usex rav1e SYSTEM OFF)
+			-DAVIF_CODEC_SVT=$(usex svt-av1 SYSTEM OFF)
+
+			-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+			-DAVIF_BUILD_TESTS=$(usex test ON OFF)
+			-DAVIF_ENABLE_GTEST=$(usex extras $(usex test ON OFF) OFF)
+			-DAVIF_GTEST=$(usex extras $(usex test SYSTEM OFF) OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=OFF
+			-DAVIF_CODEC_SVT=OFF
+
+			-DAVIF_BUILD_EXAMPLES=OFF
+			-DAVIF_BUILD_APPS=OFF
+			-DAVIF_BUILD_TESTS=OFF
+			-DAVIF_ENABLE_GTEST=OFF
+			-DAVIF_GTEST=OFF
+		)
+
+		if ! use aom ; then
+			if use rav1e || use svt-av1 ; then
+				ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+				ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+				ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+			fi
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+	fi
+
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index 0f5d4d481176..d13f567ad6dd 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -21,7 +21,12 @@ DEPEND="
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-3.3.0:=[${MULTILIB_USEDEP}] )
 	dav1d? ( >=media-libs/dav1d-1.0.0:=[${MULTILIB_USEDEP}] )
-	extras? ( test? ( dev-cpp/gtest ) )
+	extras? (
+		test? (
+			dev-cpp/gtest
+			media-gfx/imagemagick[lcms]
+		)
+	)
 	gdk-pixbuf? (
 		dev-libs/glib:2[${MULTILIB_USEDEP}]
 		x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
@@ -39,12 +44,14 @@ BDEPEND="
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
-		-DAVIF_CODEC_AOM=$(usex aom SYSTEM OFF)
-		-DAVIF_CODEC_DAV1D=$(usex dav1d SYSTEM OFF)
 		-DAVIF_CODEC_LIBGAV1=OFF
+
+		# bug 916948
 		-DAVIF_LIBYUV=OFF
 
 		# Use system libraries.
+		-DAVIF_CODEC_AOM=$(usex aom SYSTEM OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d SYSTEM OFF)
 		-DAVIF_ZLIBPNG=SYSTEM
 		-DAVIF_JPEG=SYSTEM
 
@@ -62,6 +69,7 @@ multilib_src_configure() {
 			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
 			-DAVIF_BUILD_TESTS=$(usex test ON OFF)
 			-DAVIF_ENABLE_GTEST=$(usex extras $(usex test ON OFF) OFF)
+			-DAVIF_GTEST=$(usex extras $(usex test SYSTEM OFF) OFF)
 		)
 	else
 		mycmakeargs+=(
@@ -72,6 +80,7 @@ multilib_src_configure() {
 			-DAVIF_BUILD_APPS=OFF
 			-DAVIF_BUILD_TESTS=OFF
 			-DAVIF_ENABLE_GTEST=OFF
+			-DAVIF_GTEST=OFF
 		)
 
 		if ! use aom ; then
diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml
index fa304031f6dd..fc327ca39df8 100644
--- a/media-libs/libavif/metadata.xml
+++ b/media-libs/libavif/metadata.xml
@@ -18,6 +18,7 @@
     <flag name="svt-av1">Enable support for the SVT-AV1 encoder</flag>
   </use>
   <upstream>
+    <bugs-to>https://github.com/AOMediaCodec/libavif/issues</bugs-to>
     <remote-id type="github">AOMediaCodec/libavif</remote-id>
   </upstream>
 </pkgmetadata>