5 files changed, 104 insertions, 2 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ed71e325b764..3a3411825244 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 252fd2857eb2..c8758491c499 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -13,6 +13,6 @@ EBUILD libjxl-0.10.1.ebuild 2758 BLAKE2B 66335ca59cc71eacd27bf5e029b741820cd4439
 EBUILD libjxl-0.10.2.ebuild 2758 BLAKE2B 66335ca59cc71eacd27bf5e029b741820cd443966ffbcd94043be5a973f3076e7153b8778416ea4e27544ba2a12e67322bc515e93b2c10ba989259beaf36641b SHA512 bcaab793183d517ace2c6b720b87bfcc950765883994ed3b71582d773b7972785a83628998e0285cfe866000e2c8fa23f4cce2ba3bdee989217f70164c1bb987
 EBUILD libjxl-0.8.1.ebuild 1760 BLAKE2B ba530cf5b66d83f525426810fec1431644baae2d7c0754ec36d0a1c22bdda9c1694fb5c1d7fd299df7aab2f066e78b9e787b9d88c31f7fe37558b40c91b0a12a SHA512 2b7d97efba14eb06cd91863bd6274abc1cdc46ccd4b86f1c0df1dc9013d6828ab9d2128030f5f83ba64488936baffa2c87289c7c50d3b5f7c4bc6a473152e22a
 EBUILD libjxl-0.8.2-r1.ebuild 2370 BLAKE2B d5f0f655767280985420ed7e338748ddbc55589003c9427aa086295d12a91c9fb907c982ed88849471a76991879f0352c1fef2b682a1b64a3b03e43e9d93a018 SHA512 97750abe5bde3c0ad3a785f65250930f3312458c0b0b23bf00163c2ffed7cbdb148d43bbd8a768d283380fdf1794eece03a2b1adab97d4d9fb53e31b65dec614
-EBUILD libjxl-0.9.1-r1.ebuild 2841 BLAKE2B 59ba265c0e502c44063826b9edfe3cf9b8393b66f5848c4579a5ae11bd3c21f6fdee95927b70ac1c17cf970918674709555955efc4db4632a3cf61c74b54f84b SHA512 8c3cda963483aedc330021a71f05f4670c3749cbb1be4e38d8cc4975ffb27687234eaeb29d6e53c0b50cc8de4505e1a5a394131046a36c90158ad8057ccf6138
+EBUILD libjxl-0.9.1-r1.ebuild 2836 BLAKE2B 421f5b673550a0357db42b102d5ebff8dee66d83af915ef5c1d61ddc68c4355f5053d5ed32371a479dce19ed73c1790fa76eac0c3896d7b508f58f8100e76bbe SHA512 6151e6485249725e09bca421a9077f3d44528c87cca9db211acc609b8086009ce58b79bea3b0c62cd5bf496ae19d71ee6adffbb427238c1bc79a4e17c1511f12
 EBUILD libjxl-9999.ebuild 2443 BLAKE2B 97af04661d52c6c2a1f4cddde89a90ef8c673efeb18c906bdf32fc66900c7c201a0119bf13a2ce65e663985108e6fc41526bcbbd723a2091cbdc6f512a072edc SHA512 60a0324c66c794e06c51b6a7bfe2095681ab5c1caea6de0c4f2a1de15e9781d608151038337874624b219419d3568fcd1f768a9e11d9d5650935f0a02d3e4223
 MISC metadata.xml 864 BLAKE2B 04139ce686fbc36068182d03fc23f0a0d49262f8c6b21a690705411330c3b5ec4f969d0ed27fc712fc184736bb20e9bfa3a6fe2fe6d5db98527334151dc0a8d6 SHA512 73e89d636908712608a41f8c4b7f29fc9d551030cebcd83e8db722869aaff0bc96c1ad6c05c5dbe3a2b2b29b8c639c95d02a8d4ed7094a9200af7f008c9b20de
diff --git a/media-libs/libjxl/libjxl-0.9.1-r1.ebuild b/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
index 7fc55d455e4f..521e8e5b5653 100644
--- a/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
+++ b/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="gdk-pixbuf openexr test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 65a0cb972a28..97987e24c51c 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,7 +1,10 @@
 AUX openjpeg-2.5.0-gnuinstalldirs-r2.patch 19823 BLAKE2B e215c2eecc8fd0949f58a815050bab5f468a52789948c8b8598aa4d93afdd3508638c14a928c727011550260e691848f5169942d57b01ef02c42d15c72f9f049 SHA512 11ea6d0037ca05c51a68e63b3e3041bc6e2a24ab98630842276317dcb6c3000401b48de9b88231712c4d7104049a809a47189c80db773c85c3b13ea7595a5fba
 AUX openjpeg-2.5.0-gnuinstalldirs.patch 11415 BLAKE2B 9916b82721b9e75dd175d8cf6b85aa9f3b0bbba4d72b5d9c21db853ccf7a40d970db051eff159040fa7b4eb478a5106879044b103e0fb30078704f51c4cb3eef SHA512 d559e1e101b88ea9f391d984e7fe2a28ed5572692f3fbf8c7e79e17105ce83d17ca2a378688c595a8da4f60925de5bf57569424de51a627e629d39479e04c682
 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306 SHA512 08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
+DIST openjpeg-2.5.2.tar.gz 1871948 BLAKE2B 4c23eecd603c620d3555fa02055104d292cdf4bbb88ab3d8d8a8f62e3c21b52d3c6d9211d8dd6f11d76fb1ca6f2333a7305ae07b5883a62eb7fc28ec9dfafc0f SHA512 24c058b3e0710e689ba7fd6bce8a88353ce64e825b2e5bbf6b00ca3f2a2ec1e9c70a72e0252a5c89d10c537cf84d55af54bf2f16c58ca01db98c2018cf132e1a
 DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624 SHA512 4444225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae
+DIST openjpeg-data_202130923.tar.gz 498600318 BLAKE2B cf595b9f8690ad0b9616f080c3bfdaf553802912cd41015f86766085c0bd021cead294372bd9925c2a569fabbd9a0f1684bcf6eb1b5ecdc14d64231a76401a3b SHA512 3e1e3bb489eac6047671395fbf92bbfb2ad7c7c0206c1a233c215ba3d5b5263a6ce65d523f98fdaa4949e28eaa179716264f89eebf73b44c71373a9c86313cc1
 EBUILD openjpeg-2.5.0-r5.ebuild 3022 BLAKE2B e363174f66c1141ecfd322dbe11239ac6630e945e2a39b1595abfdb36c9bb955284ddc39078376322cb478b6eb8e5612f35e652876fb6669686a164bf09f10bf SHA512 a1445dc15c5e88e6bdd4b963ec593f01c7f92a500b6715497acf99ba3c1a23ecf5b0abc3c83d717c798b2eabc15423084ebaecf34c6dd62359f96d1bf0f78094
 EBUILD openjpeg-2.5.0-r6.ebuild 3025 BLAKE2B ef9ad4b6212e6517b46e90464f56e26e6c35237e7bb37066be9f3883d39c567aa2fcfaae44df48b17cb2c1dd708d762e0f7c2397473ebe58ab4e16b56765d752 SHA512 99e54e031350d3abd469b75f4ea431446f748ad17da1386fce0d31f6ca723bca12e43edad9383f863b1dd6a23597f4109aa579f74547bedfd613b32993550dae
+EBUILD openjpeg-2.5.2.ebuild 2956 BLAKE2B eb8e9f749c3890535385c5c9f1dc5577f8033c813d4007d96dc54be10566d1a38cf9b7ec49e7a6db7d6007ce0a1811bec12eb1485186325d508b3b32014fb6ab SHA512 c5a5794f0808be4aae3d1660558a689c50ad5395b25fc6f69576a0fdb1b5bfd8139bdf1f8ab8990a0b471a344367c90798a53701c3ae5cf4b5a01631984e1fc3
 MISC metadata.xml 612 BLAKE2B ecbdd9706b1975ad5a9f5ba9957ee7e1cc7cf42e7dfcb3e8b8f9e1f9851b035ac3d997ec9515a181b52be5112dfa44e9d2f98eeb532b21bf353afedcee035181 SHA512 243f4e9e4bc1d851c97167ab8f19ac240ea12d1e53ea59e6709b6da7a810edeb8aa287d92e0334b6b09d2df7660cc64de2dd9af739b2f3daa6ff19dcc304fa8d
diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
new file mode 100644
index 000000000000..0e5579c13039
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+# Make sure that test data are not newer than release;
+# otherwise we will see "Found-But-No-Test" test failures!
+#
+# To update: Go to https://github.com/uclouvain/openjpeg-data and grab the hash
+# of the latest possible commit whose commit date is older than the release
+# date.
+MY_TESTDATA_COMMIT="f9991d5fa9a4a08fc9c29bae6405d6c67cf2b8eb"
+
+DESCRIPTION="Open-source JPEG 2000 library"
+HOMEPAGE="https://www.openjpeg.org"
+SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_202130923.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/tiff:=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
+			die "Failed to rename test data"
+	fi
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
+		-DBUILD_TESTING="$(multilib_native_usex test)"
+		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
+		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DBUILD_STATIC_LIBS=OFF
+	)
+
+	# Cheat a little bit and force disabling fixed point magic
+	# The test suite is extremely fragile to small changes
+	# bug #715130, bug #715422
+	# https://github.com/uclouvain/openjpeg/issues/1017
+	if multilib_is_native_abi && use test ; then
+		append-cflags "-ffp-contract=off"
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		elog "Cannot run tests for non-multilib abi."
+		return 0
+	fi
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
+
+	elog "Note: Upstream maintains a list of known test failures."
+	elog "We collect all the known failures and skip them."
+	elog
+
+	local toskip=( "${S}"/tools/travis-ci/knownfailures-all.txt )
+	if use amd64 ; then
+		toskip+=( "${S}"/tools/travis-ci/knownfailures-*x86_64*.txt )
+	elif use x86 || use arm || use arm64; then
+		toskip+=( "${S}"/tools/travis-ci/knownfailures-*i386*.txt )
+	fi
+
+	local exp=$(sort "${toskip[@]}" | uniq | tr '\n' '|'; assert)
+	popd > /dev/null || die
+
+	local myctestargs=()
+	if [[ -n ${TEST_VERBOSE} ]]; then
+		myctestargs+=( --extra-verbose --output-on-failure )
+	fi
+	myctestargs+=( -E "(${exp::-1})" )
+
+	cmake_src_test
+}