From 13b2fd0162c62480408969b34cffb802999b3c73 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Tue, 31 Jan 2017 21:28:05 +0100 Subject: [PATCH] profiles: mask media-video/ffmpeg[nvenc] and unmask it on arches where nvidia-drivers are available. Bug #574786. --- profiles/arch/amd64-fbsd/package.use.mask | 4 ++++ profiles/arch/amd64/package.use.mask | 4 ++++ profiles/arch/x86-fbsd/package.use.mask | 4 ++++ profiles/arch/x86/package.use.mask | 4 ++++ profiles/base/package.use.mask | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask index 4b25e2abb852b..9a60b6b4c4dfc 100644 --- a/profiles/arch/amd64-fbsd/package.use.mask +++ b/profiles/arch/amd64-fbsd/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Alexis Ballier (31 Jan 2017) +# nvidia drivers are unmasked here +media-video/ffmpeg -nvenc + # Davide Pesavento (26 Oct 2015) # Tests require non-keyworded qt5 dev-qt/qtchooser test diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index d11825ca16f1e..bf985e62114c0 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -18,6 +18,10 @@ #--- END OF EXAMPLES --- +# Alexis Ballier (31 Jan 2017) +# nvidia drivers are unmasked here +media-video/ffmpeg -nvenc + # Ilya Tumaykin (19 Jan 2017) # Requires yet unavailable >=media-video/ffmpeg-3.3. >=media-video/mpv-0.23.0 cuda diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask index 8369e8b306a26..13d435648fef6 100644 --- a/profiles/arch/x86-fbsd/package.use.mask +++ b/profiles/arch/x86-fbsd/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Alexis Ballier (31 Jan 2017) +# nvidia drivers are unmasked here +media-video/ffmpeg -nvenc + # Michael Palimaka (21 Jun 2016) # Requires unkeyworded media-sound/jack-audio-connection-kit & media-video/movit media-libs/mlt jack opengl diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index e889408e21aa9..17260e9bb0a80 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -4,6 +4,10 @@ # This file requires >=portage-2.1.1 +# Alexis Ballier (31 Jan 2017) +# nvidia drivers are unmasked here +media-video/ffmpeg -nvenc + # Luca Barbato (22 Jan 2017) # cuda is not available on x86 nvidia-video-codec depends on it media-video/libav nvidia diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index b1597eeb9edc0..390c6f68e891f 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -5,6 +5,10 @@ # This file requires >=portage-2.1.1 # New entries go on top. +# Alexis Ballier (31 Jan 2017) +# nvenc requires nvidia drivers, apply same mask logic +media-video/ffmpeg nvenc + # Thomas Deutschmann (30 Jan 2017) # media-libs/raspberrypi-userland not keyworded media-video/motion mmal