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

[Joonas Niilola]

commit:     db2e6b894b5b6168eeb56cc8a3c2f6f4e349a964
Author:     Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 07:56:27 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 06:28:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2e6b89

media-libs/libavif: fix 9999

These changes fix:
  - configuration options
  - missing media-gfx/imagemagick[lcms]
    for the test_cmd_icc_profile test

Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37667
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-libs/libavif/libavif-9999.ebuild | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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