commit: 591c186a97f0f9153d5850fdc39eae6390755106 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 10 11:41:07 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 10 11:44:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c186a
media-libs/libheif: Add IUSE webp Closes: https://bugs.gentoo.org/942766 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../{libheif-9999.ebuild => libheif-1.18.2-r1.ebuild} | 15 ++++++++------- media-libs/libheif/libheif-9999.ebuild | 8 +++++--- media-libs/libheif/metadata.xml | 1 + 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-1.18.2-r1.ebuild similarity index 87% copy from media-libs/libheif/libheif-9999.ebuild copy to media-libs/libheif/libheif-1.18.2-r1.ebuild index b5c9b73f88d0..6acf66763534 100644 --- a/media-libs/libheif/libheif-9999.ebuild +++ b/media-libs/libheif/libheif-1.18.2-r1.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,19 +18,19 @@ 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 )" BDEPEND=" test? ( - dev-cpp/catch + <dev-cpp/catch-3 dev-lang/go ) " 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,13 +40,11 @@ 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}" -# https://github.com/strukturag/libheif/issues/1249 -PATCHES=( "${FILESDIR}"/${P}-prepend_DESTDIR_when_generating_heif-convert_symlink.patch ) - MULTILIB_WRAPPED_HEADERS=( /usr/include/libheif/heif_version.h ) @@ -58,6 +56,8 @@ src_prepare() { 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 @@ -73,6 +73,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/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>
