gentoo auto-resync : 05:10:2024 - 04:27:09

5 files changed, 0 insertions, 257 deletions

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 29bc3b04eeba..d735814e0996 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,15 +1,10 @@
-AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf692821028e16f97272f751176ef22126151e8edf18e2c7d9da88d9bc8334cd4737d36037a5a04eb7360a41fde39605db62942c52e62c SHA512 4f8cd6f2a70077b8e52b084a4c76f5a029e3e13e578d28bb2d9d3470ae89fa6867d541bacd079bd55b76eb17a1c2f3d845715fc0d4c9e2a199618d8a6871d1a1
-AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d
-AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466
 DIST libjxl-0.10.3.tar.gz 1912351 BLAKE2B 4432ecf34ac03d9ce8fc814835c7ee31fcc1e516b95e347dcb201a6996e1ffaadbd2e78a6a235ee1c4ff5121af495b8bc621e6738e2d03a8eb1639fb397e5246 SHA512 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4
 DIST libjxl-0.11.0.tar.gz 1873614 BLAKE2B 60f038c35f921e1d6cfaab62ec92c15fa8b0bb9369724bdbaf25fb72559670de6f2e86bf1fb7d37158e1d046d46d20610b574e2288f86d4bae52fdc2c51e3b76 SHA512 a3648a5f046cae36b3272c46525d002d490f781f44647d4d8318f0b773dd9b7902582ced5636af3489f1d6a44e3baf8ad2e5ab47d26869d16b01607d90e14053
 DIST libjxl-0.8.3.tar.gz 1612441 BLAKE2B d1c3b108c67d0a3a63ce50cdc7305b6853b182ec6c210d499e15120fbb858dada23997a4a0eb545f936e02230ed773506b066f24e19cce1f99aedaafd2bd7803 SHA512 f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef
-DIST libjxl-0.9.3.tar.gz 1873236 BLAKE2B eb3811ef4fc64bb5df2e06b6b86cbc1b5dbe6eb9728e5ad5a8b791be57359eb63442722cdf629b006be518bf575409b93758d7ec0376a596de4405fb7686b7f2 SHA512 8aace2d8c0ece9db64a1620a10581ddc5a450543db64d44f864eaa5d3b8b3f0466c501fed5d58abdbf6eb5f90af25f6370c33718847bd070e851a02b560f541e
 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.3.ebuild 2934 BLAKE2B 9588ef46515e1f5103be1bdc7c68fb985abd57a8b306ca1662e4d24dafcfd2b055318a74758047388d34b24ee9b0fbd09101900d425723901ef5ab6a935a2d0c SHA512 c20972786f697752c3d4cc414409e29c5d67169f3f10bc6b719a1614d8ff7323d3c52b9bb3297d3300ede30b98ce525fb5cab9c36fcce9fb0e717e780a1ecb24
 EBUILD libjxl-0.11.0.ebuild 2934 BLAKE2B 9588ef46515e1f5103be1bdc7c68fb985abd57a8b306ca1662e4d24dafcfd2b055318a74758047388d34b24ee9b0fbd09101900d425723901ef5ab6a935a2d0c SHA512 c20972786f697752c3d4cc414409e29c5d67169f3f10bc6b719a1614d8ff7323d3c52b9bb3297d3300ede30b98ce525fb5cab9c36fcce9fb0e717e780a1ecb24
 EBUILD libjxl-0.8.3.ebuild 2560 BLAKE2B d08dfc2ad15d2b1a8bd72dc392d297d4a45411b582616c30f3ee8ab5611281b9873c9839e0e7d953fef2598300cd97e8bfad98197355176964a2a73ab88c7f88 SHA512 1f248077a8e03b0aa94afc75fd9ce28007d04e6237a0d3fa92e14faa6acd764f98e45282657bedd73e16fec3f343f979df352a428c6bc9c4683a39f570ab151a
-EBUILD libjxl-0.9.3.ebuild 2996 BLAKE2B a6aef6912df3ec3ddca870b15296b3ae356a1617b6b7cf26a5525108d6aaeee10793d99d84f058b27ea59b0c7c0283fc4ead75780b7db60af674ad4722bdbcb8 SHA512 6bfa8dd8c1add61bfe13c3793713e98bfc5bf8f2ed43c3289424357e8a16a7475ca3081694fa5c6ca279594fd353a2561aabb46ffb2336eb7b10cdca2c7717f2
 EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339
 MISC metadata.xml 1029 BLAKE2B 4c5ef3d7aca316b497d964b1afcee9f71b165545691182c3818ef4f9a8bc7f10fdbed36a8bd58b0051b1f9851018a11efa3e9f7b57c5ec935435e16bd26b6036 SHA512 a3129f77efc640e78a2f1fa481fb6363249be74e74aabccb51970ec101808db95a326deeecfa557b669cfb2bf26622fc7dbcbe7624a0315d770e697bc3734296
diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch
deleted file mode 100644
index 43448a01c473..000000000000
--- a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://bugs.gentoo.org/908939
-https://github.com/libjxl/libjxl/issues/2433
-https://github.com/libjxl/libjxl/pull/2596
-
-From 6a5cd1ff847e7b18ba8b87fcc11ada17dccb0692 Mon Sep 17 00:00:00 2001
-From: Sami Boukortt <sboukortt@google.com>
-Date: Thu, 22 Jun 2023 12:26:25 +0200
-Subject: [PATCH] Make sure to read the rendering intent before the CICP tag
-
-The code that reads the CICP tag exits the function if it succeeds, but
-it should not skip reading the rendering intent, so make sure to have
-already done it by that point.
----
- lib/jxl/enc_color_management.cc | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/lib/jxl/enc_color_management.cc b/lib/jxl/enc_color_management.cc
-index 752e3e02c0..2b519d152e 100644
---- a/lib/jxl/enc_color_management.cc
-+++ b/lib/jxl/enc_color_management.cc
-@@ -982,6 +982,14 @@ Status ColorEncoding::SetFieldsFromICC() {
-   Profile profile;
-   JXL_RETURN_IF_ERROR(DecodeProfile(context, icc_, &profile));
- 
-+  const cmsUInt32Number rendering_intent32 =
-+      cmsGetHeaderRenderingIntent(profile.get());
-+  if (rendering_intent32 > 3) {
-+    return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
-+  }
-+  // ICC and RenderingIntent have the same values (0..3).
-+  rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
-+
-   static constexpr size_t kCICPSize = 12;
-   static constexpr auto kCICPSignature =
-       static_cast<cmsTagSignature>(0x63696370);
-@@ -993,14 +1001,6 @@ Status ColorEncoding::SetFieldsFromICC() {
-     return true;
-   }
- 
--  const cmsUInt32Number rendering_intent32 =
--      cmsGetHeaderRenderingIntent(profile.get());
--  if (rendering_intent32 > 3) {
--    return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
--  }
--  // ICC and RenderingIntent have the same values (0..3).
--  rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
--
-   SetColorSpace(ColorSpaceFromProfile(profile));
-   if (cmsGetColorSpace(profile.get()) == cmsSigCmykData) {
-     cmyk_ = true;
diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch
deleted file mode 100644
index af9345867473..000000000000
--- a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/908939
-https://github.com/libjxl/libjxl/issues/2433
-https://github.com/libjxl/libjxl/pull/2617
-
-From d9637bd803bf9fadc00aa01cea7becfff1e00e1f Mon Sep 17 00:00:00 2001
-From: Sami Boukortt <sboukortt@google.com>
-Date: Mon, 26 Jun 2023 15:06:17 +0200
-Subject: [PATCH] Fix decode_test with lcms2
-
-Co-authored-by: Zoltan Szabadka <szabadka@google.com>
-Co-authored-by: Luca Versari <veluca@google.com>
----
- lib/jxl/decode_test.cc | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/lib/jxl/decode_test.cc b/lib/jxl/decode_test.cc
-index 44ead99ec6..bbb7bda39c 100644
---- a/lib/jxl/decode_test.cc
-+++ b/lib/jxl/decode_test.cc
-@@ -3734,13 +3734,18 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
-       jxl::Span<const uint8_t>(codestream.data(), codestream.size()));
-   ASSERT_EQ(br.ReadFixedBits<16>(), 0x0AFF);
-   jxl::CodecMetadata metadata;
--  EXPECT_TRUE(ReadSizeHeader(&br, &metadata.size));
--  EXPECT_TRUE(ReadImageMetadata(&br, &metadata.m));
-+  ASSERT_TRUE(ReadSizeHeader(&br, &metadata.size));
-+  ASSERT_TRUE(ReadImageMetadata(&br, &metadata.m));
-   streampos->basic_info =
-       add_offset(br.TotalBitsConsumed() / jxl::kBitsPerByte);
-   metadata.transform_data.nonserialized_xyb_encoded = metadata.m.xyb_encoded;
--  EXPECT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
--  EXPECT_TRUE(br.JumpToByteBoundary());
-+  ASSERT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
-+  if (metadata.m.color_encoding.WantICC()) {
-+    jxl::PaddedBytes icc;
-+    ASSERT_TRUE(jxl::ReadICC(&br, &icc));
-+    ASSERT_TRUE(metadata.m.color_encoding.SetICCRaw(std::move(icc)));
-+  }
-+  ASSERT_TRUE(br.JumpToByteBoundary());
-   bool has_preview = metadata.m.have_preview;
-   while (br.TotalBitsConsumed() < br.TotalBytes() * jxl::kBitsPerByte) {
-     FramePositions p;
-@@ -3750,7 +3755,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
-       frame_header.nonserialized_is_preview = true;
-       has_preview = false;
-     }
--    EXPECT_TRUE(ReadFrameHeader(&br, &frame_header));
-+    ASSERT_TRUE(ReadFrameHeader(&br, &frame_header));
-     p.header_end =
-         add_offset(jxl::DivCeil(br.TotalBitsConsumed(), jxl::kBitsPerByte));
-     jxl::FrameDimensions frame_dim = frame_header.ToFrameDimensions();
-@@ -3760,7 +3765,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
-         frame_header.passes.num_passes, /*has_ac_global=*/true);
-     std::vector<uint64_t> section_offsets;
-     std::vector<uint32_t> section_sizes;
--    EXPECT_TRUE(ReadGroupOffsets(toc_entries, &br, &section_offsets,
-+    ASSERT_TRUE(ReadGroupOffsets(toc_entries, &br, &section_offsets,
-                                  &section_sizes, &groups_total_size));
-     EXPECT_EQ(br.TotalBitsConsumed() % jxl::kBitsPerByte, 0);
-     size_t sections_start = br.TotalBitsConsumed() / jxl::kBitsPerByte;
diff --git a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch b/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch
deleted file mode 100644
index 06c1498f3fea..000000000000
--- a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0bfdf5c5429dbb866142bd75e4877794dc723b25 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
-Date: Mon, 15 Jan 2024 17:18:33 +0100
-Subject: [PATCH] plugins: use JPEGXL_TEST_DATA_PATH instead of hard-coded
- path.
-
----
- plugins/gdk-pixbuf/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/gdk-pixbuf/CMakeLists.txt b/plugins/gdk-pixbuf/CMakeLists.txt
-index 7b53b98c665..12c1a83753e 100644
---- a/plugins/gdk-pixbuf/CMakeLists.txt
-+++ b/plugins/gdk-pixbuf/CMakeLists.txt
-@@ -74,7 +74,7 @@ if(BUILD_TESTING AND NOT CMAKE_CROSSCOMPILING)
-         COMMAND
-           ${XVFB_PROGRAM_PREFIX} $<TARGET_FILE:pixbufloader_test>
-           "${CMAKE_CURRENT_SOURCE_DIR}/loaders_test.cache"
--          "${CMAKE_SOURCE_DIR}/testdata/jxl/blending/cropped_traffic_light.jxl"
-+          "${JPEGXL_TEST_DATA_PATH}/jxl/blending/cropped_traffic_light.jxl"
-         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       )
-       set_tests_properties(pixbufloader_test_jxl PROPERTIES SKIP_RETURN_CODE 254)
diff --git a/media-libs/libjxl/libjxl-0.9.3.ebuild b/media-libs/libjxl/libjxl-0.9.3.ebuild
deleted file mode 100644
index d2a844f6cf81..000000000000
--- a/media-libs/libjxl/libjxl-0.9.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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 ~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
-}