gentoo auto-resync : 21:07:2024 - 12:30:10

14 files changed, 292 insertions, 143 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e4865ef23156..4424ee8a66e0 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/faun/Manifest b/media-libs/faun/Manifest
index b3c03b42735f..a3bc047d6a78 100644
--- a/media-libs/faun/Manifest
+++ b/media-libs/faun/Manifest
@@ -1,4 +1,4 @@
 AUX faun-0.1.2_makefile.patch 2362 BLAKE2B caeaeafeafb42508cc276de36142a59b7a5106b0592012f8811ef54d1b06a94555f6a4ce7e0713f5d6ec80c89b8ac22f5bd8cd7e3256ccc5d18815a6a161bd9e SHA512 1c3407800aff5ebf3706c23b72f17c8e448f2a75cb2feb76cf9d91b9c6edca1ab9b70193154fe0b67fffbfc0d4c8141cbfb8824d152f3b95270c1250c209f286
-DIST faun-0.1.2.tar.gz 107751 BLAKE2B 5c8655aad59dfb8292f098af7f90d13e25c8df0d9cf7b3d2d5a0d7c94e68389c898e8d66abb67cb93ef70a4e4d81d63aca9e60afe48afcd4e96ef7371b6611e0 SHA512 b0ec4b7fccc4f17e1f37ed87c45b41f75faa42393143313264d77a117dbc76b37f9418886f425cf06d8baeebfe1269bcdabbe16aead634177021bc50ba1c5260
-EBUILD faun-0.1.2.ebuild 723 BLAKE2B 9f810398222999017b1c20751446cea6bd9dc0e1e2a81ac7477618561e92b181bf752daab6f79385ab2e9a733ce353ea16861d2b848e01d5fc7a765d8ee8bc53 SHA512 0f4c91835c44194183cdd86ba5ccfa204d34326c7620f1cf837e1a73ce269275074c4cd13af600bd72a33e2a540e7cd517a65d0319611b26ac2ea361cb1edca4
+DIST faun-0.1.4.tar.gz 110154 BLAKE2B a41e33282442a1b2999c7cc46fc6978607b6d6f2e6d8d7e92dd43386f2ff2ac61aa3c86e0219ffded8a35224c366a85cd7ab1c36a128eb746457be9fdea76c8e SHA512 4449c478109dd78933e346e87228639d0c5fcc33466a60a9649756cb69b087b82a7e0aa21591b4b2e8046858ac6ac9fc7cc43d84eb2e64624b49af8445dcda21
+EBUILD faun-0.1.4.ebuild 723 BLAKE2B 9f810398222999017b1c20751446cea6bd9dc0e1e2a81ac7477618561e92b181bf752daab6f79385ab2e9a733ce353ea16861d2b848e01d5fc7a765d8ee8bc53 SHA512 0f4c91835c44194183cdd86ba5ccfa204d34326c7620f1cf837e1a73ce269275074c4cd13af600bd72a33e2a540e7cd517a65d0319611b26ac2ea361cb1edca4
 MISC metadata.xml 474 BLAKE2B 681b365b3146371dac7b778ee37ba9401215ab28cf98f3a01527f4496b2b215f9bf3ff12e60be6f08478a05719b7d1ee3169a7dff86948b3a7c766d6d83efc31 SHA512 511f1ee5ff692e2999da9de2d8dc1ba4a5a840635d70ffaabe2e7efb93694a995a1dad813f4d2f928d83722a86c8b175000835b907522daf698d396d64a945bb
diff --git a/media-libs/faun/faun-0.1.2.ebuild b/media-libs/faun/faun-0.1.4.ebuild
index a5b0eb2e7089..a5b0eb2e7089 100644
--- a/media-libs/faun/faun-0.1.2.ebuild
+++ b/media-libs/faun/faun-0.1.4.ebuild
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 03394e1fdfe4..3cc3b6cf7b93 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -11,9 +11,12 @@ DIST libaom-3.8.1-testdata.tar.xz 426372276 BLAKE2B 4d6194a98612045023f4d35ca851
 DIST libaom-3.8.1.tar.gz 5450909 BLAKE2B fec3123f8ee68b1027a1a2019969c098b730da72be2902274659b983857f2d8f62dae5b563543b3f144ae8bc51b6d6fdd4fcd6aadf2ca04d5a4dd5be987fbbac SHA512 f9ee918a37699cfaf2bcb5aa16a4d8b077feb1fc577d8c5437ed3fa1a1c0a5d734c9564e3c8c0f0b1baf43dc5abb7ff0196a77607b10d926c0be7858778ac1e3
 DIST libaom-3.9.0-testdata.tar.xz 426348008 BLAKE2B 1d95116e738a3271cbb6381cdeb3d2cd359bd3d3001e759e6ed9f56f7f0d87b6a0a557f3655c4c5640e7812cee2e10de5626de70794c6b49fdac51f33d9a1b56 SHA512 b8e68cffa844ac33f3fd7cce8de08e90bc4e401055fa24e58ea6e1217a64db62bd09c469267106b1e82d480550238ac6aaa12c86f75e9fbfd8fa847180b41537
 DIST libaom-3.9.0.tar.gz 5518815 BLAKE2B 4c68b58f6a8e347ee912e309a030804c4a3cc99714e2aaf127add63222df3056c7cf4b6c50f4861557b0892739035149b5e002e25272882eff55cde5d9b745b7 SHA512 0793e0801be72d35144162141a180ff5e3ae11186f734af738b1eb2d81bff1364be7741cc34ae2507d2b88de11f840609a09f8b05b75e8d853aa80626241bf95
+DIST libaom-3.9.1-testdata.tar.xz 426413144 BLAKE2B 99fad74bbfabbfd1a7b9a2a3ae72c1c5a4810a70cb6f2df54ad4e29da5afd9278fcc2555f859f51dadab41e1d1829d08ee9efee415ca34d05acd5175caf35205 SHA512 81ce77937264c3a4f6da19dab5cfc4feb559359c154fc00105e6aee6aebb1900e4ecaadd248ba09c5aa266ba0f937451a075338c474ca69a64871d6e6f9c4480
+DIST libaom-3.9.1.tar.gz 5524048 BLAKE2B 2f983a4a563e16120aa8937e059f4cd267fb60b6d4148f952f1e664a50b84bc0d8ba7629231b60e4263963d97559a819752a4fa0dcf2427c9f94036716221324 SHA512 d134583c9cc17e0c8e0dec17677a5daca6f42636f3cde83e1b0fc5250f7372f190c125afb845540cd947fb28462cc91b111a69ae4fec51946c3730cacf42c36e
 EBUILD libaom-3.5.0.ebuild 3298 BLAKE2B d5039a7ac72305f1e4930e258577d8aa15b5fa1c7ad910c0f51210959e4628cb552a9e0721f6a2d8c4dbfd58061f5fe1854d0d78badfe40d51aa04fedbfd66c2 SHA512 ae81d949fb6aae7e727b9d1006863c037dc87f2381c004c051a7a4ff4546794745ad809557aabc0f8ce1e45834af51909d17c5e102825fa9621e8db4d95dd3a2
 EBUILD libaom-3.7.0-r2.ebuild 4388 BLAKE2B 0d0cf93808bbc21cdad38266631884bea7ea34bc0476578656b03ad2bd85fc17b20c7655ba9ba0cdce5405d6c434baae722f512d94538dda41b921dbdc49eb6e SHA512 88f0da21d5088db1ab848dd877b59a07415e2bfe604922964e3b6904e98a81177f40ca257d049bc98a1cb14eb869657dc8d6c579c5009cf025b5b2af1659e672
 EBUILD libaom-3.8.1.ebuild 5021 BLAKE2B efdf65610fd174e11d56b721f5cfeff9e1f9e394cb14a687a5129b779d26d2fbad91b0dc1ad91ad4f760f0994e251de4e293970f902c1cf0dde7b6c452912b95 SHA512 0a0d53ad8271f838c88e48c328533fa20846a76e2d76ce18673791a61360e5efaa883ca6c8cc8539d3dc00054c6a7cc15f6934cabb8a539aa1e662e763271263
 EBUILD libaom-3.9.0.ebuild 4546 BLAKE2B 2c776663efbfc9ed96750e31f83483e0281d6d7a976afd1259fa6b883a57e5287aef30fe2ee25c86103860158ab76fb8bacefeec2a1198ae0a7e595688e64cd0 SHA512 ec8ef1f77cd78a8341cfe47abba0586796e32f9f231ca440575300e96e084c23cba8ac62bf8c1e1b970efce5eaf7e2715fc88bc2863083a1c3e6849218483984
+EBUILD libaom-3.9.1.ebuild 4520 BLAKE2B 12310a60c0c2b3492c40464d3e33d870f16ff79553080b5d2f515e110f9f683c22fc31fdfe1bfdc026cca6e69cde248fe2f59fdd06a0b101a15f50923f07c76e SHA512 78824f8e0586cbdb76041524b4696b5ad314c35af3aebed45904a5b08614c29f2e6f299ac010e00136a802f6afbcd9df08836f71d9faa76e2a0bab105e02b1b7
 EBUILD libaom-9999.ebuild 4520 BLAKE2B 12310a60c0c2b3492c40464d3e33d870f16ff79553080b5d2f515e110f9f683c22fc31fdfe1bfdc026cca6e69cde248fe2f59fdd06a0b101a15f50923f07c76e SHA512 78824f8e0586cbdb76041524b4696b5ad314c35af3aebed45904a5b08614c29f2e6f299ac010e00136a802f6afbcd9df08836f71d9faa76e2a0bab105e02b1b7
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.9.1.ebuild b/media-libs/libaom/libaom-3.9.1.ebuild
new file mode 100644
index 000000000000..0f15cf62049a
--- /dev/null
+++ b/media-libs/libaom/libaom-3.9.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib flag-o-matic multiprocessing python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	# To update test data tarball,
+	# chromium-tools.git/generate-libaom-test-tarball.sh
+	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 ~ia64 ~loong ~ppc64 ~riscv ~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="big-endian debug 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_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx"
+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-text/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
+	"${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
+)
+
+multilib_src_configure() {
+	# Follow upstream recommendations in README (bug #921438) and avoid
+	# asserts during common use (bug #914614).
+	append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG')
+
+	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
+		# https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows
+		# that big endian detection doesn't really work otherwise.
+		-DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0)
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# arm
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_ARM_CRC32=$(usex cpu_flags_arm_crc32 ON OFF)
+		# bug #917277
+		-DENABLE_NEON_DOTPROD=OFF
+		# bug #917278
+		-DENABLE_NEON_I8MM=OFF
+		# bug #920474
+		-DENABLE_SVE=OFF
+
+		# mips
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+
+		# amd64
+		-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)
+
+		# ppc
+		-DENABLE_VSX=$(usex cpu_flags_ppc_vsx 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
+
+	# LIBAOM_TEST_PROCS is added by our tests-parallel.patch
+	export LIBAOM_TEST_PROCS="$(makeopts_jobs)"
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	einfo "Running quiet tests which take hours."
+	# We use ninja rather than test_libaom directly so we can run it in parallel
+	# with sharding, see https://aomedia.googlesource.com/aom/#sharded-testing.
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" eninja -C "${BUILD_DIR}" runtests
+}
+
+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/libheif/Manifest b/media-libs/libheif/Manifest
index 9b05e89d4517..18ebaae115c7 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,6 @@
 DIST libheif-1.15.2.tar.gz 1749773 BLAKE2B 788ecf59c936bfae9544bedd5fa50fd74f04adf29f804994bc208d2a5339b13984baf78a508babd80fa0d48381b2cc0bfb1e1140de97437b8c0336378a64fcb6 SHA512 79f22dad084bbe965dae7b8f92fc119dbdde7a04577ca9c7bc28b1a022a06f0ae64d3fbd11e82d6907f0fd678a31d98275e508a51a6bd0a9e8675c93790f1996
+DIST libheif-1.17.6.tar.gz 1433302 BLAKE2B 937a1ddfd86c4d50a609e24d00c07e0d1924a5532e36293f83fd67a38f4c13186cb5c4837598000d6d3516ec1965fdc6709ef825c327fd5ce3ea2194008b6efd SHA512 47d93df4f584979cea26af74cd8543b13398356b5fd46b1b378f7738cee471e80b7e117f6ce307674a549182f5ce22a577c6e79a6e72fe166421efc4be04687a
 EBUILD libheif-1.15.2-r1.ebuild 2058 BLAKE2B 4769aaea2e7165a43dc8761d944ff77df1ca87ed6fe4bef4f291075db39c44b151f46198e1e74683072ad3a26aced9f259a71db8a5512cf74cec047c1750073b SHA512 108ed5a9a7ab77110dc53189ae90f245672f39e76784678cb007b560b8284e862ae4142cd6abf484bdfb0029c41bfdec9aa5c352fa9ba1439d39fb3cdd63af96
-EBUILD libheif-9999.ebuild 2001 BLAKE2B 02130e50e78e847a881aeab0b1f4f86e1aab701500d42b430d3ba073715369bd444eff39150e8d948e1482341cd4e1c685a7eda59dfa697a4517de11c34799c7 SHA512 ad3efd5f606d0c5e5f747353f22d5953d4e1f68e964e945b9bc8c652753dd36ed85ea681ae41b7c270f34c9a131f84e229b49eb41eb4787d80ee909eb1ed9a62
-MISC metadata.xml 725 BLAKE2B c952cedefb662b71823790f5580a5255028a2b2c00d82098a87e76c55dda3a19bf2b5ed84a25f31729d02b0121c75befd5d5deb0223d1cc298cb8523023277d2 SHA512 b289faaae3347d1587d24e70c2a3baccf2efd7ae0e326b709a38220c5cdf5058545991b5386a720c2653d9494f8df1eca1ed90a703875373876349ab40d71afb
+EBUILD libheif-1.17.6.ebuild 2258 BLAKE2B 1ef40abfff4b9c0e6274a77c058858ea98116e157e8e3bfac3630d559ce0238112009bd16b8d7fa0dc49aa0460bb8ba3e03e836c0e11eec1f2065cc16ac65b60 SHA512 f7f3c152697c0f4c4f20e81964b0012cfa23fef3e884d6d2ad28ad010c374ba68f022e834091d121b2de1edb0017c2a1a10bea70790668a0a7c836dbea5f0853
+EBUILD libheif-9999.ebuild 2258 BLAKE2B 1ef40abfff4b9c0e6274a77c058858ea98116e157e8e3bfac3630d559ce0238112009bd16b8d7fa0dc49aa0460bb8ba3e03e836c0e11eec1f2065cc16ac65b60 SHA512 f7f3c152697c0f4c4f20e81964b0012cfa23fef3e884d6d2ad28ad010c374ba68f022e834091d121b2de1edb0017c2a1a10bea70790668a0a7c836dbea5f0853
+MISC metadata.xml 809 BLAKE2B f26844fa79747ac286a0130cb8cb2b4f0e771ed7fa3f9fe29a3fbd71876902c868dc32305f928cedbb88dcadab3c07cb4f85c647369adc904c7c9c463dd05343 SHA512 754ef9004dc664cca658bfbd0392fce837557efe1b92aefe198dd529cb388048f49e37648c7338829d6ecd87ea953efd0f66895191aea7bd39730c2f7240f032
diff --git a/media-libs/libheif/libheif-1.17.6.ebuild b/media-libs/libheif/libheif-1.17.6.ebuild
new file mode 100644
index 000000000000..a4c096fce0e6
--- /dev/null
+++ b/media-libs/libheif/libheif-1.17.6.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 xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-cpp/catch
+		dev-lang/go
+	)
+"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/tiff:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	rav1e? ( media-video/rav1e:= )
+	svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libheif/heif_version.h
+)
+
+src_prepare() {
+	default
+
+	if use test ; then
+		# bug 865351
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
+	cmake_src_prepare
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local mycmakeargs=(
+		-DENABLE_PLUGIN_LOADING=true
+		-DWITH_LIBDE265=true
+		-DWITH_AOM_DECODER=$(usex aom)
+		-DWITH_AOM_ENCODER=$(usex aom)
+		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
+		-DWITH_RAV1E="$(multilib_native_usex rav1e)"
+		-DWITH_SvtEnc="$(usex svt-av1)"
+		-DWITH_X265=$(usex x265)
+		-DWITH_KVAZAAR=true
+		-DWITH_JPEG_DECODER=true
+		-DWITH_JPEG_ENCODER=true
+		-DWITH_OpenJPEG_DECODER=true
+		-DWITH_OpenJPEG_ENCODER=true
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	default
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	default
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 2b2d106acf2d..a4c096fce0e6 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools xdg multilib-minimal
+inherit cmake xdg multilib-minimal
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
@@ -17,14 +17,14 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.12"
-IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads x265"
 REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
-		<dev-cpp/catch-3
+		dev-cpp/catch
 		dev-lang/go
 	)
 "
@@ -32,53 +32,68 @@ DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/tiff:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )
 	rav1e? ( media-video/rav1e:= )
+	svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] )
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libheif/heif_version.h
+)
+
 src_prepare() {
 	default
 
-	sed -i -e 's:-Werror::' configure.ac || die
-
 	if use test ; then
+		# bug 865351
 		rm tests/catch.hpp || die
 		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
 	fi
 
-	eautoreconf
+	cmake_src_prepare
 
-	# prevent "stat heif-test.go: no such file or directory"
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
 	export GO111MODULE=auto
-	local econf_args=(
-		--enable-libde265
-		--disable-static
-		$(multilib_is_native_abi && use go || echo --disable-go)
-		$(use_enable aom)
-		$(use_enable gdk-pixbuf)
-		$(use_enable rav1e)
-		$(use_enable threads multithreading)
-		$(use_enable test tests)
-		$(use_enable x265)
+	local mycmakeargs=(
+		-DENABLE_PLUGIN_LOADING=true
+		-DWITH_LIBDE265=true
+		-DWITH_AOM_DECODER=$(usex aom)
+		-DWITH_AOM_ENCODER=$(usex aom)
+		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
+		-DWITH_RAV1E="$(multilib_native_usex rav1e)"
+		-DWITH_SvtEnc="$(usex svt-av1)"
+		-DWITH_X265=$(usex x265)
+		-DWITH_KVAZAAR=true
+		-DWITH_JPEG_DECODER=true
+		-DWITH_JPEG_ENCODER=true
+		-DWITH_OpenJPEG_DECODER=true
+		-DWITH_OpenJPEG_ENCODER=true
 	)
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	default
+	cmake_src_compile
 }
 
 multilib_src_test() {
 	default
-	emake -C go test
+}
+
+multilib_src_install() {
+	cmake_src_install
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index 99600fed24d1..e1aa5ee8fec4 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -7,6 +7,7 @@
 	<flag name="gdk-pixbuf">Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
 	<flag name="go">Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
 	<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
+	<flag name="svt-av1">Use <pkg>media-libs/svt-av1</pkg> for SVT-AV1 encoding</flag>
 	<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
 	</use>
 	<upstream>
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 361197c5f433..fc99cabb2ad6 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,9 +1,5 @@
 AUX liblscp-0.9.6-conditional.patch 275 BLAKE2B 4ce887eb210c4e32d16a8b0300d7a03903671967122aff13a1c5d59edd02778bc4f1a7e29fd9cb56e54526e91b4ba9c6ed6f8ab526c49f783f7800c9f4587a7e SHA512 1d3d2b0ab448d7e58b8eb561292d445de41df9989a3268fa34a8d3b440195c09d7ce5b674227a4786f8c947794933250fea636b294723bb26ce65b301cc096de
-DIST liblscp-0.9.12.tar.gz 99062 BLAKE2B b1701eba58211bbe6e46ae7b08ca535f6f68d724523f12aca394e31cf3f95bce2c4b3c051576f8cf5e2490cb9c85cbb8b6664e3088d36fa1cf409401996c53e0 SHA512 a29f87d04a9a2726dd3a465a6bc0891e51e1b63da624f3b282c9d32710c7a7f57e7bffed4d3a6f3d7d8db70e56f1d8050b3453c064fa433b6a113fb8b09fed5a
-DIST liblscp-0.9.91.tar.gz 99118 BLAKE2B 8385f0e1468deb3f49ef124b6aa2d3e57f14852d8e32dfb786b05f5cd69b9ff3f74e22d88abd16ead42ac0c5a718a22882eab9e5a59d240f3f650e2b5fd97a20 SHA512 fde1e712af8c4c3d5308c1464060fb8bcdfc43b7ca3241af1f9fa7a30b0ce044e3c57fb588f0cbf5eaba47a964c9607550c05c2d0993c118da792cc0e2a18b41
 DIST liblscp-1.0.0.tar.gz 99190 BLAKE2B d44b69ed180b22d66eab5f8a0bb2b8d24794d7aeedc9213729cc1787a1db6546f2a4d28c4177732b8281c5c4a103dd6f37f3af155caed886d694bafe74e718a3 SHA512 2f407d5461dcf20204a1f37fba9456076e8e052a47528d4f10da6a5e123758261cde2dffd99b45a16e3855b6d42ca6cce714bfeb8602aefb95f6dd2a825597d5
-EBUILD liblscp-0.9.12.ebuild 749 BLAKE2B a0a21dd4b3ba982ada8e76d476f1331cc3ea88222333e4badb63054037ae1e4f03de5ec4eec7e4d4382aeb57150cf9780e2e6850c8284038f708f6f4e7bb4b0d SHA512 c312e96c8deaa41fa59e3d8b15292b8f0091bf209ca8a6d9f530f5a7ac6e5f7d990da44b3d13777d85c2ffd5d22693d8d20258dbc287c5e15c240434c9c7470e
-EBUILD liblscp-0.9.91.ebuild 750 BLAKE2B cabe577a40f5ba898182c2b6cf86f885ebd69ed84cef2c144dc47e77e560fec97eb553c05e3fb94efa17840337b79e94d470d9e9d349d090791b71535efc92f9 SHA512 2bd95460a437b8ece27b4fd13d7f9e364a03690c7575968ec7288db6eacd97d64781af701d474f42301f434db3b96490bcfc9f217acad907ee473c5520b80069
 EBUILD liblscp-1.0.0.ebuild 749 BLAKE2B a0a21dd4b3ba982ada8e76d476f1331cc3ea88222333e4badb63054037ae1e4f03de5ec4eec7e4d4382aeb57150cf9780e2e6850c8284038f708f6f4e7bb4b0d SHA512 c312e96c8deaa41fa59e3d8b15292b8f0091bf209ca8a6d9f530f5a7ac6e5f7d990da44b3d13777d85c2ffd5d22693d8d20258dbc287c5e15c240434c9c7470e
 EBUILD liblscp-9999.ebuild 751 BLAKE2B af9d1c298f2b444cde35901c0d8cd2e2ceb1da7409d86ff43ad417b1c891a605a4b08e51292e4abc2057faa77668d8209a6a9c88f3663f180b8c2a7e51482d9a SHA512 4a68c8d9804f5ee934cf558d8af1f82d01bbf889162a1164197aa67b08b65f52cc53b9ab3884acf2527c3c1b137e42aec984a953671a53bd58f486dc6008dfb9
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/liblscp-0.9.12.ebuild b/media-libs/liblscp/liblscp-0.9.12.ebuild
deleted file mode 100644
index 8814d6bb81c4..000000000000
--- a/media-libs/liblscp/liblscp-0.9.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="https://www.linuxsampler.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
-else
-	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
-		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.6-conditional.patch"
-)
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC=$(usex doc)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/liblscp/liblscp-0.9.91.ebuild b/media-libs/liblscp/liblscp-0.9.91.ebuild
deleted file mode 100644
index dd039ed5be77..000000000000
--- a/media-libs/liblscp/liblscp-0.9.91.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="https://www.linuxsampler.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
-else
-	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
-		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.6-conditional.patch"
-)
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC=$(usex doc)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/libmpd/Manifest b/media-libs/libmpd/Manifest
index 56a89e993a7e..804fa32e2a3b 100644
--- a/media-libs/libmpd/Manifest
+++ b/media-libs/libmpd/Manifest
@@ -1,6 +1,5 @@
 AUX libmpd-11.8.17-remove-strndup.patch 439 BLAKE2B 35f5f6efc5233ea61ce7967c52bf69d3aa44814d3506534d4272ef3df454e93e14005cce25b929d066dd4e4d1c1c28a08e7d6b59c490c1926e46fa61d1bf8511 SHA512 0b0c3b28abd7aaf540d6133ad5a72f5e0fc2cca593bc870106c17d9b1828a2bb35880436a489261ef1c56bbb176e0809d6f09165108bf867f776902cd5757fff
 AUX libmpd-11.8.17-return-0-instead-of-null.patch 1301 BLAKE2B 34afa197ed7d6418e15896d2ea1d5e9f6493546146cbf1d93d45a1fdeec88520ef26a62c02d080fb7093ecee845647929e92a1f08f1a0c1c0a8d8b5bf49a43f9 SHA512 19698d9092c0393c34e61710db09a02c7b288a55211f814a8a6dd5278cb9358a510978f1f44df173d73ef1c75b924a613babd8a7a1c0180e13c205612a3749db
 DIST libmpd-11.8.17.tar.gz 365015 BLAKE2B ed6afc3a90fa8a6b6e53ecfd67d195133a6bbecf4ddb3960247b5b2944624f0851d73229145a2ccb7eb3ca84b1d3a245dd3cc1de39f3bd9d5bd21f58f6576e18 SHA512 ffe2880834a4a39745a5327d628781e16eeb8cd1ec17402dda46ad96ff402bc0d8b4312ba058a39242ad9bb8c3a0bb6feb2c5ea2a30ef9be97652fdb5c02572d
-EBUILD libmpd-11.8.17-r1.ebuild 877 BLAKE2B 4f4a354614dddd8863090387c44d6ae9d5d1c1829d3a53bd0b5380f873571547821c28b2e95287e6d37489811adb99651b43afd6e8919ce3d429b3e2d133f386 SHA512 a4dfe2f01f4b9409e663b2d4adc168c4468e3ee4a98005f50f576fd7be756727c4aefa3626f41223daae278c872409f959b432c59da86668962dc2035b02611a
 EBUILD libmpd-11.8.17-r2.ebuild 929 BLAKE2B 0d62ac4c91d4244bf6ef9c748ad8f8c7667969fce287b1470d98161e7f3f7c68d8a2430404ebfd99694c3894a6596275a73b1f3ccdc50c0249265cca3fb02b6a SHA512 dc2abb3526698861dd0ff8439c16d5325a41dea51a3c03b80ad6b3b251bd25d7521b9f32fa951d1a7d96b44480f92895248cf2ce758dfb852d5d754de9006286
 MISC metadata.xml 252 BLAKE2B 648cca48f0a3b65ded6fd96d45d3f23cfae98bfa6b5f683383f1f49eedf763f99e034958d5a91ef3bf0904304eb7fa78dd7a582cf337762df4bd59c1eeaafb4e SHA512 cff6482e227806ef72806b8b925a4f5a3dfb87c26007a4614e1891524f18fb33c49d4d774d824676b02664d2703d8d8e8605e2f15983346868f4ba49405b75c4
diff --git a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
deleted file mode 100644
index 8703a2dfd0d2..000000000000
--- a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A library handling connections to a MPD server"
-HOMEPAGE="https://gmpclient.org/"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-DEPEND=">=dev-libs/glib-2.16:2"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-remove-strndup.patch )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	use doc && emake -C doc doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/* )
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{README,ChangeLog} || die
-}