From e30e4d48eb18b5297a53e727ded94d337f4aa021 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Tue, 12 Oct 2021 08:58:22 -0400 Subject: media-libs/libjxl: fixes --- media-libs/libjxl/libjxl-9999.ebuild | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'media-libs/libjxl/libjxl-9999.ebuild') diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild index 6a78c3d..df6ab5d 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-9999.ebuild @@ -55,7 +55,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/system-lcms.patch" - "${FILESDIR}/roundtripanimationpatches-ifdef-gif.patch" + "${FILESDIR}/roundtripanimationpatches-ifdef-gif-9999.patch" ) src_prepare() { @@ -73,22 +73,23 @@ multilib_src_configure() { -DJPEGXL_ENABLE_COVERAGE=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_JNI=$(usex java ON OFF) + -DJPEGXL_ENABLE_JNI=$(multilib_native_usex java ON OFF) -DJPEGXL_ENABLE_MANPAGES=$(multilib_native_usex man ON OFF) -DJPEGXL_ENABLE_OPENEXR=$(usex openexr ON OFF) -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers ON OFF) - -DJPEGXL_FORCE_SYSTEM_GTEST=ON -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_FORCE_SYSTEM_GTEST=ON -DJPEGXL_FORCE_SYSTEM_HWY=ON -DJPEGXL_FORCE_SYSTEM_LCMS=ON -DJPEGXL_WARNINGS_AS_ERRORS=OFF $(cmake_use_find_package apng PNG) $(cmake_use_find_package apng ZLIB) - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(! multilib_is_native_abi || use doc || echo ON) + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) $(cmake_use_find_package gif GIF) $(cmake_use_find_package jpeg JPEG) ) @@ -96,14 +97,6 @@ multilib_src_configure() { cmake_src_configure } -multilib_src_test() { - # RobustStatisticsTest: https://github.com/libjxl/libjxl/issues/698 - local myctestargs=( - -E '^RobustStatisticsTest\.' - ) - cmake_src_test -} - multilib_src_install() { cmake_src_install if ! use static-libs; then -- cgit v1.2.3-54-g00ecf