*/*: various fixes

4 files changed, 14 insertions, 12 deletions

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 59541c9..5351cce 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,2 +1,3 @@
 DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
 DIST lodepng-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz 240079 BLAKE2B 08240bd72d22f789bc0e06ed1d641fbca21ca674697880d4f004e4e76bb1b6cf595e931d2447544d896c79576e942db3cbdcca91d717f4ad8ddcfbd6c5bdc97e SHA512 50a515f1f15122fa017637be30df0db05980d07f8891f16b0b68697ef0df797176bbe005df623e9f2dbb68b750b0a87e69c3cef215c7bf15187d00491c4023c7
+DIST skcms-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz 9181226 BLAKE2B 7e929079e3312ef7196092301eeeb24a9a4db407e3951ab6e6903fa0dfcf6e5861edd56a6ffdd3313d8d30edd9f3cedeebb36c7189bc2dc65d711ced2f8bb176 SHA512 d61670c68ec7f0fa88d10fd47f0a158364a74cedadebca227f18fc2ab652b3f3dc48e695d7be9dcc352aeab8e90054c6db19a521f653ceb66ed8038db9efc64f
diff --git a/media-libs/libjxl/libjxl-0.6.1-r1.ebuild b/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
index c857391..1677cc8 100644
--- a/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
 	EGIT_SUBMODULES=(third_party/lodepng third_party/skcms)
 else
-	LODEPNG_COMMIT="8c6a9e30576f07bf470ad6f09458a2dcd7a6a84a"
+	LODEPNG_COMMIT="48e5364ef48ec2408f44c727657ac1b6703185f8"
 	SKCMS_COMMIT="64374756e03700d649f897dbd98c95e78c30c7da"
 	SRC_URI="
 		https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz
-		https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz
+		https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${LODEPNG_COMMIT}.tar.gz
 	"
 fi
 
@@ -28,7 +28,7 @@ SLOT="0/7"
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
-IUSE="apng doc gdk-pixbuf gif gimp java +jpeg +man openexr qt5 static-libs test +tools"
+IUSE="apng doc gdk-pixbuf gif gimp java +jpeg +man openexr static-libs test +tools viewers"
 
 RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
 	dev-cpp/highway[${MULTILIB_USEDEP}]
@@ -42,7 +42,7 @@ RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
 	java? ( >=virtual/jre-1.8:* )
 	jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr:= )
-	qt5? (
+	viewers? (
 		dev-qt/qtwidgets
 		dev-qt/qtx11extras
 	)
@@ -50,7 +50,7 @@ RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
 BDEPEND="
 	doc? ( app-doc/doxygen )
 	man? ( app-text/asciidoc )
-	qt5? ( kde-frameworks/extra-cmake-modules )
+	viewers? ( kde-frameworks/extra-cmake-modules )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
@@ -87,7 +87,7 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_SJPEG=OFF
 		-DJPEGXL_ENABLE_SKCMS=ON
 		-DJPEGXL_ENABLE_TCMALLOC=OFF
-		-DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex qt5)
+		-DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers)
 
 		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(multilib_native_usex apng OFF ON)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 3b4d4b0..abad6a9 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="
 		https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz
-		https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz
+		https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${SKCMS_COMMIT}.tar.gz
 	"
 fi
 
@@ -28,7 +28,7 @@ SLOT="0/7"
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
-IUSE="apng doc gdk-pixbuf gif gimp java +jpeg +man openexr qt5 static-libs test +tools"
+IUSE="apng doc gdk-pixbuf gif gimp java +jpeg +man openexr static-libs test +tools viewers"
 
 RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
 	dev-cpp/highway[${MULTILIB_USEDEP}]
@@ -42,7 +42,7 @@ RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
 	java? ( >=virtual/jre-1.8:* )
 	jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr:= )
-	qt5? (
+	viewers? (
 		dev-qt/qtwidgets
 		dev-qt/qtx11extras
 	)
@@ -50,7 +50,7 @@ RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
 BDEPEND="
 	doc? ( app-doc/doxygen )
 	man? ( app-text/asciidoc )
-	qt5? ( kde-frameworks/extra-cmake-modules )
+	viewers? ( kde-frameworks/extra-cmake-modules )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
@@ -83,7 +83,7 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_SJPEG=OFF
 		-DJPEGXL_ENABLE_SKCMS=ON
 		-DJPEGXL_ENABLE_TCMALLOC=OFF
-		-DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex qt5)
+		-DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers)
 
 		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(multilib_native_usex apng OFF ON)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index 827bf4b..11f6fe3 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="doc">Doxygen API documentation</flag>
 		<flag name="gdk-pixbuf">gdk-pixbuf plugin</flag>
 		<flag name="jpeg">JPEG v1 support in tools. Note that reconstructed JPEG files are supported regardless of this option.</flag>
-		<flag name="qt5">Viewer programs</flag>
+		<flag name="tools">Tool programs (cjxl, djxl)</flag>
+		<flag name="viewers">Viewer programs</flag>
 	</use>
 </pkgmetadata>