media-video/ffmpeg: rework nvidia codec support

Closes: https://bugs.gentoo.org/653378
Closes: https://bugs.gentoo.org/648170
Package-Manager: Portage-2.3.31, Repoman-2.3.9

diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild
index 0475b16e0c5891144548c60c8fa5c3ef82c203bc..848b43d089f65c280750b3dcea2235ae8248b941 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-4.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.ebuild
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                # indevs
                libv4l:libv4l2 pulseaudio:libpulse libdrm
                # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac video_cards_nvidia:ffnvcodec
                jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
                mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
                speex:libspeex svg:librsvg vorbis:libvorbis
@@ -92,7 +92,7 @@ FFMPEG_FLAG_MAP=(
 # Same as above but for encoders, i.e. they do something only with USE=encode.
 FFMPEG_ENCODER_FLAG_MAP=(
        amrenc:libvo-amrwbenc mp3:libmp3lame
-       kvazaar:libkvazaar libaom nvenc:nvenc
+       kvazaar:libkvazaar libaom
        openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
        wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
@@ -174,7 +174,6 @@ RDEPEND="
                amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
                kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
                mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-               nvenc? ( media-video/nvidia_video_sdk )
                openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
                snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
                theora? (
@@ -235,6 +234,7 @@ RDEPEND="
        svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
        truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
        vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+       video_cards_nvidia? ( media-libs/nv-codec-headers[${MULTILIB_USEDEP}] )
        vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
        vorbis? (
                >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 398296eb187393b9fa985d0075f760e67cee4be9..53a1b9bfb06f700e36dd7883dea0acf14b3778de 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                # indevs
                libv4l:libv4l2 pulseaudio:libpulse libdrm
                # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac video_cards_nvidia:ffnvcodec
                jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
                mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
                speex:libspeex svg:librsvg vorbis:libvorbis
@@ -92,7 +92,7 @@ FFMPEG_FLAG_MAP=(
 # Same as above but for encoders, i.e. they do something only with USE=encode.
 FFMPEG_ENCODER_FLAG_MAP=(
        amrenc:libvo-amrwbenc mp3:libmp3lame
-       kvazaar:libkvazaar libaom nvenc:nvenc
+       kvazaar:libkvazaar libaom
        openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
        wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
@@ -174,7 +174,6 @@ RDEPEND="
                amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
                kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
                mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-               nvenc? ( media-video/nvidia_video_sdk )
                openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
                snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
                theora? (
@@ -235,6 +234,7 @@ RDEPEND="
        svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
        truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
        vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+       video_cards_nvidia? ( media-libs/nv-codec-headers[${MULTILIB_USEDEP}] )
        vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
        vorbis? (
                >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]