profiles: mask media-video/ffmpeg[nvenc] and unmask it on arches where nvidia-drivers...

diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 4b25e2abb852ba31132f0849b0544e71f4f2e374..9a60b6b4c4dfc8d8fa8d2fbc5c778ada2e32a833 100644 (file)
--- 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 <aballier@gentoo.org> (31 Jan 2017)
+# nvidia drivers are unmasked here
+media-video/ffmpeg -nvenc
+
 # Davide Pesavento <pesa@gentoo.org> (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 d11825ca16f1e2a51dc412bd8ee5f1be3cf5db32..bf985e62114c03310c908c1c9c6baee5e3c15d09 100644 (file)
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexis Ballier <aballier@gentoo.org> (31 Jan 2017)
+# nvidia drivers are unmasked here
+media-video/ffmpeg -nvenc
+
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (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 8369e8b306a2647605efce9907a4c54b8cc22526..13d435648fef69704f61cacf429463d860848cfc 100644 (file)
--- 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 <aballier@gentoo.org> (31 Jan 2017)
+# nvidia drivers are unmasked here
+media-video/ffmpeg -nvenc
+
 # Michael Palimaka <kensington@gentoo.org> (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 e889408e21aa964605449df2f3db53e129e8fee1..17260e9bb0a8012786cddc24e24c8fd7e66e6d1a 100644 (file)
--- 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 <aballier@gentoo.org> (31 Jan 2017)
+# nvidia drivers are unmasked here
+media-video/ffmpeg -nvenc
+
 # Luca Barbato <lu_zero@gentoo.org> (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 b1597eeb9edc07375a00ef446fb022d4d2b7b58a..390c6f68e891f9f615b49388935cec0ac399970c 100644 (file)
--- 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 <aballier@gentoo.org> (31 Jan 2017)
+# nvenc requires nvidia drivers, apply same mask logic
+media-video/ffmpeg nvenc
+
 # Thomas Deutschmann <whissi@gentoo.org> (30 Jan 2017)
 # media-libs/raspberrypi-userland not keyworded
 media-video/motion mmal