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

["Michał Górny" <mgorny@gentoo.org>]

commit:     af0647a3c01e93d02e0866403b95c94806e33bd3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 19:32:08 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 19:34:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af0647a3

media-libs/libjxl: Bump to 0.10.1

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-libs/libjxl/Manifest                         |  1 +
 .../{libjxl-9999.ebuild => libjxl-0.10.1.ebuild}   | 34 ++++++++++++++--------
 media-libs/libjxl/libjxl-9999.ebuild               | 16 ++++++----
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 6b21c2513d5b..a11a0bfcffe3 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,3 +1,4 @@
+DIST libjxl-0.10.1.tar.gz 1911155 BLAKE2B f7f1cc7c6bf34c1608cd28f36f5c2c42f17ba10824e18300e84824c908cb5fc7e0e0157a7bfe6b8aac7197a4abcca0806404251e1ed6ae38f15ff8e449f0980e SHA512 54dc043dbed4e4bda1a591a07549f31fde17b67c5d754b1676616f3d8ffb82debafa3ed69041fd6523c907550543b11a3788d5cd3f1ca18e3ee2888760795ae3
 DIST libjxl-0.8.1.tar.gz 1611905 BLAKE2B 75d7b4987c211e747520688a700744a0996483546b5929e8b765a66fc603b4d6edea8556bb427b8c7440ef447161fc38ef5ea390775f185df577da920711a009 SHA512 8011f2181cb627c2b516c7e1b8ecec78a201f357f3be6e568f7814a6a9c42d5979f4bb4ed040a67d68f6649d1f5c564f3cb2fac7e52702f755749084d903a737
 DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f6919c3cc3f056ca4a9679162e89f2de35ab7d0b2a60782d39eca1f4ddad779f8d25d3f520417f6d9dea71e854db SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
 DIST libjxl-0.9.1.tar.gz 1872279 BLAKE2B 723a098c07d61e7d1f4a7fda04d8be60594cf5a21307242e6d06deca64f8a2343078248d280fc8eb3fc9bb2277f7ffc6cc547b57a605a7aa95a0b21095450ccf SHA512 a3169dac40b297617075a49cc5cdfa25e793a34b5dfe95db9c2560bdc967743882f0014d1d0fd508b8d2ea02cb3766d2f295af7a2cf9def8f5370f97b24aa16f

diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-0.10.1.ebuild
similarity index 77%
copy from media-libs/libjxl/libjxl-9999.ebuild
copy to media-libs/libjxl/libjxl-0.10.1.ebuild
index d4f4eca9f06c..6e3a1167a1a8 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-0.10.1.ebuild
@@ -3,19 +3,24 @@
 
 EAPI=8
 
-inherit cmake-multilib flag-o-matic git-r3 gnome2-utils
+inherit cmake-multilib flag-o-matic gnome2-utils
 
+# This changes frequently.  Please check the testdata submodule when bumping.
+TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc"
 DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-
-EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
-EGIT_SUBMODULES=(third_party/libjpeg-turbo
-	third_party/skcms
-	third_party/testdata
-)
+HOMEPAGE="https://github.com/libjxl/libjxl/"
+SRC_URI="
+	https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	test? (
+		https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
+			-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz
+	)
+"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gdk-pixbuf openexr test"
 RESTRICT="!test? ( test )"
 
@@ -26,15 +31,19 @@ DEPEND="
 	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
 	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
-	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 	)
 	openexr? ( media-libs/openexr:= )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
 	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	filter-lto
@@ -62,10 +71,11 @@ multilib_src_configure() {
 		-DBUILD_TESTING=$(usex test ON OFF)
 	)
 
-	use test &&
+	if use test; then
 		mycmakeargs+=(
 			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
 		)
+	fi
 
 	if multilib_is_native_abi; then
 		mycmakeargs+=(

diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index d4f4eca9f06c..ff080a803195 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -6,10 +6,11 @@ EAPI=8
 inherit cmake-multilib flag-o-matic git-r3 gnome2-utils
 
 DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
+HOMEPAGE="https://github.com/libjxl/libjxl/"
 
 EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
-EGIT_SUBMODULES=(third_party/libjpeg-turbo
+EGIT_SUBMODULES=(
+	third_party/libjpeg-turbo
 	third_party/skcms
 	third_party/testdata
 )
@@ -26,15 +27,19 @@ DEPEND="
 	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
 	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
-	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 	)
 	openexr? ( media-libs/openexr:= )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
 	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	filter-lto
@@ -62,10 +67,11 @@ multilib_src_configure() {
 		-DBUILD_TESTING=$(usex test ON OFF)
 	)
 
-	use test &&
+	if use test; then
 		mycmakeargs+=(
 			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
 		)
+	fi
 
 	if multilib_is_native_abi; then
 		mycmakeargs+=(