gentoo auto-resync : 04:10:2023 - 23:52:39

12 files changed, 171 insertions, 33 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6e094db60e5d..7974890e861f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index f053c7c59420..b6a72b943d9b 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,4 +1,5 @@
 AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107
+AUX libaom-3.7.0-allow-fortify-source.patch 467 BLAKE2B 405f87a6467daae59823eedc9fd7cac959909d5c07df6b4930b55af129750bfd0ed2749b41c6a4fbdb2a8dd49a6881e9de0af526972d27c8c731ce29ab34d1af SHA512 ab69882b8652cb61bdfa14b5fbf5e5cef3344df3aee852f42192af1e935299be1029947a3cb80527362b2db57c93197b889fb45dc562123353b7a3871feaa811
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 DIST libaom-3.6.0-testdata.tar.gz 498554450 BLAKE2B bbc84e9d3fd91272fa6e30a19f625fb5b71b1ff6c622982202c298e45c7a331338ed316942d7c0ab00f5ef37d442e1a45a62a30be70f8c1315caac9e7742903e SHA512 a86303a2486fca9a85cdb9275c1715a3862df92021967a5a0d97f8aa6862dd6cad1d65e1377fbee3f1b21d73c770e10ece4041a13bf57e6f2a1bb39357b00316
@@ -11,6 +12,7 @@ EBUILD libaom-3.4.0.ebuild 3246 BLAKE2B d42b5eb01f7383b4f4abc0000614251af08d02e1
 EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51edf1cd6f34bea2aa42cd42941c7d259a2a947ca063e3add31c532c0ea4a894de212de625241cd1c3d5e928a87 SHA512 d88224575368b6aa4dbc83edf5970e7a1c5bfef9c1500a9b28e3bb91e2d1586c8b86c03a3756743d8e7c5ec63028b269a276572f9a1c9dc9fff5e02fd6b3f5ed
 EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
 EBUILD libaom-3.6.1.ebuild 4018 BLAKE2B d58bb60d356880b9f0f6d9d9262a05de51a4fe0ac563f92219219c0554d2de1d61fc24eba5fd55cc5fb7fc1a2d003a72ae375be4494964013bcacf865fe6edcc SHA512 ceb6ca17366b1b14c6b6cfa9d5caa0eb229c19bf43aca9c23c8637d1d156a286891ef851b00a1d0208680d240bb2ca1cbd9fcd1743ab9384c1ea09f4f12fabbb
+EBUILD libaom-3.7.0-r1.ebuild 4077 BLAKE2B 90d69ac4b74320819a390734af21bd1118455028aa300b92e42a524714f7be00f1561e694dfb62070c819974ae166387d111ba0eb4756cb6f70ac5e1c045759d SHA512 354d28904c1a4fe1ee70bfd8a48266556ac654dbe14c0fff1d72c81281246f94bf27957bf9c2481e9fcede85447626dd87e44f1be6bb4972a03162fe44e2132f
 EBUILD libaom-3.7.0.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996
 EBUILD libaom-9999.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/files/libaom-3.7.0-allow-fortify-source.patch b/media-libs/libaom/files/libaom-3.7.0-allow-fortify-source.patch
new file mode 100644
index 000000000000..7c7697fc5dfa
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.7.0-allow-fortify-source.patch
@@ -0,0 +1,13 @@
+Fortification is an important security feature.
+--- a/build/cmake/aom_configure.cmake
++++ b/build/cmake/aom_configure.cmake
+@@ -389,9 +389,6 @@ else()
+     add_compiler_flag_if_supported("-Werror")
+   endif()
+ 
+-  if(build_type_lowercase MATCHES "rel")
+-    add_compiler_flag_if_supported("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0")
+-  endif()
+   add_compiler_flag_if_supported("-D_LARGEFILE_SOURCE")
+   add_compiler_flag_if_supported("-D_FILE_OFFSET_BITS=64")
+ endif()
diff --git a/media-libs/libaom/libaom-3.7.0-r1.ebuild b/media-libs/libaom/libaom-3.7.0-r1.ebuild
new file mode 100644
index 000000000000..d8ce8c479ebe
--- /dev/null
+++ b/media-libs/libaom/libaom-3.7.0-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	# To update test data tarball, follow these steps:
+	# 1.  Clone the upstream repo and check out the relevant tag,
+	#	  or download the release tarball
+	# 2.  Regular cmake configure (options don't matter here):
+	#     cd build && cmake ..
+	# 3.  Set LIBAOM_TEST_DATA_PATH to the directory you want and
+	#     run the "make testdata" target:
+	#     LIBAOM_TEST_DATA_PATH=../libaom-3.7.0-testdata make testdata
+	#     This will download the test data from the internet.
+	# 4.  Create a tarball out of that directory.
+	#     cd .. && tar cvaf libaom-3.7.0-testdata.tar.xz libaom-3.7.0-testdata
+	SRC_URI="
+		https://storage.googleapis.com/aom-releases/${P}.tar.gz
+		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="doc +examples test"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# The PATENTS file is required to be distributed with this package, bug #682214
+DOCS=( PATENTS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
+	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+
+	# For 32-bit multilib builds, force some intrinsics on to work around
+	# bug #816027. libaom seems to do runtime detection for some targets
+	# at least, so this isn't an issue.
+	if ! multilib_is_native_abi && use amd64 ; then
+		mycmakeargs+=(
+			-DENABLE_SSE3=ON
+			-DENABLE_SSSE3=ON
+		)
+	fi
+
+	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
+	# Just force generic, given it's a niche situation.
+	# TODO: could try forcing armv7 or similar?
+	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
+		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
+		mycmakeargs+=(
+			-DAOM_TARGET_CPU=generic
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e11f8896f63e..3d568496d270 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,7 +4,7 @@ DIST mesa-23.1.8.tar.xz 18566724 BLAKE2B 43825c936f0dca4bc7e954cf7f8afc9566fb26d
 DIST mesa-23.1.9.tar.xz 18589464 BLAKE2B a4386398841476f6e69031043091cbbf0afff1ef9523e7d6216b1acc49fa8afbe5270802c78d951fee42dd6c8268bc515ed1236de4ce47a5d90e6bdd1ff16b92 SHA512 83f57c530ccc14e9debbc292f71214343f506bdf35bad235cdd3c380d769eb30658bdf93a70b79d7ce08e75615b892023e4245aed1237cd285d2f045cdbf9241
 DIST mesa-23.2.1.tar.xz 18855304 BLAKE2B 51e44c2e9b7dfe17cf4cb7252e169109d03a006caa8ec34036fb594c0c44e9278d0088170894c1a9debdea911f746470e1d256576e0635cae5c3e670ab49161b SHA512 927af0885a4815d330de384232deadf3dce7e2e2024738f138a344cbc4adce22888a9e335317f1d75965a5e691c9638949105f18c9b6ef43839fb594c6b474b5
 EBUILD mesa-23.1.8.ebuild 12747 BLAKE2B 0b638e0f433aa97a74559cab95e2e0f89eed6d7ad8ea21a31b97b3cadae27027e613b84a8d8001a9599a4847ab3c72524e7f931adc38b425f296a6d47a9ba560 SHA512 fa676410871db39c716052b45dc28df0f17ca515ae17b179b2a72442ee6822c8be1a2d62391871da4e788b6b3b07500a429f9508301a3fe5b97d600868863da3
-EBUILD mesa-23.1.9.ebuild 12754 BLAKE2B f941026963e9ae1027e51ef9db1a87467a6066ed14f60ac91eae099515f48ac66f24055e823ca3616d6c4ea2d6f235f9163f6a3f20db73d8743dd5d81a541362 SHA512 6a6668616b0c34c19b4e629fe01d3250cf8195478c2080b2ccb9c20844060314c5f6b419b565be8ba51bf27ff7ddd73ee0894a031d2dee13cf5bf823af382094
-EBUILD mesa-23.2.1.ebuild 12670 BLAKE2B fec88d2d596a54facbfa4a402405bf3fea8cca5bfb2fb5109e836555071989b13effd5fb006b135fb46e276136be6ec5b49b2514ab5624410393e4f025975d59 SHA512 5598738a1b50e7eb9c3f188f4d14c8a78ab0ff30c214ac4a2137db44cddc4c8b1d10773fd3bf80eaf3d9045473bfc6131de2bf03c290ef86258734664692abd7
-EBUILD mesa-9999.ebuild 12546 BLAKE2B 216bfc1bd7c91bc827835262d5cad0afb579b018a15befe71f8d98bea24e1032960568e9bc383b20024c0cc72616a040a8abb2e0441d61e3ff4d80df8eea0b50 SHA512 699fd602530ecdc2335c200b1f5674662d2f1698530e2dca436ca60e7230892dcbdbcfa8d4b804cb358c01c924e7bcf58506cb9f59ebabc94494763e5f946916
+EBUILD mesa-23.1.9.ebuild 12821 BLAKE2B dc90e3d0f5d7eedf53a62ca756bdbaa48b97ddf707c3f3f977e54de5f649ddc5153ca5908cca2b4fa6cb48152d0280721621fed5164c0d2cd3e379524afc2eb9 SHA512 8cd929c311a2333186d50d28f4fe7ca21205964922c69dbe6c076e06c5ecbeab5efe2ea8d829c6ff9426df053d14ff44ba6d81fa90ddee3910e2e4cbe97e5330
+EBUILD mesa-23.2.1.ebuild 12737 BLAKE2B bcefc24afc899b307011087efe947a7e24f450c18536607c722c639f00dc36e3d92c7e55a7eee63e8d8dab4e2a95c1dc9600b611fd82d84af69afb27f2560bd4 SHA512 66a34033497e839bdb1d122092adb5c1639ac969145cd06ce2a8120934e5633af5994c0f8eb606dfb0c6ddfa417e90cfcc71926f57003c0aa3e7d054e5d4b043
+EBUILD mesa-9999.ebuild 12613 BLAKE2B 6e6d8431489c8b1e446e631364dbb2301ba80687d4bc246a1fe3b748536c3767f5f99bc23db265897a55917fe68907fd7d5f82abddfe2e4f8d58d355f7035bfa SHA512 88eb98e373e6bc0d6877a05735c40bd74eafbe6df7ed3f016bef9d851aabbcd633180acea7da91fc8a7ef4875e26639dc41935e9aa4ac9cf890954b513b30724
 MISC metadata.xml 1488 BLAKE2B 7b776f0a6d92b34baec90c58d019d61af537044766ce34a6e139ef679a0724e57fe65d600307c7f9dc0c48618445527618322e2af737191082dece3e547d5533 SHA512 1d573d534f1099eb1f1912567cf559aeae28111eabefa806b292a66d1f1e539e86394a76ca40a1481a6bfb4b6f7a0b117344e39d7b4d2eac615ef49b8f62acb9
diff --git a/media-libs/mesa/mesa-23.1.9.ebuild b/media-libs/mesa/mesa-23.1.9.ebuild
index 57d113992835..14ecef460d92 100644
--- a/media-libs/mesa/mesa-23.1.9.ebuild
+++ b/media-libs/mesa/mesa-23.1.9.ebuild
@@ -132,7 +132,14 @@ PER_SLOT_DEPSTR="
 		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
 		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
 		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
-		vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:@SLOT@ ) ) )
+		vulkan? (
+			video_cards_intel? (
+				amd64? (
+					dev-util/spirv-llvm-translator:@SLOT@
+					sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}]
+				)
+			)
+		)
 	)
 "
 LLVM_DEPSTR="
diff --git a/media-libs/mesa/mesa-23.2.1.ebuild b/media-libs/mesa/mesa-23.2.1.ebuild
index 4615abed8b4f..e497bccae3f6 100644
--- a/media-libs/mesa/mesa-23.2.1.ebuild
+++ b/media-libs/mesa/mesa-23.2.1.ebuild
@@ -133,7 +133,14 @@ PER_SLOT_DEPSTR="
 		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
 		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
 		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
-		vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:@SLOT@ ) ) )
+		vulkan? (
+			video_cards_intel? (
+				amd64? (
+					dev-util/spirv-llvm-translator:@SLOT@
+					sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}]
+				)
+			)
+		)
 	)
 "
 LLVM_DEPSTR="
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 9a9b85e889dd..2ea0d844d620 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -133,7 +133,14 @@ PER_SLOT_DEPSTR="
 		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
 		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
 		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
-		vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:@SLOT@ ) ) )
+		vulkan? (
+			video_cards_intel? (
+				amd64? (
+					dev-util/spirv-llvm-translator:@SLOT@
+					sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}]
+				)
+			)
+		)
 	)
 "
 LLVM_DEPSTR="
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index e178739931ea..ffb4be74ba1c 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -2,5 +2,5 @@ AUX mutagen-1.46.0-sphinx-6.patch 1697 BLAKE2B 3cb99be12abec75a237965262f65a7791
 DIST mutagen-1.46.0.tar.gz 1268561 BLAKE2B 44e0dbbc1c102521569a91386a9d807f3ad82ffb96a5e3f76958551d173d00c7095fa6a2668a0a418bfdda31be5c3bb175856b2278719007bf7af866c732dc40 SHA512 52ab7408af46e54e79f1d157a3f6114e2606c6a55eb46fdd314dff82d6d586c2c22294b181a432581230dee566c79554456a9435a8e1188a91f4ae000644ae71
 DIST mutagen-1.47.0.tar.gz 1274186 BLAKE2B 220d8e136e8f41d2f3953ce61b4784a24b1e450b6cfe0d0e0c610aeccb9ff3248493b8a0ea78f801e62b2f6ac87cd219a05cff535e04586a5ce9b03aa3540278 SHA512 40f9a8a898c9fdae00fd0bdd38eb91a6fb813cf8319f888590bdfd4b5efcb614aa5322c0b9e017f49c3f5155ccf82d5cae80aad79df285c50b5ef270c09f4c9d
 EBUILD mutagen-1.46.0.ebuild 880 BLAKE2B be5e71812359543c45c69054159c8d5908e732123b54aa0a8c36fda2f8d37a979c711799b180eca07cadab909a5cf2871dc07e111b3ec31c5ba29d688fa02581 SHA512 5fcb42a815840cb1119d4bd37d17008bebf2f786434a82be0d69e9931318a9fb21371987058067955cd8d5056ee6ea99ad85bdc96996f8866da60888c49999a8
-EBUILD mutagen-1.47.0.ebuild 825 BLAKE2B 20fd251bd30b45d664d5d048cc6c1e5a9637677d6e85a187bab4ac3489816d3beaa75d4388082e30042284b555fd4da61763580781adccbfdfd6d7bc30c3f5ce SHA512 d891542e8ea52787ae141b5d375659a695dd2b25445687807abb6935ceaaa1c076d0bbaf6b6d0bc5ca003c3552f57cc376de4634aeb6352f323d509f7510e230
+EBUILD mutagen-1.47.0.ebuild 824 BLAKE2B 863c05370cb77008c92d6acccf1637ac698ee7bba0199b5e77cfc6fa9ef0b778a13fdb7673d678ff9b5f7be9c495ea42fe9f89049a2b07b898620a1566e141c8 SHA512 d8385a08b1cdfca6b1e81de72bf3db581a568e8b1867b26161bed15c5fe1caaffced3a9699f6007ada097edb8042ca06ec5630b17712ced0a7d3c099482c69f6
 MISC metadata.xml 482 BLAKE2B 3ae30f618d887acb7bcabfb63ceafd422ee356b1a2f0b812dd51196e1a3e4f5afd6fc2c5fb36ff137060d710a8a7e1800ff25e2246a6dd4bb5dc3301cd559171 SHA512 13450efc95ce24cacf3c882c78acb2605c10bd803e1b63a700bd6a7bff103946f905ef39e15bc2b86e7302940c7b0a6fe9a5767c8de51f77ee1f11cfc31bfa6f
diff --git a/media-libs/mutagen/mutagen-1.47.0.ebuild b/media-libs/mutagen/mutagen-1.47.0.ebuild
index 975344434974..9bae9e85ca61 100644
--- a/media-libs/mutagen/mutagen-1.47.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.47.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index a2aafce457e8..579cd0313d4e 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,4 +1,3 @@
-AUX zxing-cpp-2.0.0-fix-crash.patch 1042 BLAKE2B 30045a15717fe7d64e9f8cb9769d84fdeeaadd1baa7b47509d32c2a454cef7d16098776db1af6029875f01cd902ed1f5f20818627a296e519cfded31407914ac SHA512 7275fac1ccc230393b1fe8432a3b37c782c8e5966d324054a39f415a51052697559b87fbcfdee8d531e878847d21672a284ad4de176453267dccae33b094da30
 DIST zxing-cpp-2.1.0.tar.gz 866787 BLAKE2B 2589862e790bac85cee92818381b4ec3f9eeb5ac1dc2a78babf372ad7672bfe1a43ac7cfe4cc228eabed8a6c013f835c7e3e1948137d61edf1056906a149df80 SHA512 a00778c1fb7bb664176f7035aa96db4bab3e7ca28b5be2862182cb591d18edd4c3dfcbd34b4af08e0797bb4af893299d523f98aa84d266b68e4c766410e2e26d
 EBUILD zxing-cpp-2.1.0.ebuild 676 BLAKE2B ccb737a5d37d63a7e22f4c1b0f5b802c40c869bbe177a885ab309de10b7a9cfb4de3023a603263d2328fbde221ffb31d1270348dcc970b0dd03eab882ac267f0 SHA512 6534891dc23c79e264119861452791ebe1af39e7e7722fd86e95bb4c3847f3a7260871123fb0bc50de35f9e5c5cc79af169a09f9565fdfb75357fa4e24f00fdb
 MISC metadata.xml 332 BLAKE2B f9f865eb6a86bdab5a5d7fe20c01e1ca84bc3977529b2826e1c6b161e31283c8108f57680442096da25a02b961f2f96a7c39458eaf62f654a56f5c17b9552ccc SHA512 f90cb5552e79b1bc3a1f17bd53b9dc756e6825beedf18c0eab5cb44c87c22b9789a19e0ebbfccb529bd935b8b842e48b335d15aab2b80e21a11ea85c1b388be5
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-2.0.0-fix-crash.patch b/media-libs/zxing-cpp/files/zxing-cpp-2.0.0-fix-crash.patch
deleted file mode 100644
index e6b25633e8e9..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-2.0.0-fix-crash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 23c19c5f98602a4d69d1667fff99678308b28b5b Mon Sep 17 00:00:00 2001
-From: liule <levie.liu@gmail.com>
-Date: Fri, 6 Jan 2023 22:06:24 +0800
-Subject: [PATCH] fix crash when the source image is less than 3 pixels
- width/height
-
----
- core/src/ReadBarcode.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/core/src/ReadBarcode.cpp b/core/src/ReadBarcode.cpp
-index 905dd191c..5ac61e250 100644
---- a/core/src/ReadBarcode.cpp
-+++ b/core/src/ReadBarcode.cpp
-@@ -76,7 +76,8 @@ class LumImagePyramid
- 
- 		layers.push_back(iv);
- 		// TODO: if only matrix codes were considered, then using std::min would be sufficient (see #425)
--		while (threshold > 0 && std::max(layers.back().width(), layers.back().height()) > threshold)
-+		while (threshold > 0 && std::max(layers.back().width(), layers.back().height()) > threshold &&
-+			   std::min(layers.back().width(), layers.back().height()) >= N)
- 			addLayer();
- #if 0
- 		// Reversing the layers means we'd start with the smallest. that can make sense if we are only looking for a