gentoo auto-resync : 28:03:2025 - 00:31:34

7 files changed, 9 insertions, 62 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 7d2736134909..8900926f823a 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg-compat/Manifest b/media-video/ffmpeg-compat/Manifest
index f4911ab65848..3dc7c231904c 100644
--- a/media-video/ffmpeg-compat/Manifest
+++ b/media-video/ffmpeg-compat/Manifest
@@ -6,6 +6,6 @@ DIST ffmpeg-6.1.2.tar.xz 10466152 BLAKE2B ff1f2b2bb60ccc4c37b6ffda2a0e6a0be80c45
 DIST ffmpeg-6.1.2.tar.xz.asc 520 BLAKE2B f26a2d6f5423f93090f2a448172e49f3858aeb5a00f326207d374bbb70fa8942c7ee1a7c55338b2db664b647c983cd5ab4fd8d71efe5c37af4c90385ca17d0ab SHA512 a26dba1f4870b964080b45f8468f5ce3591eb6aa69be426bf4afbe5a60c3cbd0fe5056dc86ca7bb817c04ae30d39160cb7773772a9a2123ae7f095b18a6d7050
 DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158
 DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f
-EBUILD ffmpeg-compat-4.4.5.ebuild 14660 BLAKE2B f50890b3360778bafff38c9093e0d9916b67aaccf5d8aaf74084fef37623909f9bf87b75ce3005ff3918340050c6b38598244bade713db25a4c68c1bca36d269 SHA512 0d84a5b1bd4febd75261d63e45fb544d0cba30ad239e67144cd3513536d8988e756b1c29bb45841b2cf108a649dab8871db05f736c9fef4ae59e0cebb5b31310
-EBUILD ffmpeg-compat-6.1.2.ebuild 16789 BLAKE2B 640e84a6f25318d8f95438c78335dc6d7a10285d2673ab91a4e8123b2b9f232d0d5dc268d8a416dbed9a326fd51ac6088ab4956351b8f93fc6b68436d62a1c6e SHA512 4153eb73b7176caed245abf9ee64f9479d259ac049efedfb33133e22c93cb2d0763d1134c93bb4236b610408b050e82af987a0372cba94c8cb4ca440f4c67a13
+EBUILD ffmpeg-compat-4.4.5.ebuild 14657 BLAKE2B e5563e14a0624d009c952eac45289651b9b03880461a2e1465ec3fd7824f51e3bf6d02cac65c72c6a7c8892c1bf1244cd3738aac3c3b30b861b478ba9062591e SHA512 acecaffd8b416ba6f6564e4c404bda4a96cbb8fb8374d6b418b6aaa289a30464d554fb1476900f8b8897e347d6459ef50a52b7c559b652ea4e151dbafe839d92
+EBUILD ffmpeg-compat-6.1.2.ebuild 16786 BLAKE2B 424d4dc872bc517299ca54e46fd30f537799640895e1ce7a59bce1c518a7c6788cb1b253c9861f923cbe31ed479736539898e7c9c653e8ecd2c92cd22e761419 SHA512 1404a0ec32ae11a0e92ff54e8129a432f426b7e91360e6f77a9e4f75673356ea17cef2eec2ad0037ae9d13e8387c7ec97cc5e288a9a653dcb122ec229fae245e
 MISC metadata.xml 7605 BLAKE2B af1dae9179eb75099f73330e42f95be290f59e99e4062f265e0cf339d9d2e9fd3ef5265600e8e497b2edd58d2501ded48fb92fe6e3c92f1c5015fe79a999c187 SHA512 6093fd6f4c22221cc3ee7bde293f0ea9bffbcaecac8c3735f515cc37a1c48b69b6ee38acd34c892c1c72e14bc4f823714e446224f1bc4806e7bad52190fd63e2
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
index 64d121011678..c7bee8fbe8a4 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P}
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
index 4fb307f73460..8c6fe47c26b1 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
@@ -28,7 +28,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P}
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 86985bbba37b..af3755695619 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,6 +1,6 @@
 DIST mpv-0.39.0.tar.gz 3494313 BLAKE2B 9f96ba225eb0587d50f8c439359b18f752b98024ab6b40f987be4d57b0ce4b595243f49177ffc48840b351ce19fddc84788b5784b508eb685e58fdfb8e1e0520 SHA512 9cf1d7487b1e9e36d2b731bf951c4d3b9deba95109af408ccfc71b88e85f6de2558e7b4950781667bb4d40e0352742e3ed278559ff34d07905dd459969cbf503
 DIST mpv-0.40.0.tar.gz 3561474 BLAKE2B 618cffca1ec30da0a49b91e168dd1d041e5646f7930fa65ced1f58aabed2e663f6a161c0c71b2f1769fa43a0873d91ef8219f11c5458e8ecb67b4466581c4f90 SHA512 24ccbff7fa34f85c033dc9ed94a364c6226e1081a47086365fc98e332af2004517dede371a005f1d51c2a3306b7dc915df9de4188cea140b1fd988058bbd6e8c
 EBUILD mpv-0.39.0-r1.ebuild 6978 BLAKE2B 5fe607c89e16f6e9c1414107a42bc2e76e6f7eae56b0c0923077ca770e9548f92dfd786d9c29027238ab0d1ed6b86085f2f6ad6e5663a4d037b452acf2d1e064 SHA512 fdf47bdf2ef0442eb1c71feb36cd6ecac6727202fe462a2f4ed67704eb1c4229fa0932da699ccef3a7c72d91d1d7bbc574912505677c44ad92c10523b354b2e1
-EBUILD mpv-0.40.0.ebuild 6988 BLAKE2B 9676dc2f32b7cd3109d4e2be3abe9f2d6f12eadd7dbc9e76ded83932827caef8072fa58fe8ef8efb011d27cb49d128335c61035b0bb7bb4c761437b39d4ff450 SHA512 df279132c0714976e01dad700ebd96591a60cb9663fc77d9513452e15c9dcf5622792916455869f2f56a4b31e93e0413d9c0eb9edec63259aec3bb4125f60b65
-EBUILD mpv-9999.ebuild 6988 BLAKE2B 9676dc2f32b7cd3109d4e2be3abe9f2d6f12eadd7dbc9e76ded83932827caef8072fa58fe8ef8efb011d27cb49d128335c61035b0bb7bb4c761437b39d4ff450 SHA512 df279132c0714976e01dad700ebd96591a60cb9663fc77d9513452e15c9dcf5622792916455869f2f56a4b31e93e0413d9c0eb9edec63259aec3bb4125f60b65
+EBUILD mpv-0.40.0.ebuild 6076 BLAKE2B e706a980a6a004d6c642baf4ba7e12a8b174a19af91d24c5b31d730a3923849b0280d052b6306803e0ac2f53f765a3dde419f315b4ee0fe2340773aa4a14134e SHA512 15c133ac7088bae48660a4caa9361af8d8a8e3d6dcd42e1e6e2d4beb9968cdf24015a8b8b93d2c91436eb1f1156cccff6a19afc7c8afd072eba6d4f55e3e999d
+EBUILD mpv-9999.ebuild 6116 BLAKE2B e73e9986bc2c2a9f1c49f4c01b6405cc6ba723c6ba1b6a723089f3a5f7d6a4b7588fabaac9494708c5febd4e226ae6eb848a21eb116a00ff1be7ce81ac27ab0a SHA512 a15896aa3adc27bae7afee0e013f032bf71b1556ab530cd901118c0f95c958996526435ca1941616b591601750bdd807c50df653b23bbd4dd73394636a4abd96
 MISC metadata.xml 2053 BLAKE2B dc35c3bcdb29eb08725a4f908575ecc2afed2d772988ff12ad052c39e9b195a68611e8037b82ee5ceefc33c40d8df666e03aa59d836eeb7c6472bd988f49b4ee SHA512 4e7cd2da4df81f9ecafddfe93788cabbc4f0de0ff9b976af2ab3fb0f63b2d7daee6d8c5607685240f41be37a158b9fa0acd030d8c62da835891d19af3870668c
diff --git a/media-video/mpv/mpv-0.40.0.ebuild b/media-video/mpv/mpv-0.40.0.ebuild
index fd89269f00c3..b17efcfce030 100644
--- a/media-video/mpv/mpv-0.40.0.ebuild
+++ b/media-video/mpv/mpv-0.40.0.ebuild
@@ -137,14 +137,6 @@ src_configure() {
 		fi
 	fi
 
-	mpv_feature_multi() {
-		local use set
-		for use in ${1} ${2}; do
-			use ${use} || set=disabled
-		done
-		echo -D${3-${2}}=${set-enabled}
-	}
-
 	local emesonargs=(
 		$(meson_use cli cplayer)
 		$(meson_use libmpv)
@@ -200,34 +192,14 @@ src_configure() {
 		-Dgl=$(use egl || use libmpv || use opengl &&
 			echo enabled || echo disabled)
 		$(meson_feature egl)
-		$(mpv_feature_multi egl X egl-x11)
-		$(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
-		$(mpv_feature_multi egl drm egl-drm)
-		$(mpv_feature_multi egl wayland egl-wayland)
 		$(meson_feature libmpv plain-gl)
-		$(mpv_feature_multi opengl X gl-x11)
-		$(mpv_feature_multi opengl aqua gl-cocoa)
 
 		$(meson_feature vulkan)
 
 		# hardware decoding
 		$(meson_feature nvenc cuda-hwaccel)
-		$(meson_feature nvenc cuda-interop)
-
 		$(meson_feature vaapi)
-		$(mpv_feature_multi vaapi X vaapi-x11)
-		$(mpv_feature_multi vaapi drm vaapi-drm)
-		$(mpv_feature_multi vaapi wayland vaapi-wayland)
-
 		$(meson_feature vdpau)
-		$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
-
-		$(mpv_feature_multi aqua opengl videotoolbox-gl)
-
-		# notable options left to automagic
-		#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
-		#vulkan-interop: USE="vulkan" + >=ffmpeg-6.1
-		# TODO?: perhaps few more similar compound options should be left auto
 	)
 
 	meson_src_configure
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index fd89269f00c3..aaf45c44fd62 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -112,6 +112,9 @@ DEPEND="
 	X? ( x11-base/xorg-proto )
 	dvb? ( sys-kernel/linux-headers )
 	nvenc? ( media-libs/nv-codec-headers )
+	vaapi? (
+		egl? ( x11-libs/libdrm )
+	)
 	vulkan? ( dev-util/vulkan-headers )
 	wayland? ( >=dev-libs/wayland-protocols-1.41 )
 "
@@ -137,14 +140,6 @@ src_configure() {
 		fi
 	fi
 
-	mpv_feature_multi() {
-		local use set
-		for use in ${1} ${2}; do
-			use ${use} || set=disabled
-		done
-		echo -D${3-${2}}=${set-enabled}
-	}
-
 	local emesonargs=(
 		$(meson_use cli cplayer)
 		$(meson_use libmpv)
@@ -200,34 +195,14 @@ src_configure() {
 		-Dgl=$(use egl || use libmpv || use opengl &&
 			echo enabled || echo disabled)
 		$(meson_feature egl)
-		$(mpv_feature_multi egl X egl-x11)
-		$(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
-		$(mpv_feature_multi egl drm egl-drm)
-		$(mpv_feature_multi egl wayland egl-wayland)
 		$(meson_feature libmpv plain-gl)
-		$(mpv_feature_multi opengl X gl-x11)
-		$(mpv_feature_multi opengl aqua gl-cocoa)
 
 		$(meson_feature vulkan)
 
 		# hardware decoding
 		$(meson_feature nvenc cuda-hwaccel)
-		$(meson_feature nvenc cuda-interop)
-
 		$(meson_feature vaapi)
-		$(mpv_feature_multi vaapi X vaapi-x11)
-		$(mpv_feature_multi vaapi drm vaapi-drm)
-		$(mpv_feature_multi vaapi wayland vaapi-wayland)
-
 		$(meson_feature vdpau)
-		$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
-
-		$(mpv_feature_multi aqua opengl videotoolbox-gl)
-
-		# notable options left to automagic
-		#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
-		#vulkan-interop: USE="vulkan" + >=ffmpeg-6.1
-		# TODO?: perhaps few more similar compound options should be left auto
 	)
 
 	meson_src_configure