commit:     fd5f96251585aea0a96136b348925bdc04273273
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 12:42:05 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 12:57:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd5f9625

media-gfx/exiv2: Add IUSE jpegxl

Also fix DEPENDs, amends commit 796df1b8e5b17ac16f93676c64acd055eb337cc7

Thanks-to: David Korth
Closes: https://bugs.gentoo.org/915213
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/exiv2/exiv2-0.28.2-r1.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild 
b/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild
index ff96fd33e732..f9cb7f722f63 100644
--- a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild
@@ -22,20 +22,19 @@ LICENSE="GPL-2"
 # We may be able to change it to $(ver_cut 1-2) once e.g.
 # https://github.com/Exiv2/exiv2/pull/917 is merged.
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+bmff doc examples nls +png test webready +xmp"
+IUSE="+bmff doc examples jpegxl nls +png test webready +xmp"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
        dev-libs/inih[${MULTILIB_USEDEP}]
        >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+       jpegxl? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
        nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
        png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-       webready? (
-               net-misc/curl[${MULTILIB_USEDEP}]
-       )
+       webready? ( net-misc/curl[${MULTILIB_USEDEP}] )
        xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
        test? ( dev-cpp/gtest )
 "
 BDEPEND="
@@ -74,7 +73,7 @@ src_prepare() {
 multilib_src_configure() {
        local mycmakeargs=(
                -DEXIV2_BUILD_SAMPLES=NO
-               -DEXIV2_ENABLE_BROTLI=OFF
+               -DEXIV2_ENABLE_BROTLI=$(usex jpegxl)
                -DEXIV2_ENABLE_NLS=$(usex nls)
                -DEXIV2_ENABLE_PNG=$(usex png)
                -DEXIV2_ENABLE_CURL=$(usex webready)

Reply via email to