Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/arch/x86-fbsd/, profiles/arch/x86/, ...
Date: Tue, 31 Jan 2017 20:28:33
Message-Id: 1485894499.13b2fd0162c62480408969b34cffb802999b3c73.aballier@gentoo
1 commit: 13b2fd0162c62480408969b34cffb802999b3c73
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 20:28:05 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 20:28:19 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b2fd01
7
8 profiles: mask media-video/ffmpeg[nvenc] and unmask it on arches where nvidia-drivers are available. Bug #574786.
9
10 profiles/arch/amd64-fbsd/package.use.mask | 4 ++++
11 profiles/arch/amd64/package.use.mask | 4 ++++
12 profiles/arch/x86-fbsd/package.use.mask | 4 ++++
13 profiles/arch/x86/package.use.mask | 4 ++++
14 profiles/base/package.use.mask | 4 ++++
15 5 files changed, 20 insertions(+)
16
17 diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
18 index 4b25e2a..9a60b6b 100644
19 --- a/profiles/arch/amd64-fbsd/package.use.mask
20 +++ b/profiles/arch/amd64-fbsd/package.use.mask
21 @@ -2,6 +2,10 @@
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 +# Alexis Ballier <aballier@g.o> (31 Jan 2017)
26 +# nvidia drivers are unmasked here
27 +media-video/ffmpeg -nvenc
28 +
29 # Davide Pesavento <pesa@g.o> (26 Oct 2015)
30 # Tests require non-keyworded qt5
31 dev-qt/qtchooser test
32
33 diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
34 index d11825c..bf985e6 100644
35 --- a/profiles/arch/amd64/package.use.mask
36 +++ b/profiles/arch/amd64/package.use.mask
37 @@ -18,6 +18,10 @@
38
39 #--- END OF EXAMPLES ---
40
41 +# Alexis Ballier <aballier@g.o> (31 Jan 2017)
42 +# nvidia drivers are unmasked here
43 +media-video/ffmpeg -nvenc
44 +
45 # Ilya Tumaykin <itumaykin+gentoo@×××××.com> (19 Jan 2017)
46 # Requires yet unavailable >=media-video/ffmpeg-3.3.
47 >=media-video/mpv-0.23.0 cuda
48
49 diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
50 index 8369e8b..13d4356 100644
51 --- a/profiles/arch/x86-fbsd/package.use.mask
52 +++ b/profiles/arch/x86-fbsd/package.use.mask
53 @@ -2,6 +2,10 @@
54 # Distributed under the terms of the GNU General Public License v2
55 # $Id$
56
57 +# Alexis Ballier <aballier@g.o> (31 Jan 2017)
58 +# nvidia drivers are unmasked here
59 +media-video/ffmpeg -nvenc
60 +
61 # Michael Palimaka <kensington@g.o> (21 Jun 2016)
62 # Requires unkeyworded media-sound/jack-audio-connection-kit & media-video/movit
63 media-libs/mlt jack opengl
64
65 diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
66 index e889408..17260e9 100644
67 --- a/profiles/arch/x86/package.use.mask
68 +++ b/profiles/arch/x86/package.use.mask
69 @@ -4,6 +4,10 @@
70
71 # This file requires >=portage-2.1.1
72
73 +# Alexis Ballier <aballier@g.o> (31 Jan 2017)
74 +# nvidia drivers are unmasked here
75 +media-video/ffmpeg -nvenc
76 +
77 # Luca Barbato <lu_zero@g.o> (22 Jan 2017)
78 # cuda is not available on x86 nvidia-video-codec depends on it
79 media-video/libav nvidia
80
81 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
82 index b1597ee..390c6f6 100644
83 --- a/profiles/base/package.use.mask
84 +++ b/profiles/base/package.use.mask
85 @@ -5,6 +5,10 @@
86 # This file requires >=portage-2.1.1
87 # New entries go on top.
88
89 +# Alexis Ballier <aballier@g.o> (31 Jan 2017)
90 +# nvenc requires nvidia drivers, apply same mask logic
91 +media-video/ffmpeg nvenc
92 +
93 # Thomas Deutschmann <whissi@g.o> (30 Jan 2017)
94 # media-libs/raspberrypi-userland not keyworded
95 media-video/motion mmal