media-video/obs-studio: Support ffmpeg 4

The USE="nvenc" in '>=media-video/ffmpeg-4' has been replaced with
'video_cards_nvidia'.

Closes: https://bugs.gentoo.org/671084
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews@gentoo.org>

diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild
index ca9114ce291bdf727654551d5e8b1f961755959f..aa981e49491a039b4212c59e47c665b4a8fdd362 100644 (file)
--- a/media-video/obs-studio/obs-studio-21.1.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild
@@ -46,7 +46,12 @@ COMMON_DEPEND="
        imagemagick? ( media-gfx/imagemagick:= )
        jack? ( virtual/jack )
        luajit? ( dev-lang/luajit:2 )
-       nvenc? ( media-video/ffmpeg:=[nvenc] )
+       nvenc? (
+               || (
+                       <media-video/ffmpeg-4[nvenc]
+                       >=media-video/ffmpeg-4[video_cards_nvidia]
+               )
+       )
        pulseaudio? ( media-sound/pulseaudio )
        python? ( ${PYTHON_DEPS} )
        speex? ( media-libs/speexdsp )

diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild
index 7bd98fa4213b5abeb41be2aa23551162a838a479..a2403c9502a570dbc62249d551240ee83c7b86e2 100644 (file)
--- a/media-video/obs-studio/obs-studio-22.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild
@@ -46,7 +46,12 @@ COMMON_DEPEND="
        imagemagick? ( media-gfx/imagemagick:= )
        jack? ( virtual/jack )
        luajit? ( dev-lang/luajit:2 )
-       nvenc? ( media-video/ffmpeg:=[nvenc] )
+       nvenc? (
+               || (
+                       <media-video/ffmpeg-4[nvenc]
+                       >=media-video/ffmpeg-4[video_cards_nvidia]
+               )
+       )
        pulseaudio? ( media-sound/pulseaudio )
        python? ( ${PYTHON_DEPS} )
        speex? ( media-libs/speexdsp )

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index a596540a779f57a68105f20f1b6bdebe80b94b60..991fa7ae9912f2599b9089e5e0b03b51395e94cf 100644 (file)
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -46,7 +46,12 @@ COMMON_DEPEND="
        imagemagick? ( media-gfx/imagemagick:= )
        jack? ( virtual/jack )
        luajit? ( dev-lang/luajit:2 )
-       nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
+       nvenc? (
+               || (
+                       <media-video/ffmpeg-4[nvenc]
+                       >=media-video/ffmpeg-4[video_cards_nvidia]
+               )
+       )
        pulseaudio? ( media-sound/pulseaudio )
        python? ( ${PYTHON_DEPS} )
        speex? ( media-libs/speexdsp )