gentoo auto-resync : 06:06:2024 - 00:07:57

6 files changed, 347 insertions, 8 deletions

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 20adcc5184ee..205fd1f119cd 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -6,8 +6,11 @@ DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f69
 DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f
 DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f
 DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384
+EBUILD libjxl-0.10.2-r1.ebuild 2945 BLAKE2B 00773bbe7fe462c425558fc9456f5871ab70a9083a52746e5fd8f0a0bf939654d4528213a85aa0cff31ee9722891b2306e14b962c58953ed65ceaa4585c778e2 SHA512 1b3470cb66f1bad55f76c4bb1b24f01a85973be5199e9cddba758e40714dce21b90a28eaeb5693c9906784448492e049ab337ddb6f07e5cb8651d57b9b52fe86
 EBUILD libjxl-0.10.2.ebuild 2722 BLAKE2B 628d35e59657616b49b5ab54308c3d8600bc18c135cf9c464055ba739239cc67e079693251f5da9c0f0f509f4d88bcd95b47c1472549fb8ed0bc6964424336aa SHA512 9b78395438c0116b286b8f56996cfce92845186f23d644621008de619fe9c87c6554a9749b5b121a2e226ae68b087c05dcb1a0ffc663131cf5ee151696bc222d
 EBUILD libjxl-0.8.2-r1.ebuild 2339 BLAKE2B 5e919bdd10fe20de0b45122a7ed2f037ef3e54c4c17a385bdc930288c8b9ccbabf0de82bedfe8510999ea8085d37981764243662fccd872f29ba19ac14d9c407 SHA512 f9227486972af086b08140bd81bd02cb3f303792f168fb05ef9dc5c743c6ad576da3f2a5616b31aeefdaa77d1c7fef6a04da0fdd36648ad7361aaaee2ce7f603
+EBUILD libjxl-0.8.2-r2.ebuild 2571 BLAKE2B 3d66e80efb11dd03ab12446eba565a26b136cd75644c8d5dd976fb2bc47bb0129e9afdd091b2200b9e62076ec0586b72cdcb4eb3c919aebfde91b02b6acc78a9 SHA512 f1ba0c1652f21bcba6bf8825d925cc97e2c9340711afeade8d7aa76ca2588bb81f7949e84139fe44aebb150e560a11f301e580a1f5564073f789d91d35c261ff
+EBUILD libjxl-0.9.2-r1.ebuild 3007 BLAKE2B 6ded330ffaf6eb2daf3a402c91b4abd16769ff3e41b86d08f7717d27b76806a4e95a27a5f5a5b824b6068038616d863145e75458d1716ab0bcf9720acb38c6ea SHA512 1fcf2d77d03f317f07569d2124771abda3827043738e98c105961ae9ed1d9099aafa7972d7c57d154465fd7ae9f400390c3764287f7758663cf4f860cf25910a
 EBUILD libjxl-0.9.2.ebuild 2784 BLAKE2B bb08ef63e10bcc07381fac168baa3b596f93e91c3d648b89f2a7ec0296b1bb4713fa91459faab76a08f89fe77cb23051131f19b3dcf1d6be3843b41ad6f8f271 SHA512 aeeca7ebde32c21a18e07d0b8e3c54fbdaa13b53d1c9eb642f53d34a56fd7b206d519c8f617d78fc691ffcd69745282577c589df3bef8af0692e9ef3346c2c06
-EBUILD libjxl-9999.ebuild 2417 BLAKE2B 65ce5cf9c5b1f2834b4fe15af97040309f50059fb06ee3ae7a7123a0c84069a9a2a03b5c9c215333b78b5dd73e79e2c01ff0ee52c1cf1ea6053b359e53948c4a SHA512 8265b56e188587d2d6eb0114de4c08979168fa57125e27acb50febdf907e8d1c3956d01b1e58c732369725665418e0e2ae3152538f5c78b35b02d0644a9e33d3
-MISC metadata.xml 864 BLAKE2B 04139ce686fbc36068182d03fc23f0a0d49262f8c6b21a690705411330c3b5ec4f969d0ed27fc712fc184736bb20e9bfa3a6fe2fe6d5db98527334151dc0a8d6 SHA512 73e89d636908712608a41f8c4b7f29fc9d551030cebcd83e8db722869aaff0bc96c1ad6c05c5dbe3a2b2b29b8c639c95d02a8d4ed7094a9200af7f008c9b20de
+EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339
+MISC metadata.xml 1029 BLAKE2B 4c5ef3d7aca316b497d964b1afcee9f71b165545691182c3818ef4f9a8bc7f10fdbed36a8bd58b0051b1f9851018a11efa3e9f7b57c5ec935435e16bd26b6036 SHA512 a3129f77efc640e78a2f1fa481fb6363249be74e74aabccb51970ec101808db95a326deeecfa557b669cfb2bf26622fc7dbcbe7624a0315d770e697bc3734296
diff --git a/media-libs/libjxl/libjxl-0.10.2-r1.ebuild b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..3430ddbc8d00
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib 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/"
+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/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+gdk-pixbuf gif jpeg openexr +png test"
+REQUIRED_USE="test? ( png )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	gdk-pixbuf? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+	)
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DJPEGXL_ENABLE_PLUGINS=ON
+			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
+			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
+			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DJPEGXL_ENABLE_PLUGINS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libjxl/libjxl-0.8.2-r2.ebuild b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..ff3f34b606fb
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+# This changes frequently.  Please check the testdata submodule when bumping.
+TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759"
+DESCRIPTION="JPEG XL image format reference implementation"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gif jpeg openexr +png test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch"
+	"${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_ENABLE_PLUGINS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DBUILD_TESTING=$(usex test ON OFF)
+		)
+		use test &&
+			mycmakeargs+=( -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" )
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DBUILD_TESTING=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/libjxl/libjxl-0.9.2-r1.ebuild b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..00adab4f5232
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib 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/"
+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/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+gdk-pixbuf gif jpeg openexr +png test"
+REQUIRED_USE="test? ( png )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	gdk-pixbuf? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+	)
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-backport-pr3143.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DJPEGXL_ENABLE_PLUGINS=ON
+			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
+			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
+			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DJPEGXL_ENABLE_PLUGINS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index aef3acb16445..5841fd207bc5 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -10,28 +10,28 @@ 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
 )
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+gdk-pixbuf openexr test"
+IUSE="+gdk-pixbuf gif jpeg openexr +png test"
+REQUIRED_USE="test? ( png )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	app-arch/brotli:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
-	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	gdk-pixbuf? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 	)
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
 	${DEPEND}
@@ -49,6 +49,10 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_SJPEG=OFF
 		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
 
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
 		-DJPEGXL_ENABLE_SKCMS=OFF
 		-DJPEGXL_ENABLE_VIEWERS=OFF
 		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index 1f058f4c648f..faffa19f3221 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -19,7 +19,11 @@
     Contains command line utilities: cjxl, djxl, jxlinfo.
   </longdescription>
   <use>
-    <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
+    <flag name="jpeg">
+      Enable full support for JPEG images.  When disabled, only
+      lossless conversion between JPEG and JPEG-XL is supported.
+    </flag>
+    <flag name="gdk-pixbuf">Build a gdk-pixbuf loader.</flag>
   </use>
   <upstream>
     <remote-id type="github">libjxl/libjxl</remote-id>