gentoo resync : 20.03.2022

5 files changed, 29 insertions, 30 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 869520511481..e69ef3c218b2 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,7 +2,7 @@ DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d099
 DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218 SHA512 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
-EBUILD mpv-0.33.1-r2.ebuild 9711 BLAKE2B 17210d955f7094943a593240070e6243133f7df704c2f15c07f29d0ffcf7d26ce8c1e6c8932340eaa24119149fd46392714bb9cdeee6aa1dd301702fb0f54c63 SHA512 1e8ce64678b3e133aea2ba356d398fe037a9164dc6c46c8b416982e4a57388ca0c4e80006aedfc20d9ecfd5e5445bfc8951135f436eef07cb9234c54d60bffa0
-EBUILD mpv-0.34.0.ebuild 9714 BLAKE2B 79b9faee5bcb728af688b0994a8d0f930f45eb1c37c435ab3e28885182ae1bdf4c37ea5eee152221f01ba980d2ebbbe39b510eb01c43e5ca57c5ea19f02142e9 SHA512 86b8aa38ebc3a935448729c3c0c3ad50fab477334d9d2a429e17e660b56b231b2556d36beb86f31873fe8f81d95a39f611b4c97515b3bb8504640a6395a4d895
-EBUILD mpv-9999.ebuild 9714 BLAKE2B 79b9faee5bcb728af688b0994a8d0f930f45eb1c37c435ab3e28885182ae1bdf4c37ea5eee152221f01ba980d2ebbbe39b510eb01c43e5ca57c5ea19f02142e9 SHA512 86b8aa38ebc3a935448729c3c0c3ad50fab477334d9d2a429e17e660b56b231b2556d36beb86f31873fe8f81d95a39f611b4c97515b3bb8504640a6395a4d895
-MISC metadata.xml 2211 BLAKE2B fe97872a6f1307d4522e803e62bb8d6da1da94b7fcebe5e114a49f51736f1a3ea7471ddd7570712f7dfce59ad761b395dcdf3cfa48f23eb4f57e99390963daf9 SHA512 941350cda9ad14cbd6c5f34f41b7f99bd80365d4ee6f5d4115547c96dea1c30d22e509473fe492efe24acc72612a2b55e864948a5ad0c952063a1a115d579935
+EBUILD mpv-0.33.1-r2.ebuild 9717 BLAKE2B 32c6c20c5b8baf39270a040f72afc61df457617749f84b1b82ff6d65a5be1f020461f4135fc2c455d7f81061665dd82e9ed68354963bce458ece6bf212829e76 SHA512 a2cb0f953d63cf6d3430c11e464de8babb965ac5335375791f408ca08c14d842ad60b52645e508812492c4fcb2d8484d9f6930a5a962e7909fd03f2bc35fba47
+EBUILD mpv-0.34.0.ebuild 9720 BLAKE2B df9e6c42c29738fb8d4ede3b40f968fb97604b0e9834dcee6d60030c09ccceff39b2b5c35b838ff7084a2e4961cb067d8d59f0ce583c7d073fe95c42eb94994c SHA512 ef5231c4ee9bb7ac75cbae2f27acf61c180ffdc4fe5bbfd55ca7279e072d5a018064b8690480974d80bb4a513d71abab28ca2d83d00b994a5ae5d4b164414f7f
+EBUILD mpv-9999.ebuild 9720 BLAKE2B de46a17b87a5639a9e9e59eefda60add4e8b0889c6f428c9e012d6e241689a7564ca1e9eea61124516635aedd4f1603697ab06c721c2d15190c1f7931867a0fa SHA512 717a16db932376c9dbbdb913283e3af60c92fff63c244f991b07e24f1988412bb2f0b6057bdc898c5a403dd1208e74bcac2d571fe7af38d64116c559b9cfc778
+MISC metadata.xml 2137 BLAKE2B fe78cb8478cac266c72c939fd87043c0a685c12c840e0966d34d58b1c9dd39767197d93762d8150454a5e2f58ecf0c68cde1289bb392cd92b0d199a81d5f4ff6 SHA512 bd37f4f676eaf2507484d28b0b29f861e575a6232bc67413cae1c09fd16481d5a62b2646ee2e9e5b5a0c5bd8a0dfa63d1b4ef80e3f70c1ef8ff040d103fd6beb
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 976440320d4f..8f8efa409921 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 		<flag name="cli">Build mpv CLI player</flag>
 		<flag name="cplugins">Enable C plugins support</flag>
-		<flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag>
 		<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
 		<flag name="egl">Enable support for various EGL-based video outputs / backends</flag>
 		<flag name="gamepad">Enable gamepad input support</flag>
diff --git a/media-video/mpv/mpv-0.33.1-r2.ebuild b/media-video/mpv/mpv-0.33.1-r2.ebuild
index 6dc6afe6bc87..69fc1d6faa71 100644
--- a/media-video/mpv/mpv-0.33.1-r2.ebuild
+++ b/media-video/mpv/mpv-0.33.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,20 +29,20 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
 LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
 SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
 	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
-	openal +opengl pulseaudio raspberry-pi rubberband sdl
+	nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
 	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
-	cuda? ( opengl )
 	egl? ( || ( gbm X wayland ) )
 	gamepad? ( sdl )
 	gbm? ( drm egl opengl )
 	lcms? ( opengl )
 	lua? ( ${LUA_REQUIRED_USE} )
+	nvenc? ( opengl )
 	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
 	raspberry-pi? ( opengl )
 	test? ( opengl )
@@ -118,11 +118,11 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
-	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 	dvb? ( virtual/linuxtv-dvb-headers )
+	nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 "
 RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
+	nvenc? ( x11-drivers/nvidia-drivers[X] )
 	selinux? ( sec-policy/selinux-mplayer )
 	tools? ( ${PYTHON_DEPS} )
 "
@@ -224,8 +224,8 @@ src_configure() {
 
 		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable cuda cuda-hwaccel)
-		$(use_enable cuda cuda-interop)
+		$(use_enable nvenc cuda-hwaccel)
+		$(use_enable nvenc cuda-interop)
 
 		# TV features:
 		$(use_enable dvb dvbin)
diff --git a/media-video/mpv/mpv-0.34.0.ebuild b/media-video/mpv/mpv-0.34.0.ebuild
index dd43d1178adb..e0f0ee5c96cf 100644
--- a/media-video/mpv/mpv-0.34.0.ebuild
+++ b/media-video/mpv/mpv-0.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,20 +29,20 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
 LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
 SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
 	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
-	openal +opengl pulseaudio raspberry-pi rubberband sdl
+	nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
 	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
-	cuda? ( opengl )
 	egl? ( || ( gbm X wayland ) )
 	gamepad? ( sdl )
 	gbm? ( drm egl opengl )
 	lcms? ( opengl )
 	lua? ( ${LUA_REQUIRED_USE} )
+	nvenc? ( opengl )
 	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
 	raspberry-pi? ( opengl )
 	test? ( opengl )
@@ -118,11 +118,11 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
-	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 	dvb? ( virtual/linuxtv-dvb-headers )
+	nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 "
 RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
+	nvenc? ( x11-drivers/nvidia-drivers[X] )
 	selinux? ( sec-policy/selinux-mplayer )
 	tools? ( ${PYTHON_DEPS} )
 "
@@ -224,8 +224,8 @@ src_configure() {
 
 		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable cuda cuda-hwaccel)
-		$(use_enable cuda cuda-interop)
+		$(use_enable nvenc cuda-hwaccel)
+		$(use_enable nvenc cuda-interop)
 
 		# TV features:
 		$(use_enable dvb dvbin)
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index dd43d1178adb..856b88db74d8 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,20 +29,20 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
 LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
 SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
 	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
-	openal +opengl pulseaudio raspberry-pi rubberband sdl
+	nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
 	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
-	cuda? ( opengl )
 	egl? ( || ( gbm X wayland ) )
 	gamepad? ( sdl )
 	gbm? ( drm egl opengl )
 	lcms? ( opengl )
 	lua? ( ${LUA_REQUIRED_USE} )
+	nvenc? ( opengl )
 	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
 	raspberry-pi? ( opengl )
 	test? ( opengl )
@@ -93,7 +93,7 @@ COMMON_DEPEND="
 	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
-		>=media-libs/libplacebo-3.104.0:=[vulkan]
+		>=media-libs/libplacebo-4.192.1:=[vulkan]
 		media-libs/shaderc
 	)
 	wayland? (
@@ -118,11 +118,11 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
-	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 	dvb? ( virtual/linuxtv-dvb-headers )
+	nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 "
 RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
+	nvenc? ( x11-drivers/nvidia-drivers[X] )
 	selinux? ( sec-policy/selinux-mplayer )
 	tools? ( ${PYTHON_DEPS} )
 "
@@ -224,8 +224,8 @@ src_configure() {
 
 		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable cuda cuda-hwaccel)
-		$(use_enable cuda cuda-interop)
+		$(use_enable nvenc cuda-hwaccel)
+		$(use_enable nvenc cuda-interop)
 
 		# TV features:
 		$(use_enable dvb dvbin)