From 0ca3f86640e2f1f361da895b997c43bac22090a1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 10 Nov 2024 21:02:07 +0000
Subject: gentoo auto-resync : 10:11:2024 - 21:02:06

---
 media-libs/libheif/Manifest                 |   6 +-
 media-libs/libheif/libheif-1.18.2-r1.ebuild | 102 ++++++++++++++++++++++++++++
 media-libs/libheif/libheif-1.18.2.ebuild    | 100 ---------------------------
 media-libs/libheif/libheif-9999.ebuild      |   8 ++-
 media-libs/libheif/metadata.xml             |   1 +
 5 files changed, 111 insertions(+), 106 deletions(-)
 create mode 100644 media-libs/libheif/libheif-1.18.2-r1.ebuild
 delete mode 100644 media-libs/libheif/libheif-1.18.2.ebuild

(limited to 'media-libs/libheif')

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 66d1cf65627a..cb4389c9fab4 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -6,6 +6,6 @@ DIST libheif-1.18.2.tar.gz 1525096 BLAKE2B 667a68f324f89b2274ea837ec8d40ada5450d
 EBUILD libheif-1.15.2-r1.ebuild 2058 BLAKE2B 4769aaea2e7165a43dc8761d944ff77df1ca87ed6fe4bef4f291075db39c44b151f46198e1e74683072ad3a26aced9f259a71db8a5512cf74cec047c1750073b SHA512 108ed5a9a7ab77110dc53189ae90f245672f39e76784678cb007b560b8284e862ae4142cd6abf484bdfb0029c41bfdec9aa5c352fa9ba1439d39fb3cdd63af96
 EBUILD libheif-1.17.6.ebuild 2319 BLAKE2B 9219564f6b6870e015066fc06f3605bd64dd1d7a080d40b0d64dab3389d745f84484c62614af6c670a13276a227867e285aea95501a03690131b21ffe2caa79d SHA512 b9cd4e6e9f59ebfba627256cf76beeeec98aac9ed6469d7f5e2ca6c8f47dc676eb040d4c3b92b79bc7859740700a3599538bfba3c35f5f5d0f512084acbc50c0
 EBUILD libheif-1.18.1.ebuild 2450 BLAKE2B 9ff052a4ccb45bccb19f55a50150916f6f52872069de37db1598a238363375def6490582054f2e5144083f07a9734a326382fdaac22d4c298d769caa00e364e6 SHA512 55a7de237ddb7a4f95204da919193d4bab22033295058a9c11e1b134a461a5a61ab0c917aa18d2320fa43aac8973a082e7fa31e0968b697d7260d40077f16a79
-EBUILD libheif-1.18.2.ebuild 2311 BLAKE2B 4cd64d8994c530ba8620ad9b67c0bf45319389b5747560f15e75adfa458b7cce592ec4b2037762b007b5b193bccf18fd4cdf69ad638fd04178d6e4443fc588e7 SHA512 08403582c04871da764be41711801329d43952f54e6d0d3c851458dadf75e6a94619acf5145356aad4d50c127615cfb8a25a4a2610e2f4ab72f6bc3f5988de10
-EBUILD libheif-9999.ebuild 2394 BLAKE2B f9c698929ecab311ac0839b36bbc4f52dddea68d47096207c2087c058d8f53e42993cb55acdf6f03bb48b8186e113c158b9182c882bb3cee86bd95b022f11809 SHA512 dc9690c1ab290b68cdc29cb2be5d5d48e4c1c287ca14f97693b3fdff2acfef14683867aef02ca50df5b3520f3e757fc1a69605f964bbe47eb0b6dc7ef0679bd5
-MISC metadata.xml 809 BLAKE2B f26844fa79747ac286a0130cb8cb2b4f0e771ed7fa3f9fe29a3fbd71876902c868dc32305f928cedbb88dcadab3c07cb4f85c647369adc904c7c9c463dd05343 SHA512 754ef9004dc664cca658bfbd0392fce837557efe1b92aefe198dd529cb388048f49e37648c7338829d6ecd87ea953efd0f66895191aea7bd39730c2f7240f032
+EBUILD libheif-1.18.2-r1.ebuild 2380 BLAKE2B 6af9ece7352928a1d227f263cb7c2f9aa4081027380f1a94c88de1c0b56b05cca4691bca16996ac546f6fa127a1403fd0b8ca204ac48074235ddd51f09a7c858 SHA512 4a3c3cfb2dd541c47c9d5afaf4052c30da1095c7a0c9f6441fb673787c006d8bab9bc903668b95563abe2bfddc1b36c8eec380608a95d95db1e4b26b6a211bd4
+EBUILD libheif-9999.ebuild 2465 BLAKE2B 281f241c75b1f6f22c0343ae6ef2675ae758a1ba97b8d6c49688f2c1113e9c8df0d93952110ce85f59d619f5efb3f499380399ec4696bece76b0869c929fa917 SHA512 ae5451a14d82ec7419f72f9f1eee03b106acef04892670fdb2d456f730f311f02e7bb1e72ed43562a388d34797f5a8c01543d90acc41504fc91326366c414cb6
+MISC metadata.xml 899 BLAKE2B bf3dc09f9559614dc66710f014062a162fb0f823b328d02279c1940d513cd6fd0be6b1def6888e185c11d92ea5ee2d42115480f50a122ed4770cbdd636ffdd40 SHA512 b88aa85902211157026612620985ec53a3f6f6b7218d44b6d0289924f0710019f69ebaf0a92fddb983023485186f20eb75e5d8a26b09fe8d64cf9cda3c28382b
diff --git a/media-libs/libheif/libheif-1.18.2-r1.ebuild b/media-libs/libheif/libheif-1.18.2-r1.ebuild
new file mode 100644
index 000000000000..d225bd42c228
--- /dev/null
+++ b/media-libs/libheif/libheif-1.18.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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/$(ver_cut 1-2)"
+IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads +webp 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}]
+	media-libs/tiff:=[${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:= )
+	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libheif/heif_version.h
+)
+
+src_prepare() {
+	if use test ; then
+		# bug 865351
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
+	sed -e '/Werror/d' -i CMakeLists.txt || die # bug 936466
+
+	cmake_src_prepare
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local mycmakeargs=(
+		-DENABLE_PLUGIN_LOADING=true
+		-DWITH_LIBDE265=true
+		-DWITH_AOM_DECODER=$(usex aom)
+		-DWITH_AOM_ENCODER=$(usex aom)
+		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
+		-DWITH_RAV1E="$(multilib_native_usex rav1e)"
+		-DWITH_SvtEnc="$(usex svt-av1)"
+		-DWITH_LIBSHARPYUV=$(usex webp)
+		-DWITH_X265=$(usex x265)
+		-DWITH_KVAZAAR=true
+		-DWITH_JPEG_DECODER=true
+		-DWITH_JPEG_ENCODER=true
+		-DWITH_OpenJPEG_DECODER=true
+		-DWITH_OpenJPEG_ENCODER=true
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	default
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	default
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/media-libs/libheif/libheif-1.18.2.ebuild b/media-libs/libheif/libheif-1.18.2.ebuild
deleted file mode 100644
index eb8d3c1b497c..000000000000
--- a/media-libs/libheif/libheif-1.18.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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/$(ver_cut 1-2)"
-IUSE="+aom gdk-pixbuf go rav1e svt-av1 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}]
-	media-libs/tiff:=[${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:= )
-	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
-	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libheif/heif_version.h
-)
-
-src_prepare() {
-	if use test ; then
-		# bug 865351
-		rm tests/catch.hpp || die
-		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
-	fi
-
-	sed -e '/Werror/d' -i CMakeLists.txt || die # bug 936466
-
-	cmake_src_prepare
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export GO111MODULE=auto
-	local mycmakeargs=(
-		-DENABLE_PLUGIN_LOADING=true
-		-DWITH_LIBDE265=true
-		-DWITH_AOM_DECODER=$(usex aom)
-		-DWITH_AOM_ENCODER=$(usex aom)
-		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
-		-DWITH_RAV1E="$(multilib_native_usex rav1e)"
-		-DWITH_SvtEnc="$(usex svt-av1)"
-		-DWITH_X265=$(usex x265)
-		-DWITH_KVAZAAR=true
-		-DWITH_JPEG_DECODER=true
-		-DWITH_JPEG_ENCODER=true
-		-DWITH_OpenJPEG_DECODER=true
-		-DWITH_OpenJPEG_ENCODER=true
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	default
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	default
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index b5c9b73f88d0..0ee4f90982c5 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake xdg multilib-minimal
 
-if [[ ${PV} == *9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
 	inherit git-r3
 else
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads x265"
+IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads +webp x265"
 REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
@@ -30,7 +30,7 @@ BDEPEND="
 "
 DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libde265[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	media-libs/tiff:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
@@ -40,6 +40,7 @@ DEPEND="
 	go? ( dev-lang/go )
 	rav1e? ( media-video/rav1e:= )
 	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:= )
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
@@ -73,6 +74,7 @@ multilib_src_configure() {
 		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
 		-DWITH_RAV1E="$(multilib_native_usex rav1e)"
 		-DWITH_SvtEnc="$(usex svt-av1)"
+		-DWITH_LIBSHARPYUV=$(usex webp)
 		-DWITH_X265=$(usex x265)
 		-DWITH_KVAZAAR=true
 		-DWITH_JPEG_DECODER=true
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index e1aa5ee8fec4..c7254be4a3ca 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -8,6 +8,7 @@
 	<flag name="go">Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
 	<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
 	<flag name="svt-av1">Use <pkg>media-libs/svt-av1</pkg> for SVT-AV1 encoding</flag>
+	<flag name="webp">Enable high-quality YCbCr/RGB color space conversion algorithms</flag>
 	<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
 	</use>
 	<upstream>
-- 
cgit v1.2.3