gentoo auto-resync : 27:01:2023 - 13:58:28

4 files changed, 82 insertions, 5 deletions

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 042a6171c03d..4aa369b4af7e 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,8 @@
 DIST libjxl-0.7.0.tar.gz 1505917 BLAKE2B fd60e8fb1d7082deaaaf413395ac09e6096bb164ac1b2765a836e0bd3b96a8ac604c2e7631dd17d3eb1d9421c9460de13cede63c5786a5b0689cb858d7f5ec59 SHA512 c73039606acf7b2cbc331c6787af5167d711fd1af22bc616e1f478c531b087da82c98f2cb7e88c4d1f8bcfdc4e053ae0dc99cc9a811545b7f9658041489ed04b
 DIST libjxl-0.7.0_pre20220825.tar.gz 1505499 BLAKE2B 67b1f33112c85c8ccf1187cc44441f1afd6b5f11139f5b066092abe3dd2304e7ff8a8179fb1ef2a08982d2700ac757113019580c99abf37b3d701310f70861bf SHA512 13132dbe93d1b55cf878653803b01547b77152687aedd8ea07c162562f78965f74b5d96b82a434d2982962ad817096253a9447743e620cc72af0f1906a284b1d
+DIST libjxl-0.8.0.tar.gz 1611824 BLAKE2B e16fb51c7938be22754cad70ccab1e0e965b218993aa2fe9646b6b8958887b2e868bdc9631a9d3ff5c24ca1b02f9e262c4d531238d78a7d80f23ed5911a95b1e SHA512 ef472ddc5e277f3d41491c2acc03ed0152ec3ea87efb9e3320cfd830ceb383728658318444b06a3e9f8662bc11c0014675966572ce33f49c8e5cb13c5ed48de1
 EBUILD libjxl-0.7.0.ebuild 1749 BLAKE2B 6a5e9c06203a8cd0aa98b67f733d6ed75257f58056c58f342fe64d6656f23325fa8ae58fb70469e85750e158818acbbe5b2fc05c196add3a61cfaf504ca018c4 SHA512 01d24038f235d52591165dd500ddcce1e6454f02f7136ab63182440744a613d708c92534e8a63bdb62eac668d3aa3b47ffb4502c29dda9b1f061a98de70e0f48
 EBUILD libjxl-0.7.0_pre20220825.ebuild 1837 BLAKE2B 904e32dfd030184606f0b9fdc04e9a49315390ccf98cdb0e03fd457d95ad38f622a3808681c9caf541ed032d3d4f780c1b8c097169730d7042063b742ad0ccab SHA512 7ec4d6c0ccfe235cfd69752f4ab60fa640dfd2bd6a2e237ebba49675c6a7392a00f199f3c8ec719ca7c8b593ce166db04fb35c50b7b50fceaf4daded459288cc
-EBUILD libjxl-9999.ebuild 1750 BLAKE2B 7a82432b1a82fa2c224062b1b91a2d1c3444d4039940024d0a892fc2dcc044b5832f46bcbf4972ff1b294f0289aa5c7c6212abc5b28ac59f255c3b80de77995c SHA512 b98d2ab562b1d46df6194e1b0c7240fa2e2ff7527134cc80c3a7d80f998a770ea64a29fa08d1ab2ed1af5770b1c89a8512f9671e2e166de8901625546f90b35d
-MISC metadata.xml 668 BLAKE2B b9cd4d0f146c6d44b619a88ba63b3aeff87415ee1717a80f809da7caea0d3d595f9238f80d33502fcd5b85e294f9af837075547ebeb947d0888a151875eb679b SHA512 c634f5a110fc31e0f7379c37b53656f3af6f3c8f49937164adeea3f2facd1c9519369fc5f28cfb969e00abeb830209e4a986938ca275a33e77945906f235fabf
+EBUILD libjxl-0.8.0.ebuild 1754 BLAKE2B 51baf198642196eed58caa82547aadacf1f9a151f6980fba23c8e7364cd981cfdbefd03115d09994691f18517e601b878ec194cf54fed5ca6ef142bd5bdc32ea SHA512 a2642409fd28ff4b135a86b7690a6e5155c42822dabb24ee9f8b798cb5bd05bbd420afdf352fbe434aa3fd5cccedd3a0f0b97126296b28a98474c796b1616c5f
+EBUILD libjxl-9999.ebuild 1754 BLAKE2B 70993b339f80a0b82383520cbb756bd2513369eee33f8edc5b9d96ed0ad4ee58defd341a2c08f56597c9b7c6fcdd513ae557b5ce3747b1dfe7204baaf6693ed0 SHA512 2d45a5762f3bd9ba1b708939aed91550b444bf262d41f1f3f10a94e5b497277d52aa4b4945f6108892aebd51bda65485d5ce103c76d6401c579413a239d70439
+MISC metadata.xml 750 BLAKE2B d8bb075dd5e1e50d69380d7d6a54efe23fcf82fa16126d46767075b4fb718f3dde77c013e25aafb12dd42dda9cc702c76839172706100bf77a5bf3ac23b84932 SHA512 cc19188dd77ba5e5a752d151ac0e64e1bc2e61283d4ba90607f8d5d3e3945a430c869141f6f504c1551daee2d65990306200862a99b86aa2ada7048e833c2b5a
diff --git a/media-libs/libjxl/libjxl-0.8.0.ebuild b/media-libs/libjxl/libjxl-0.8.0.ebuild
new file mode 100644
index 000000000000..6c5ced59bf36
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.8.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="openexr"
+
+DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${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}]
+	>=x11-misc/shared-mime-info-2.2
+	openexr? ( media-libs/openexr:= )
+"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	filter-lto
+
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_ENABLE_PLUGINS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=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)
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index f8c37689216e..30362a1f1147 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,9 +18,8 @@ IUSE="gdk-pixbuf openexr"
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
@@ -48,6 +47,7 @@ multilib_src_configure() {
 		-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
 	)
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index 8ac778195a7c..1e3f2d5931e2 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -17,4 +17,7 @@
   <use>
     <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
   </use>
+  <upstream>
+    <remote-id type="github">libjxl/libjxl</remote-id>
+  </upstream>
 </pkgmetadata>