From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 759AB138331 for ; Sun, 22 Apr 2018 11:21:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91338E08EC; Sun, 22 Apr 2018 11:21:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 571FEE08F0 for ; Sun, 22 Apr 2018 11:21:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1765335C74 for ; Sun, 22 Apr 2018 11:21:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0FF0287 for ; Sun, 22 Apr 2018 11:21:43 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1524396090.72efc6ce0847d20ebaa7e2f4ceb042d36e97e244.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/ffmpeg-4.0.ebuild media-video/ffmpeg/ffmpeg-9999.ebuild X-VCS-Directories: media-video/ffmpeg/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 72efc6ce0847d20ebaa7e2f4ceb042d36e97e244 X-VCS-Branch: master Date: Sun, 22 Apr 2018 11:21:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b01a8a99-91ca-4777-8766-8dbdf67bc372 X-Archives-Hash: 999addc472b6427bf5199b5e45d9a441 commit: 72efc6ce0847d20ebaa7e2f4ceb042d36e97e244 Author: Alexis Ballier gentoo org> AuthorDate: Sun Apr 22 10:52:34 2018 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Sun Apr 22 11:21:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72efc6ce 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 media-video/ffmpeg/ffmpeg-4.0.ebuild | 6 +++--- media-video/ffmpeg/ffmpeg-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild index 0475b16e0c5..848b43d089f 100644 --- 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 398296eb187..53a1b9bfb06 100644 --- 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}]