commit:     8b8261bdf8937e80cae99f020bf58e4b02976950
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Jul 19 17:32:31 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 19 19:46:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8261bd

media-libs/libheif: add 1.20.1, add USE=tools

Upstream added WITH_EXAMPLE_HEIF_VIEW for the sdl2 dep, so 9999 and 1.20.1
differ.

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43070
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libheif/Manifest                               |  1 +
 .../{libheif-9999.ebuild => libheif-1.20.1.ebuild}        | 15 ++++++++++++++-
 media-libs/libheif/libheif-9999.ebuild                    |  8 +++++++-
 media-libs/libheif/metadata.xml                           |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 15de994d0009..e33c40641976 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,3 +1,4 @@
 DIST libheif-1.18.2.tar.gz 1525096 BLAKE2B 
667a68f324f89b2274ea837ec8d40ada5450dce79f2b8d9e8ba365fe5f02d4222195109519380a6d38c4ebca929575e58c3a8e517aed27a2696d67db3e287556
 SHA512 
8fd47dbc8e31fdb6a972c852bc4e78440492ee3dd769e139f28ad489ccc23e6cf42a90cd23b16405fa30df3c7c43c78b2b65d5ca3ffb449bf06789b457ed3072
 DIST libheif-1.19.7.tar.gz 1717186 BLAKE2B 
78c7db44b9131fbf46516fdb1ef149dd402e11512f600f6b0d5d73768d760cce023e4f2481accdbfb1826c9be9668f933b57a6c2a6da58b731c6aa409d94750b
 SHA512 
b0c3226c528daf78d8e8f73b5a07b9104e3ff036c553a66fdd0ca494380d8fb03c799241f0ea66b5f7e42d4fec87d186571f2aae9ac4820ffd7ff76d704f487b
 DIST libheif-1.19.8.tar.gz 1718218 BLAKE2B 
048fe46fc6d4a889ff80da51b6768b505d265a11b2363ecc9d908438dfd8613d0e460737a36a30e5fd84c6e91c70f22f86778cb5f04ab1f6a8b9eae54c027ab0
 SHA512 
ccb7359c2a7632fd598bb82d238482652fec58c8cebfecd3c2fef07d814d6e623d7916db18eeb47887f1c32bbdbb80680533643b7610880844e1dee3e128cade
+DIST libheif-1.20.1.tar.gz 1787033 BLAKE2B 
11f312d9b4222a8f07e0953d3f828a7b324d4fb3359d7a33f0ef7f2507cbd9ca06c5d433cf3271934bcf748f5e9a5c9c008b4373e82b21e264fc817190a32fb9
 SHA512 
360a02e71bd1693c42e110ebf77e8da576775517c8c0250c02bbfd8fd0ceb6b56d3d7cec76eddf8dfc572687c308cfb756e4c3519d31572d25c0a7557d3de415

diff --git a/media-libs/libheif/libheif-9999.ebuild 
b/media-libs/libheif/libheif-1.20.1.ebuild
similarity index 89%
copy from media-libs/libheif/libheif-9999.ebuild
copy to media-libs/libheif/libheif-1.20.1.ebuild
index 8d6afffecf3d..c50b717c32c8 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-1.20.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3 MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom dav1d +de265 doc examples ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar 
openh264 rav1e svt-av1 test +threads +webp x265"
+IUSE="+aom dav1d +de265 doc examples ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar 
openh264 rav1e svt-av1 test +threads tools +webp x265"
 # IUSE+=" vvdec vvenc"
 RESTRICT="!test? ( test )"
 
@@ -39,6 +39,11 @@ DEPEND="
        openh264? ( media-libs/openh264:=[${MULTILIB_USEDEP}] )
        rav1e? ( media-video/rav1e:= )
        svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
+       tools? (
+               examples? (
+                       media-libs/libsdl2:=[${MULTILIB_USEDEP}]
+               )
+       )
        webp? ( media-libs/libwebp:= )
        x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
 "
@@ -60,6 +65,7 @@ multilib_src_configure() {
                -DWITH_AOM_ENCODER=$(usex aom)
                -DWITH_DAV1D=$(usex dav1d)
                -DWITH_EXAMPLES=$(usex examples)
+               -DWITH_EXAMPLE_HEIF_VIEW=$(usex examples $(usex tools))
                -DWITH_FFMPEG_DECODER=$(usex ffmpeg)
                -DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
                -DWITH_OpenH264_DECODER=$(usex openh264)
@@ -77,6 +83,13 @@ multilib_src_configure() {
                -DWITH_OpenJPEG_ENCODER=$(usex jpeg2k)
        )
 
+       # TODO WITH_EXAMPLE_HEIF_VIEW in -9999
+       if ! use tools; then
+               mycmakeargs+=(
+                       -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=ON
+               )
+       fi
+
        cmake_src_configure
 }
 

diff --git a/media-libs/libheif/libheif-9999.ebuild 
b/media-libs/libheif/libheif-9999.ebuild
index 8d6afffecf3d..b75aae965d92 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3 MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom dav1d +de265 doc examples ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar 
openh264 rav1e svt-av1 test +threads +webp x265"
+IUSE="+aom dav1d +de265 doc examples ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar 
openh264 rav1e svt-av1 test +threads tools +webp x265"
 # IUSE+=" vvdec vvenc"
 RESTRICT="!test? ( test )"
 
@@ -39,6 +39,11 @@ DEPEND="
        openh264? ( media-libs/openh264:=[${MULTILIB_USEDEP}] )
        rav1e? ( media-video/rav1e:= )
        svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
+       tools? (
+               examples? (
+                       media-libs/libsdl2:=[${MULTILIB_USEDEP}]
+               )
+       )
        webp? ( media-libs/libwebp:= )
        x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
 "
@@ -60,6 +65,7 @@ multilib_src_configure() {
                -DWITH_AOM_ENCODER=$(usex aom)
                -DWITH_DAV1D=$(usex dav1d)
                -DWITH_EXAMPLES=$(usex examples)
+               -DWITH_EXAMPLE_HEIF_VIEW=$(usex examples $(usex tools))
                -DWITH_FFMPEG_DECODER=$(usex ffmpeg)
                -DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
                -DWITH_OpenH264_DECODER=$(usex openh264)

diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index 9b2dd1434955..a5b7b6225c19 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -12,6 +12,7 @@
        <flag name="openh264">Enable H.264 support using 
<pkg>media-libs/openh264</pkg></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="tools">Build heif-view tool</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>

Reply via email to