summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-01-31 21:28:05 +0100
committerAlexis Ballier <aballier@gentoo.org>2017-01-31 21:28:19 +0100
commit13b2fd0162c62480408969b34cffb802999b3c73 (patch)
treee8a45bb533a650ccb681e982ef7ec65549a31141
parentdev-db/etcd: remove old versions (diff)
downloadgentoo-13b2fd0162c62480408969b34cffb802999b3c73.tar.gz
gentoo-13b2fd0162c62480408969b34cffb802999b3c73.tar.bz2
gentoo-13b2fd0162c62480408969b34cffb802999b3c73.zip
profiles: mask media-video/ffmpeg[nvenc] and unmask it on arches where nvidia-drivers are available. Bug #574786.
-rw-r--r--profiles/arch/amd64-fbsd/package.use.mask4
-rw-r--r--profiles/arch/amd64/package.use.mask4
-rw-r--r--profiles/arch/x86-fbsd/package.use.mask4
-rw-r--r--profiles/arch/x86/package.use.mask4
-rw-r--r--profiles/base/package.use.mask4
5 files changed, 20 insertions, 0 deletions
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 4b25e2abb852..9a60b6b4c4df 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 <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 d11825ca16f1..bf985e62114c 100644
--- 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 8369e8b306a2..13d435648fef 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 <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 e889408e21aa..17260e9bb0a8 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 <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 b1597eeb9edc..390c6f68e891 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 <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