From 19b6ee862a59f1b04ec6a60b0f30f52d0e027c5b Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Wed, 6 Oct 2021 15:59:35 -0400
Subject: Revert "media-libs/libjxl: various fixes"
gdk-pixbuf needs skcms
---
media-libs/libjxl/libjxl-0.6.ebuild | 15 +++++++--------
media-libs/libjxl/libjxl-9999.ebuild | 11 ++++-------
media-libs/libjxl/metadata.xml | 1 -
3 files changed, 11 insertions(+), 16 deletions(-)
(limited to 'media-libs')
diff --git a/media-libs/libjxl/libjxl-0.6.ebuild b/media-libs/libjxl/libjxl-0.6.ebuild
index 8bd5fb0..3a32b3c 100644
--- a/media-libs/libjxl/libjxl-0.6.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.ebuild
@@ -22,8 +22,10 @@ fi
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apng doc gif gdk-pixbuf gimp java jpeg +man openexr static-libs test viewers"
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+IUSE="apng doc gif java jpeg +man openexr static-libs test viewers"
RDEPEND="app-arch/brotli
dev-cpp/highway
@@ -32,10 +34,8 @@ RDEPEND="app-arch/brotli
media-libs/libpng
sys-libs/zlib
)
- gdk-pixbuf? ( x11-libs/gdk-pixbuf )
gif? ( media-libs/giflib )
- gimp? ( media-gfx/gimp )
- java? ( virtual/jdk:* )
+ java? ( virtual/jdk )
jpeg? ( virtual/jpeg )
man? ( app-text/asciidoc )
openexr? ( media-libs/openexr:= )
@@ -59,8 +59,6 @@ src_prepare() {
rmdir third_party/lodepng
ln -sv ../../lodepng-${LODEPNG_COMMIT} third_party/lodepng || die
fi
- use gdk-pixbuf || sed -i -e '/(gdk-pixbuf)/s/^/#/' plugins/CMakeLists.txt || die
- use gimp || sed -i -e '/(gimp)/s/^/#/' plugins/CMakeLists.txt || die
cmake_src_prepare
}
@@ -74,7 +72,7 @@ src_configure() {
-DJPEGXL_ENABLE_JNI=$(usex java ON OFF)
-DJPEGXL_ENABLE_MANPAGES=$(usex man ON OFF)
-DJPEGXL_ENABLE_OPENEXR=$(usex openexr ON OFF)
- -DJPEGXL_ENABLE_PLUGINS=ON # USE=gdk-pixbuf, USE=gimp handled in src_prepare
+ -DJPEGXL_ENABLE_PLUGINS=OFF
-DJPEGXL_ENABLE_SJPEG=OFF
-DJPEGXL_ENABLE_SKCMS=OFF
-DJPEGXL_ENABLE_VIEWERS=$(usex viewers ON OFF)
@@ -82,6 +80,7 @@ src_configure() {
-DJPEGXL_FORCE_SYSTEM_BROTLI=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)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index b6a3bdd..3a32b3c 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="apng doc gif gdk-pixbuf gimp java jpeg +man openexr static-libs test viewers"
+IUSE="apng doc gif java jpeg +man openexr static-libs test viewers"
RDEPEND="app-arch/brotli
dev-cpp/highway
@@ -34,10 +34,8 @@ RDEPEND="app-arch/brotli
media-libs/libpng
sys-libs/zlib
)
- gdk-pixbuf? ( x11-libs/gdk-pixbuf )
gif? ( media-libs/giflib )
- gimp? ( media-gfx/gimp )
- java? ( virtual/jdk:* )
+ java? ( virtual/jdk )
jpeg? ( virtual/jpeg )
man? ( app-text/asciidoc )
openexr? ( media-libs/openexr:= )
@@ -61,8 +59,6 @@ src_prepare() {
rmdir third_party/lodepng
ln -sv ../../lodepng-${LODEPNG_COMMIT} third_party/lodepng || die
fi
- use gdk-pixbuf || sed -i -e '/(gdk-pixbuf)/s/^/#/' plugins/CMakeLists.txt || die
- use gimp || sed -i -e '/(gimp)/s/^/#/' plugins/CMakeLists.txt || die
cmake_src_prepare
}
@@ -76,7 +72,7 @@ src_configure() {
-DJPEGXL_ENABLE_JNI=$(usex java ON OFF)
-DJPEGXL_ENABLE_MANPAGES=$(usex man ON OFF)
-DJPEGXL_ENABLE_OPENEXR=$(usex openexr ON OFF)
- -DJPEGXL_ENABLE_PLUGINS=ON # USE=gdk-pixbuf, USE=gimp handled in src_prepare
+ -DJPEGXL_ENABLE_PLUGINS=OFF
-DJPEGXL_ENABLE_SJPEG=OFF
-DJPEGXL_ENABLE_SKCMS=OFF
-DJPEGXL_ENABLE_VIEWERS=$(usex viewers ON OFF)
@@ -84,6 +80,7 @@ src_configure() {
-DJPEGXL_FORCE_SYSTEM_BROTLI=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)
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index 431bc32..c8bb826 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="apng">APNG support</flag>
- <flag name="gdk-pixbuf">gdk-pixbuf plugin</flag>
<flag name="viewers">Viewer programs</flag>
</use>
</pkgmetadata>
--
cgit v1.2.3-70-g09d2