gentoo auto-resync : 25:10:2022 - 21:54:27

5 files changed, 21 insertions, 30 deletions

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index d66eba2ba2b2..2ce3afe0f2a8 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,6 @@
-DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242
+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
-EBUILD libjxl-0.7.0_pre20220329.ebuild 1966 BLAKE2B 471819d39ffda2fde94c3e9567df095a60fde5c6bd7fe8da6c7f37f5a187abf2da900c2def6560049d8728d375aef98708c1ae53725fd45f5e0531a60cf68fa0 SHA512 e5b77fe41bfe6ae7063fcbe2cba6b2cde3147e9ebc266a597df9807af47dc5afb2ff9821fb0235a2e1f423a48c1013e2b29b2a4366c3231cd0c54b4c495ac276
-EBUILD libjxl-0.7.0_pre20220825.ebuild 1838 BLAKE2B f06ea0bac203f2eabbce0164246678a3f9c9c35258a60a18644628ecc09c4c44361579785c9296b3a18546bc0ba2bba5053cc9431577077f0048a0f58c949ccf SHA512 f3bcad4f956f62891960919c882cf454419f121f642271c6ddc5d8758170ca226ba8303202f79d2159c4614d074c9e23ae397cf0c80f11b858c3eaadd6ba1332
-EBUILD libjxl-9999.ebuild 1825 BLAKE2B f25b4b4c41b7c2bd1f97bfbba975a6e9a61a4550c4e02425354e39c125dd1dc07d5c65814655e6525704c556757949c0295a4e47766cd95c82b44e56e0b0b936 SHA512 92a8a2918fdb31b73603e3ec17fd8c4b30555457969e4c0820fad7b3ab1800611c1d90abb626d70b8a2c62c50dd5e69fb7aa1125fdf4c6acb8aa8514e90afc15
-MISC metadata.xml 737 BLAKE2B c6d720ad6e51168ebab6cc33b8c3af44149f19a8331f1b834fcf4e33f9b90050fae96bdd03202a83960ec7d01d9427e6eaf0be51d47efa736533b8bb5affaac5 SHA512 6b461b43818da3626a59c7d040c7f3cf470624b6205001445a0ede4ceffa4f1ad6233ea85cf3616dd4bfd7cbbd50ce28e0f509e13ec06b64ba4b724e2a90d602
+EBUILD libjxl-0.7.0.ebuild 1742 BLAKE2B 44aa26ab93c6c47ab17c4899d29719116e7b74bae876edc4c232e9cc60260133c9fbbd87bb841993fa55e11577d90ebbb1191be3494d405531e4ad875886034e SHA512 7e858a1aba07595781ea88e78148bcbdab1c60e41fb1a2237c1ba6d919d134ae02f39b4e3e551dc7827ab1c5a51f4d0e6a27e26c130c16bae86abd0ee6a9bf30
+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
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild b/media-libs/libjxl/libjxl-0.7.0.ebuild
index 35d770126395..c35258044ff6 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0.ebuild
@@ -3,36 +3,33 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
-
-SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> ${P}.tar.gz"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples openexr"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
-	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.13:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	openexr? ( media-libs/openexr:= )
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/libjxl-libjxl-fde214c"
-
 multilib_src_configure() {
+	filter-lto
+
 	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_TESTING=OFF
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
 		-DJPEGXL_ENABLE_COVERAGE=OFF
@@ -50,18 +47,17 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_MANPAGES=OFF
 		-DJPEGXL_ENABLE_JNI=OFF
 		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
 	)
 
 	if multilib_is_native_abi; then
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
 			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
 		)
 	else
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_EXAMPLES=OFF
 			-DJPEGXL_ENABLE_OPENEXR=OFF
 		)
 	fi
@@ -72,9 +68,5 @@ multilib_src_configure() {
 multilib_src_install() {
 	cmake_src_install
 
-	if use examples && multilib_is_native_abi; then
-		dobin "${BUILD_DIR}/jxlinfo"
-	fi
-
 	find "${D}" -name '*.a' -delete || die
 }
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
index 7ae7057be9c6..e772dea30c98 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/libjxl-libjxl-${COMMIT:0:7}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index a2269bfc62ec..f8c37689216e 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib git-r3
+inherit cmake-multilib flag-o-matic git-r3
 
 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
@@ -13,26 +13,26 @@ EGIT_SUBMODULES=(third_party/skcms)
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="gdk-pixbuf gimp210 openexr"
+IUSE="gdk-pixbuf openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
-	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 	)
-	gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
 	openexr? ( media-libs/openexr:= )
 "
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
+	filter-lto
+
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
@@ -58,7 +58,7 @@ multilib_src_configure() {
 			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
 			-DJPEGXL_ENABLE_PLUGINS=ON
 			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
-			-DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
+			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
 			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
 		)
 	else
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index f39fa860738c..8ac778195a7c 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -16,6 +16,5 @@
   </longdescription>
   <use>
     <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
-    <flag name="gimp210">Enable plugin for GIMP 2.10.x series</flag>
   </use>
 </pkgmetadata>