gentoo auto-resync : 19:04:2024 - 12:05:02

11 files changed, 253 insertions, 55 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 78fd56b2c6ca..9b4065489d0f 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvd_info/Manifest b/media-video/dvd_info/Manifest
index 81fd741133ea..1f675174a27d 100644
--- a/media-video/dvd_info/Manifest
+++ b/media-video/dvd_info/Manifest
@@ -1,7 +1,5 @@
-DIST dvd_info-1.1.tar.gz 260999 BLAKE2B 38a9a0b69cd507dd663afdcedba196632ecef6d1193886ec02348d2de2200fd51d3315814180a3c9c170d60042ac91972281c5c99108b5d7f41cca1af8ca3c78 SHA512 30c70d96fa79b221a653d67510261f1186e3c7a79045ac53df2219ee896f18030cf27dbef8ca73fd62282670f5781ba75cf6765744b51f66da77979c5688acc0
 DIST dvd_info-1.15.tar.gz 305270 BLAKE2B 99cbf6d1b5c45bb761e02ca71fa8e551b79543acf042967215a1d9b64486633ac1ff34be8c34eecb4e6712acfbb0bce087a258ba239305159f8b1ba72493bc57 SHA512 443876ecad3dca7808b73f5bd9d368ca32a881c741c7f47fd92ab9f095d7ab80d3db4bc4060fb73a24ef0c477f2ba4ab8fb49c82938584fbafd6bfeb7999074d
 DIST dvd_info-1.16.tar.gz 304949 BLAKE2B 3a2e6476fdd5798d95d407c018b80d046b5c1aedbf35bf42308920523fe457aa603851bcc69518530fb3ec89d6fa895de4bd6610fa9f3ec300a1459e87501494 SHA512 43c85a3cf856c0688f8af3226ba87c3e178e63dc0b6b586ee63784be184c0f2529ae090cd07fcb43580c0b08d7fe9dd9e8850cd82a26a2295e82373625bdba15
-EBUILD dvd_info-1.1.ebuild 391 BLAKE2B 3717534ffb9b6f250644a10a1ebcab8feb649e1085eea62a095536e08c417a47dbcc24a99f0b15dba21f86ce909b1bbb3ced5c019bf974de2f8af25eadb60f5c SHA512 6fd5d59455059bd3026fa2496c933e020daf9d73860c91390e47a8e010b0dd0869bc8ccfaf6493e41096ed17dd53aad658166ebbca2f32c7f26de067bf0ad931
 EBUILD dvd_info-1.15.ebuild 523 BLAKE2B 40a60ab5a377daa1fc808dbf3ee67d6c2e36eb5a07e67b82f72148f7d579027b480d7440fcfa80195a0b7ab8d9ca8839109042e3a8b388ca5c0206bee6612aa2 SHA512 8069ff052b82b4ae3636255dd4ff7b5a9193115537313d1c26ed63e469b20d7d5401155d84e1eb2bef412e4dba63699f25b0f997a61b5613f431f9ebd9a5fd8a
 EBUILD dvd_info-1.16.ebuild 641 BLAKE2B 342eb8e78afe660648750632c467a916bb4024a3988d2b2d9bc57831979545170e14220b7bb2ed47270299fda1e81b1bdfcb00faf67bc69de63cbb1aee240d6e SHA512 7e74185f2307372034d3066e0603aa0c5e9daa579ff842b4db7a2bd00f48192d3784901c7a93ee7f7c6b32a6fca43c6e4e6d01c5fa79c6b258a6d2b37c06476c
 EBUILD dvd_info-9999.ebuild 641 BLAKE2B 342eb8e78afe660648750632c467a916bb4024a3988d2b2d9bc57831979545170e14220b7bb2ed47270299fda1e81b1bdfcb00faf67bc69de63cbb1aee240d6e SHA512 7e74185f2307372034d3066e0603aa0c5e9daa579ff842b4db7a2bd00f48192d3784901c7a93ee7f7c6b32a6fca43c6e4e6d01c5fa79c6b258a6d2b37c06476c
diff --git a/media-video/dvd_info/dvd_info-1.1.ebuild b/media-video/dvd_info/dvd_info-1.1.ebuild
deleted file mode 100644
index 86a5bd527d02..000000000000
--- a/media-video/dvd_info/dvd_info-1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="DVD utilities to print information, copy tracks, etc."
-HOMEPAGE="https://github.com/beandog/dvd_info"
-SRC_URI="mirror://sourceforge/dvdinfo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libdvdread"
-RDEPEND="${DEPEND}"
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index 9b545ed99141..a6d681140d3c 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,5 +1,4 @@
 AUX dvgrab-3.5-gcc6.patch 993 BLAKE2B 30242bea0152f7d5adff59a5b2e2965dafd21d37835b625321ace52b2aa06a6789eb2101ac06f35a2f548a26253a396446f8e0c961abbbeb7ac3aa1b1f5dbbe8 SHA512 db155702d050c58b7833c609e5e1a38f91256b5bf5b8c6c8619648e12851924fb0177ad7930f4dd77671bd6515abfd6059ed5ab5611aef9b6ba4e3c8260b88b0
 DIST dvgrab-3.5.tar.gz 205268 BLAKE2B c92cfbe3257b71fe0cd8b3e403080c5bd37a10d675ea0b3feafcf01f825229d102338cc7ff1084a5c3abee8b8299276737923177229629b4418aafff020cb5eb SHA512 7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735
-EBUILD dvgrab-3.5-r1.ebuild 715 BLAKE2B e7353533f14a1b291e258352d6c8bccc8500f97c0d98695b1aafcaf69f93be4a68386f16acf15c084f7d10669407ba30351a1b11bed2cba3760645e78a8e9b1b SHA512 9f1e98cb8bcc8e93bee1fa2a50e53928455ffe6cd9c8d5b0b577063562740f070bcde2fe46b9c40adaa1866be1ee5bc1f4e3fe59e4c07a97e9c713dc298444df
 EBUILD dvgrab-3.5-r2.ebuild 735 BLAKE2B d4419bdbee8f7d626b51023040598ecf76f2787de35e00ccf41b8ff199c22821604c8272dd03cd2c3b94b3c6bdba48c3f1a980339a91ca85c774e9385dce5051 SHA512 1204b18aa6faaa325b7c6fa95481c899b4d6447164aa5c5cae3c50f5396b4b716ff1161f314547be7c2106c2a49bb94fa36658fb0fa64b779d93e1769deffb9d
 MISC metadata.xml 306 BLAKE2B 050dfb2b44d2e7f2ba153576a2c8859da442de21257a39f05bd0c4a7d6f24d891eda0eaf0df276a88bf159a67792e911d46e1c3c8548426dc300b25c296acd03 SHA512 40eaa136dab3e2882c7813b82a308c2d5f5d56c3fa20c27fe977e55254955b1a7c346e6c769deec793f8ce3d10cf2e2a98b4790dcb6eac1ff2bbf63ed1c0a7dc
diff --git a/media-video/dvgrab/dvgrab-3.5-r1.ebuild b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
deleted file mode 100644
index 4729214c762c..000000000000
--- a/media-video/dvgrab/dvgrab-3.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
-HOMEPAGE="https://github.com/ddennedy/dvgrab"
-SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="jpeg quicktime"
-
-RDEPEND=">=sys-libs/libraw1394-1.1
-	>=media-libs/libdv-0.103
-	>=media-libs/libiec61883-1
-	>=sys-libs/libavc1394-0.5.1
-	jpeg? ( virtual/jpeg:0 )
-	quicktime? ( media-libs/libquicktime )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.5-gcc6.patch"
-)
-
-src_configure() {
-	econf \
-		$(use_with quicktime libquicktime) \
-		$(use_with jpeg libjpeg)
-}
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 1e9fe3323e6f..60424d583c45 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -4,8 +4,10 @@ DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 8f24dfed854c713df369e6ef15bc773
 DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B ba8e25356b7e0820dffea1b919288ddb3d6ec56fe8d17493529ec978deae629607ff5a5857a313e478193a1fca55fa3e5256e37d57251141e1f0a892cbdcf674 SHA512 e6cef1285237673ce5851cbddf4cda77779821c247a120bf73af2b931745b2886c915a35bb2bc21a8a9c5154be9e540f8abccc3bb64e704f5b859141d0dcc2e1
 DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B b56afd5946513511938feeea4fd60e22fcf241a2380b36990eadf812b3517d6941156de73135efdc873704d27bc3329c71193be5132e462caaf7f2dc29e8a058 SHA512 635e1c5496d6f41fa5dd69efbe6dd335a15705dce8544fc45df440b19965caa130646d16b7c22b2b7cc0809979d28f39245fc5c208637e445b1fc1eb384da418
 DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a SHA512 627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b
+DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140 SHA512 c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d
 EBUILD ffmpeg-chromium-120.ebuild 6692 BLAKE2B db110de522d1885bcf2f5d3c45ca3b343943ecdbe594610a427baeae6e5e6521ee9abfebc6126b543da4c35b7715f464916e65a6c44205c69612a68fd7692317 SHA512 fd3b1ded196a4af08742723ab1ca36dda21e13c2899718e64b5ca3046474bb97042402b3870c2b9edeee3027a0f1eaba1f960bd4208c465651ad741ec8c361c8
 EBUILD ffmpeg-chromium-121.ebuild 6692 BLAKE2B 36aafbff5f4c4a7bf81d9fe1293a1962a8632f9df49012f08e7130e6050a2a026ee3b4394eca6456200ba30a2661a7fe7d1b4a3c5c95602d7865802d65587247 SHA512 a47296b03217d345a6465321ed51ae11a0a61991ea6b8790571e7c0754d1a0c9d91f7944f255dd6a05e255d863523b4637e0e9c21cc644541c04fd5abbd3a43d
 EBUILD ffmpeg-chromium-123.ebuild 6629 BLAKE2B ccf9f2604c0440214a1a3670208d192b237be824bfb70294aaf594c0a3f7241c16b1443806b0aa5e78e184c24ad6978f2d588b0953fcd1478f7699d279e7922c SHA512 aa35b07def61daa2b1c4ac575e8c7b9db019dc2be1dd284b20f43e76cb2dd72e8d47d7e5429f9e703de46439a310de4a20d2973fe219de8af1142ec5178430c7
 EBUILD ffmpeg-chromium-124.ebuild 6626 BLAKE2B c2d9f1e7aa872e5852c68c0f0145662b5efb9479d87d96f635666fee2642ac59377e204ec6e0f46c8079232be8c1fd877f933495a48e4601584ab3b4a0273b2e SHA512 a33c6e9da4c73a11ec7c030b2a9641568e878e2fc76a81a296868264e4ecf9b56247cb2e7a311c13d1ea94223c8e9a6b651610160138d95e66273952a81bc5b8
+EBUILD ffmpeg-chromium-125.ebuild 6624 BLAKE2B fbaaaa0d986aff096a557218c3c21766d94a15cfde21ef506f42807cdc414a00222915931eb7302d051a1d8ef42448620f2356b8d80092a11875c60dbae1b83a SHA512 d27d408946b89e2954dc845eee6923a188d68e4d364884d98b2fbe08bc9d2e211af70b9f3220559ccbfee15a12908bfb34f7186920ac7dd95b781769863d8c56
 MISC metadata.xml 820 BLAKE2B 666416ef717f7990f3e90e644b82c2833adb4942676f74eac6f15841d0f2a3a841b72906a7079321fb2101ffd672308892f90f536fcefa3837fb49344aeff3e9 SHA512 ffd36a905e6891f5d2134f159e6cb6707d4b37b2c5398474983ffa314fa9c5c140a5b8297de43827dd8108b7b4bcda7859158d2947e5b48730b820660a06962e
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
new file mode 100644
index 000000000000..8356541f8bcc
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT=901248a373cbbe7af68fb92faf3be7d4f679150d
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
+HOMEPAGE="https://ffmpeg.org/"
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz"
+
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		cpudetection:runtime-cpudetect debug
+		+gpl
+		vaapi vdpau vulkan
+		nvenc:ffnvcodec
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+IUSE="
+	${FFMPEG_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+	cpu_flags_arm_asimddp:dotprod
+	cpu_flags_arm_i8mm:i8mm
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? (
+		cpu_flags_arm_vfp
+		arm? ( cpu_flags_arm_thumb2 )
+	)
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? (
+		arm? ( cpu_flags_arm_thumb )
+	)
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx
+					   mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+RDEPEND="
+	>=media-libs/opus-1.0.2-r2
+	vaapi? ( >=media-libs/libva-1.2.1-r1:0= )
+	nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 )
+	vdpau? ( >=x11-libs/libvdpau-0.7 )
+	vulkan? ( >=media-libs/vulkan-loader-1.3.255:= )
+"
+
+DEPEND="${RDEPEND}
+	vulkan? ( >=dev-util/vulkan-headers-1.3.255 )
+"
+BDEPEND="
+	>=dev-build/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+"
+
+REQUIRED_USE="
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	test
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-120.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	export revision=git-N-g${COMMIT:0:10}
+	default
+
+	# -fdiagnostics-color=auto gets appended after user flags which
+	# will ignore user's preference.
+	sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+src_configure() {
+	local myconf=( )
+
+	# Bug #918997. Will probably be fixed upstream in the next release.
+	use vulkan && append-ldflags -Wl,-z,muldefs
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282, bug #754654, bug #772854
+	if [[ ${ABI} != x86 ]] && tc-is-lto; then
+		# Respect -flto value, e.g -flto=thin
+		local v="$(get-flag flto)"
+		[[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
+	fi
+	filter-lto
+
+	# Mandatory configuration
+	myconf=(
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Use --extra-libs if needed for LIBS
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--optflags="${CFLAGS}" \
+		--disable-all \
+		--disable-autodetect \
+		--disable-error-resilience \
+		--disable-everything \
+		--disable-faan \
+		--disable-iconv \
+		--disable-network \
+		--enable-avcodec \
+		--enable-avformat \
+		--enable-avutil \
+		--enable-libopus \
+		--enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \
+		--enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \
+		--enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \
+		--enable-pic \
+		--enable-static \
+		"${myconf[@]}" \
+		${EXTRA_FFMPEG_CONF}
+
+	echo "${@}"
+	"${@}" || die
+}
+
+src_compile() {
+	emake V=1 libffmpeg
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install-libffmpeg
+}
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index afc9dafc0ba6..b70c7ea17e54 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -3,6 +3,6 @@ DIST QMPlay2-src-24.04.02.tar.xz 2043084 BLAKE2B 481ce8591c362c81569b49a4640e045
 DIST QMPlay2-src-24.04.07.tar.xz 2042608 BLAKE2B 234d21478c090566210f48e62247a22c11f68d7491938d3c59aa201999eb5e0dd54cb9040cf75c655ca0b2337003b7edbe9574e45fb5ca1293e505d0e9824884 SHA512 998929c825db6c92f8a4fa22e998e51ba2aa6d6742d678aef0c380e9131f4de4a9e49c7008b73f8c19b1c8048f17288dd895fc3cade12becb729e5d981e90eac
 EBUILD qmplay2-24.03.16.ebuild 3467 BLAKE2B 8c263c5097e6354688321dcbf606fec24dd3eaacb5d589ddd278fcf88bf863c3b6cbcedcc5d39281808aca3ab19f1240e11f94a4b3364f2eb2642d7d1965fb15 SHA512 c185d8e94fc87d7d12fc62af15bad8a4c55f0d484d0638bc63eebaee46cf1d66b7123b4a3bb3b9846c6a9d8df80dc7ef73bc7aca506da60032cefc28618bae7e
 EBUILD qmplay2-24.04.02.ebuild 3468 BLAKE2B e44c9310d3386dc7674244cd44ade545c1cef92bccfd29d29cfe26c77d759d395324f9e7cf0775b636aa6b63d17e894594552abcf253182d6be727b6664a5b8a SHA512 8eb01b492f63ed9e6fe9258e02d94700c87909b05f984c24739272ea514c6318f955683ab09d27108045b4d1ac12d315b1e3a5687aa8d0f792ad1a13960562c2
-EBUILD qmplay2-24.04.07.ebuild 3463 BLAKE2B ec822ae2ccf7acad8d6030e845594713d11bbc9ab1797d7e071d28c5fa32ae9b3e2b228a369b8a3d8bf854be381adc3be90fdd7995854bda87cd5200236c37a7 SHA512 b220ad6732b577e10b0ababf57e943e2187884f2dddbb2a8c1fdbe93c578aa51bbb5d4137e38cee66574d32590522a1bca02dbbfa307b5c5dd1cb317a28d52dd
+EBUILD qmplay2-24.04.07.ebuild 3462 BLAKE2B 62cc62f2b9bf8b1fff24b3e61ea5ae53cbc0ed5c896c4c9732576f0f36cc8249ea075885f65de716b2d7d173efcbb22667e439c51f81c43853f90908fc59e799 SHA512 7ad8c3585df15e46335946545bd18fb8c272ac230c5721061830498c939fa15dd535d9fda7a04b24d3da863f3b65d7075a5995c1728afb3e0ba0429f022b718c
 EBUILD qmplay2-9999.ebuild 3468 BLAKE2B e6e6aead979834a9624aa9985be5397ba9a5a03119d60a738bde5886456b2e447ccb89617da5f32aa35c7393514001c2e4c550de4f5ac857a4ffda28e685e861 SHA512 6f21c58fe58731da0e923c8cd300efe0cbeb99707ebbca73c8e90ec00435ed66369fc669e683872ba5dd88841ca53b0f090f01ddf72b2558af92acb51fb22a33
 MISC metadata.xml 1225 BLAKE2B 9fc74ea3d0319bc8822e0ff56968efcbe4ab40b758bfeca900883ed4dbbe80608a6954ffe95a1f61d0dd988ae88afd29d2c4485f3d62b2b839b9fea289fe3b72 SHA512 94f8b05578de759be210af0eb26f15d48e15112b07e586b6336737bd9cb3dd768c7dbefc3b667753239c10bdb1fa6ebdd39d5abe234742ead51f189bf63f8173
diff --git a/media-video/qmplay2/qmplay2-24.04.07.ebuild b/media-video/qmplay2/qmplay2-24.04.07.ebuild
index 807afc78ae94..d0a302ac4801 100644
--- a/media-video/qmplay2/qmplay2-24.04.07.ebuild
+++ b/media-video/qmplay2/qmplay2-24.04.07.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
 	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 469138e416cb..a55174218c95 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,7 +10,7 @@ AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a
 AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.20.tar.xz 25596392 BLAKE2B 4537d6b4b3445a28366cdb7ed7e12d0dc864e19a53d34efcdc0a62226642ec8653cf8d5b74d4aea30c9f324c34166e8fa71653b3b298f5abdebe29c4f21f2865 SHA512 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406
-EBUILD vlc-3.0.20-r10.ebuild 13714 BLAKE2B 6e307dda7ae1f520935574b27c5ebc196bb4d1f69b090f379910a1c95513c4046fcf77eb11fca9372e5c6e82028537266f5b9d86617795dee194e47c0bb29dab SHA512 26506e9779559f6f9aba04d0ee2af42f2bb7b6390b23c1ea2e3b38bf4eada5c6fe372b1dc855c44c185302158aeaaa36003af4e135486389476146441878a224
+EBUILD vlc-3.0.20-r10.ebuild 13713 BLAKE2B 257afd14cfd7f663cdb05ecd0bc8743e79016461309c828b99c780352dc99e41685f7339432631d9255c58db8dfef784e7670e5a7c86d1b73c7a78b9a5572c84 SHA512 22c1183ad1643d685926e6799fd97be93da08f9613ae49311733d947d36ee04782c55531da8b7bcea4b8a8bec9f013c64e55c1a9f7c3d3036e33792ccbfcea0f
 EBUILD vlc-3.0.20-r5.ebuild 13695 BLAKE2B 2d7be752bd34bc9235cb04755b349a737357d2e38737c71f7b3dd6b1c01389d2542bbb208caeed86c8ba8b509b24486c20eff0f378d3de9d1954dc32a89ba335 SHA512 4598328236de70aeec4164f922a9f731be4e6ddd394df28a7dcb38cdf3d9008c96ef1395a90ea9c27dd21beeeedcbb5f8f9f795438a42d431a314b420b4fb7fa
 EBUILD vlc-3.0.9999.ebuild 13640 BLAKE2B 046e11a9895755093d585a379064ceffbce7b25342d0636b4cbd9cb2dabf186899b1244ec0ab7b9c24127a87b4758f882a0fd684216a36c89a64fc7d5c911b6b SHA512 fbaedcb6ba8d47dc39dbba7ec68ef69ee26d041af171eb94c3e76d6ef306e874c21fa0cb160fdd70014982ac96a9e9b47855962a72d8abfc14a249d0f3777493
 EBUILD vlc-9999.ebuild 13468 BLAKE2B 9368b716f838feffe9ffbed08cf002ed5c5ccca0244dad4d5a51f2dd9f942ff3fc9662388391339083a8d4d0b1047dcb0750b22bf924b320dfceda7a3f5b58f9 SHA512 c3c5353ebf8e99a860b6b862a5002f833c35875f26885ed63fc784dc252d15edfa6ff1143123ee5066def0f34763932ce64dfecb15ecbf19e008f82afde648bd
diff --git a/media-video/vlc/vlc-3.0.20-r10.ebuild b/media-video/vlc/vlc-3.0.20-r10.ebuild
index 64dab832d372..7e985624bdd5 100644
--- a/media-video/vlc/vlc-3.0.20-r10.ebuild
+++ b/media-video/vlc/vlc-3.0.20-r10.ebuild
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv -sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg