1 |
commit: b3b2301c855dfc534f1f93c644c3888b2b1e96b9 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 4 17:07:44 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 4 19:54:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b2301c |
7 |
|
8 |
profiles: Revert x264 mask logic. It should work everywhere. |
9 |
|
10 |
profiles/arch/alpha/use.mask | 3 --- |
11 |
profiles/arch/amd64/use.mask | 4 ---- |
12 |
profiles/arch/arm/use.stable.mask | 4 ++++ |
13 |
profiles/arch/hppa/use.mask | 4 ---- |
14 |
profiles/arch/ia64/package.use.mask | 4 ++++ |
15 |
profiles/arch/powerpc/use.mask | 4 ---- |
16 |
profiles/arch/sparc/use.mask | 3 --- |
17 |
profiles/arch/x86/use.mask | 3 --- |
18 |
profiles/default/linux/use.mask | 3 --- |
19 |
profiles/prefix/darwin/macos/10.10/x64/use.mask | 3 --- |
20 |
profiles/prefix/darwin/macos/10.10/x86/use.mask | 3 --- |
21 |
profiles/prefix/darwin/macos/10.11/x64/use.mask | 3 --- |
22 |
profiles/prefix/darwin/macos/10.11/x86/use.mask | 3 --- |
23 |
profiles/prefix/darwin/macos/10.12/x64/use.mask | 3 --- |
24 |
profiles/prefix/darwin/macos/10.12/x86/use.mask | 3 --- |
25 |
profiles/prefix/darwin/macos/10.4/x86/use.mask | 3 --- |
26 |
profiles/prefix/darwin/macos/10.5/x64/use.mask | 3 --- |
27 |
profiles/prefix/darwin/macos/10.5/x86/use.mask | 3 --- |
28 |
profiles/prefix/darwin/macos/10.6/x64/use.mask | 3 --- |
29 |
profiles/prefix/darwin/macos/10.6/x86/use.mask | 3 --- |
30 |
profiles/prefix/darwin/macos/10.7/x64/use.mask | 3 --- |
31 |
profiles/prefix/darwin/macos/10.7/x86/use.mask | 3 --- |
32 |
profiles/prefix/darwin/macos/10.8/x64/use.mask | 3 --- |
33 |
profiles/prefix/darwin/macos/10.8/x86/use.mask | 3 --- |
34 |
profiles/prefix/darwin/macos/10.9/x64/use.mask | 3 --- |
35 |
profiles/prefix/darwin/macos/10.9/x86/use.mask | 3 --- |
36 |
26 files changed, 8 insertions(+), 75 deletions(-) |
37 |
|
38 |
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask |
39 |
index 70fcce23c1b..d488fe8a09f 100644 |
40 |
--- a/profiles/arch/alpha/use.mask |
41 |
+++ b/profiles/arch/alpha/use.mask |
42 |
@@ -163,9 +163,6 @@ mpd |
43 |
# USE=d seems to break gcc-4.1.2 (#178896) |
44 |
d |
45 |
|
46 |
-# This works |
47 |
--x264 |
48 |
- |
49 |
# uses gnat/ada which is too big to support currently |
50 |
topal |
51 |
|
52 |
|
53 |
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask |
54 |
index 84ad8dcf2f7..777df9d521f 100644 |
55 |
--- a/profiles/arch/amd64/use.mask |
56 |
+++ b/profiles/arch/amd64/use.mask |
57 |
@@ -105,10 +105,6 @@ |
58 |
# nVidia XvMC support works on amd64 |
59 |
-nvidia |
60 |
|
61 |
-# 2006/03/03 - Luca Barbato <lu_zero@g.o> |
62 |
-# codec support x264 |
63 |
--x264 |
64 |
- |
65 |
# 2006/01/28 - Donnie Berkholz <dberkholz@g.o> |
66 |
# Modular X: unmask for architectures on which they are available |
67 |
-input_devices_synaptics |
68 |
|
69 |
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask |
70 |
index fd610057d04..8a3dd70b8a4 100644 |
71 |
--- a/profiles/arch/arm/use.stable.mask |
72 |
+++ b/profiles/arch/arm/use.stable.mask |
73 |
@@ -4,6 +4,10 @@ |
74 |
# This file requires eapi 5 or later. New entries go on top. |
75 |
# Please use the same syntax as in use.mask |
76 |
|
77 |
+# Alexis Ballier <aballier@g.o> (4 Mar 2017) |
78 |
+# media-libs/x264 not stable yet. Remove when it is. |
79 |
+x264 |
80 |
+ |
81 |
# Andrey Grozin <grozin@g.o> (16 May 2014) |
82 |
# No stable gcl |
83 |
gcl |
84 |
|
85 |
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask |
86 |
index 71bd6ba58ca..b22b9f090f5 100644 |
87 |
--- a/profiles/arch/hppa/use.mask |
88 |
+++ b/profiles/arch/hppa/use.mask |
89 |
@@ -59,10 +59,6 @@ llvm |
90 |
# No known OpenCL providers (bug #482096) |
91 |
opencl |
92 |
|
93 |
-# Jeroen Roovers <jer@g.o> (19 Jun 2013) |
94 |
-# media-libs/x264 works |
95 |
--x264 |
96 |
- |
97 |
# Samuli Suominen <ssuominen@g.o> (12 Mar 2013) |
98 |
# NVIDIA Cg toolkit for binary drivers |
99 |
cg |
100 |
|
101 |
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask |
102 |
index 192cb04bdec..582a3c86d69 100644 |
103 |
--- a/profiles/arch/ia64/package.use.mask |
104 |
+++ b/profiles/arch/ia64/package.use.mask |
105 |
@@ -1,6 +1,10 @@ |
106 |
# Copyright 1999-2017 Gentoo Foundation |
107 |
# Distributed under the terms of the GNU General Public License v2 |
108 |
|
109 |
+# Alexis Ballier <aballier@g.o> (4 Mar 2017) |
110 |
+# gst-plugins-x264 is not stable on ia64 |
111 |
+media-plugins/gst-plugins-meta x264 |
112 |
+ |
113 |
# Pacho Ramos <pacho@g.o> (15 Jan 2017) |
114 |
# Missing keywords, bug #559770 |
115 |
>=net-misc/networkmanager-1.4.4 consolekit |
116 |
|
117 |
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask |
118 |
index 045bd3ab054..d2f3cf58121 100644 |
119 |
--- a/profiles/arch/powerpc/use.mask |
120 |
+++ b/profiles/arch/powerpc/use.mask |
121 |
@@ -13,10 +13,6 @@ gnuefi |
122 |
# dependencies not keyworded yet |
123 |
ayatana |
124 |
|
125 |
-# Anthony G. Basile <blueness@g.o> (10 Jul 2014) |
126 |
-# codec support x264, bug #516856 |
127 |
--x264 |
128 |
- |
129 |
#Klibc does not work |
130 |
klibc |
131 |
|
132 |
|
133 |
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask |
134 |
index 70656ed632c..4a58b4c66d3 100644 |
135 |
--- a/profiles/arch/sparc/use.mask |
136 |
+++ b/profiles/arch/sparc/use.mask |
137 |
@@ -238,9 +238,6 @@ alsa_cards_sbawe |
138 |
alsa_cards_sscape |
139 |
alsa_cards_wavefront |
140 |
|
141 |
-# Enable H264 with x264 |
142 |
--x264 |
143 |
- |
144 |
# Copied over from default-linux/sparc/sparc64 |
145 |
-vis |
146 |
|
147 |
|
148 |
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask |
149 |
index c9921c33a36..8acf7bfa179 100644 |
150 |
--- a/profiles/arch/x86/use.mask |
151 |
+++ b/profiles/arch/x86/use.mask |
152 |
@@ -142,9 +142,6 @@ |
153 |
# Modular X: mask for architectures on which they aren't available |
154 |
video_cards_newport |
155 |
|
156 |
-#codec support |
157 |
--x264 |
158 |
- |
159 |
# Diego Pettenò <flameeyes@g.o> (4 Jan 2007) |
160 |
# Unmask the flags for PHP that are available only on x86 |
161 |
# |
162 |
|
163 |
diff --git a/profiles/default/linux/use.mask b/profiles/default/linux/use.mask |
164 |
index 08ef82bff86..a801fcedca7 100644 |
165 |
--- a/profiles/default/linux/use.mask |
166 |
+++ b/profiles/default/linux/use.mask |
167 |
@@ -6,9 +6,6 @@ |
168 |
# profile (such as the selinux profiles) have a USE flag associated with |
169 |
# them. |
170 |
|
171 |
-# ppc and x86/amd64 |
172 |
-x264 |
173 |
- |
174 |
# Diego Elio Pettenò <flameeyes@g.o> (27 Aug 2012) |
175 |
# netlink is a Linux-specific interface |
176 |
-netlink |
177 |
|
178 |
diff --git a/profiles/prefix/darwin/macos/10.10/x64/use.mask b/profiles/prefix/darwin/macos/10.10/x64/use.mask |
179 |
index 67292fbd1c2..dcc0e997a9a 100644 |
180 |
--- a/profiles/prefix/darwin/macos/10.10/x64/use.mask |
181 |
+++ b/profiles/prefix/darwin/macos/10.10/x64/use.mask |
182 |
@@ -30,8 +30,5 @@ |
183 |
# Modular X: mask for architectures on which they aren't available |
184 |
video_cards_newport |
185 |
|
186 |
-#codec support |
187 |
--x264 |
188 |
- |
189 |
# ibm is only used for ppc64 stuff |
190 |
ibm |
191 |
|
192 |
diff --git a/profiles/prefix/darwin/macos/10.10/x86/use.mask b/profiles/prefix/darwin/macos/10.10/x86/use.mask |
193 |
index 67292fbd1c2..dcc0e997a9a 100644 |
194 |
--- a/profiles/prefix/darwin/macos/10.10/x86/use.mask |
195 |
+++ b/profiles/prefix/darwin/macos/10.10/x86/use.mask |
196 |
@@ -30,8 +30,5 @@ |
197 |
# Modular X: mask for architectures on which they aren't available |
198 |
video_cards_newport |
199 |
|
200 |
-#codec support |
201 |
--x264 |
202 |
- |
203 |
# ibm is only used for ppc64 stuff |
204 |
ibm |
205 |
|
206 |
diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask |
207 |
index 67292fbd1c2..dcc0e997a9a 100644 |
208 |
--- a/profiles/prefix/darwin/macos/10.11/x64/use.mask |
209 |
+++ b/profiles/prefix/darwin/macos/10.11/x64/use.mask |
210 |
@@ -30,8 +30,5 @@ |
211 |
# Modular X: mask for architectures on which they aren't available |
212 |
video_cards_newport |
213 |
|
214 |
-#codec support |
215 |
--x264 |
216 |
- |
217 |
# ibm is only used for ppc64 stuff |
218 |
ibm |
219 |
|
220 |
diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask |
221 |
index 67292fbd1c2..dcc0e997a9a 100644 |
222 |
--- a/profiles/prefix/darwin/macos/10.11/x86/use.mask |
223 |
+++ b/profiles/prefix/darwin/macos/10.11/x86/use.mask |
224 |
@@ -30,8 +30,5 @@ |
225 |
# Modular X: mask for architectures on which they aren't available |
226 |
video_cards_newport |
227 |
|
228 |
-#codec support |
229 |
--x264 |
230 |
- |
231 |
# ibm is only used for ppc64 stuff |
232 |
ibm |
233 |
|
234 |
diff --git a/profiles/prefix/darwin/macos/10.12/x64/use.mask b/profiles/prefix/darwin/macos/10.12/x64/use.mask |
235 |
index 67292fbd1c2..dcc0e997a9a 100644 |
236 |
--- a/profiles/prefix/darwin/macos/10.12/x64/use.mask |
237 |
+++ b/profiles/prefix/darwin/macos/10.12/x64/use.mask |
238 |
@@ -30,8 +30,5 @@ |
239 |
# Modular X: mask for architectures on which they aren't available |
240 |
video_cards_newport |
241 |
|
242 |
-#codec support |
243 |
--x264 |
244 |
- |
245 |
# ibm is only used for ppc64 stuff |
246 |
ibm |
247 |
|
248 |
diff --git a/profiles/prefix/darwin/macos/10.12/x86/use.mask b/profiles/prefix/darwin/macos/10.12/x86/use.mask |
249 |
index 67292fbd1c2..dcc0e997a9a 100644 |
250 |
--- a/profiles/prefix/darwin/macos/10.12/x86/use.mask |
251 |
+++ b/profiles/prefix/darwin/macos/10.12/x86/use.mask |
252 |
@@ -30,8 +30,5 @@ |
253 |
# Modular X: mask for architectures on which they aren't available |
254 |
video_cards_newport |
255 |
|
256 |
-#codec support |
257 |
--x264 |
258 |
- |
259 |
# ibm is only used for ppc64 stuff |
260 |
ibm |
261 |
|
262 |
diff --git a/profiles/prefix/darwin/macos/10.4/x86/use.mask b/profiles/prefix/darwin/macos/10.4/x86/use.mask |
263 |
index 67292fbd1c2..dcc0e997a9a 100644 |
264 |
--- a/profiles/prefix/darwin/macos/10.4/x86/use.mask |
265 |
+++ b/profiles/prefix/darwin/macos/10.4/x86/use.mask |
266 |
@@ -30,8 +30,5 @@ |
267 |
# Modular X: mask for architectures on which they aren't available |
268 |
video_cards_newport |
269 |
|
270 |
-#codec support |
271 |
--x264 |
272 |
- |
273 |
# ibm is only used for ppc64 stuff |
274 |
ibm |
275 |
|
276 |
diff --git a/profiles/prefix/darwin/macos/10.5/x64/use.mask b/profiles/prefix/darwin/macos/10.5/x64/use.mask |
277 |
index 67292fbd1c2..dcc0e997a9a 100644 |
278 |
--- a/profiles/prefix/darwin/macos/10.5/x64/use.mask |
279 |
+++ b/profiles/prefix/darwin/macos/10.5/x64/use.mask |
280 |
@@ -30,8 +30,5 @@ |
281 |
# Modular X: mask for architectures on which they aren't available |
282 |
video_cards_newport |
283 |
|
284 |
-#codec support |
285 |
--x264 |
286 |
- |
287 |
# ibm is only used for ppc64 stuff |
288 |
ibm |
289 |
|
290 |
diff --git a/profiles/prefix/darwin/macos/10.5/x86/use.mask b/profiles/prefix/darwin/macos/10.5/x86/use.mask |
291 |
index 67292fbd1c2..dcc0e997a9a 100644 |
292 |
--- a/profiles/prefix/darwin/macos/10.5/x86/use.mask |
293 |
+++ b/profiles/prefix/darwin/macos/10.5/x86/use.mask |
294 |
@@ -30,8 +30,5 @@ |
295 |
# Modular X: mask for architectures on which they aren't available |
296 |
video_cards_newport |
297 |
|
298 |
-#codec support |
299 |
--x264 |
300 |
- |
301 |
# ibm is only used for ppc64 stuff |
302 |
ibm |
303 |
|
304 |
diff --git a/profiles/prefix/darwin/macos/10.6/x64/use.mask b/profiles/prefix/darwin/macos/10.6/x64/use.mask |
305 |
index 53d2772e64f..d25cb678586 100644 |
306 |
--- a/profiles/prefix/darwin/macos/10.6/x64/use.mask |
307 |
+++ b/profiles/prefix/darwin/macos/10.6/x64/use.mask |
308 |
@@ -32,8 +32,5 @@ |
309 |
# Modular X: mask for architectures on which they aren't available |
310 |
video_cards_newport |
311 |
|
312 |
-#codec support |
313 |
--x264 |
314 |
- |
315 |
# ibm is only used for ppc64 stuff |
316 |
ibm |
317 |
|
318 |
diff --git a/profiles/prefix/darwin/macos/10.6/x86/use.mask b/profiles/prefix/darwin/macos/10.6/x86/use.mask |
319 |
index 67292fbd1c2..dcc0e997a9a 100644 |
320 |
--- a/profiles/prefix/darwin/macos/10.6/x86/use.mask |
321 |
+++ b/profiles/prefix/darwin/macos/10.6/x86/use.mask |
322 |
@@ -30,8 +30,5 @@ |
323 |
# Modular X: mask for architectures on which they aren't available |
324 |
video_cards_newport |
325 |
|
326 |
-#codec support |
327 |
--x264 |
328 |
- |
329 |
# ibm is only used for ppc64 stuff |
330 |
ibm |
331 |
|
332 |
diff --git a/profiles/prefix/darwin/macos/10.7/x64/use.mask b/profiles/prefix/darwin/macos/10.7/x64/use.mask |
333 |
index 67292fbd1c2..dcc0e997a9a 100644 |
334 |
--- a/profiles/prefix/darwin/macos/10.7/x64/use.mask |
335 |
+++ b/profiles/prefix/darwin/macos/10.7/x64/use.mask |
336 |
@@ -30,8 +30,5 @@ |
337 |
# Modular X: mask for architectures on which they aren't available |
338 |
video_cards_newport |
339 |
|
340 |
-#codec support |
341 |
--x264 |
342 |
- |
343 |
# ibm is only used for ppc64 stuff |
344 |
ibm |
345 |
|
346 |
diff --git a/profiles/prefix/darwin/macos/10.7/x86/use.mask b/profiles/prefix/darwin/macos/10.7/x86/use.mask |
347 |
index 67292fbd1c2..dcc0e997a9a 100644 |
348 |
--- a/profiles/prefix/darwin/macos/10.7/x86/use.mask |
349 |
+++ b/profiles/prefix/darwin/macos/10.7/x86/use.mask |
350 |
@@ -30,8 +30,5 @@ |
351 |
# Modular X: mask for architectures on which they aren't available |
352 |
video_cards_newport |
353 |
|
354 |
-#codec support |
355 |
--x264 |
356 |
- |
357 |
# ibm is only used for ppc64 stuff |
358 |
ibm |
359 |
|
360 |
diff --git a/profiles/prefix/darwin/macos/10.8/x64/use.mask b/profiles/prefix/darwin/macos/10.8/x64/use.mask |
361 |
index 67292fbd1c2..dcc0e997a9a 100644 |
362 |
--- a/profiles/prefix/darwin/macos/10.8/x64/use.mask |
363 |
+++ b/profiles/prefix/darwin/macos/10.8/x64/use.mask |
364 |
@@ -30,8 +30,5 @@ |
365 |
# Modular X: mask for architectures on which they aren't available |
366 |
video_cards_newport |
367 |
|
368 |
-#codec support |
369 |
--x264 |
370 |
- |
371 |
# ibm is only used for ppc64 stuff |
372 |
ibm |
373 |
|
374 |
diff --git a/profiles/prefix/darwin/macos/10.8/x86/use.mask b/profiles/prefix/darwin/macos/10.8/x86/use.mask |
375 |
index 67292fbd1c2..dcc0e997a9a 100644 |
376 |
--- a/profiles/prefix/darwin/macos/10.8/x86/use.mask |
377 |
+++ b/profiles/prefix/darwin/macos/10.8/x86/use.mask |
378 |
@@ -30,8 +30,5 @@ |
379 |
# Modular X: mask for architectures on which they aren't available |
380 |
video_cards_newport |
381 |
|
382 |
-#codec support |
383 |
--x264 |
384 |
- |
385 |
# ibm is only used for ppc64 stuff |
386 |
ibm |
387 |
|
388 |
diff --git a/profiles/prefix/darwin/macos/10.9/x64/use.mask b/profiles/prefix/darwin/macos/10.9/x64/use.mask |
389 |
index 67292fbd1c2..dcc0e997a9a 100644 |
390 |
--- a/profiles/prefix/darwin/macos/10.9/x64/use.mask |
391 |
+++ b/profiles/prefix/darwin/macos/10.9/x64/use.mask |
392 |
@@ -30,8 +30,5 @@ |
393 |
# Modular X: mask for architectures on which they aren't available |
394 |
video_cards_newport |
395 |
|
396 |
-#codec support |
397 |
--x264 |
398 |
- |
399 |
# ibm is only used for ppc64 stuff |
400 |
ibm |
401 |
|
402 |
diff --git a/profiles/prefix/darwin/macos/10.9/x86/use.mask b/profiles/prefix/darwin/macos/10.9/x86/use.mask |
403 |
index 67292fbd1c2..dcc0e997a9a 100644 |
404 |
--- a/profiles/prefix/darwin/macos/10.9/x86/use.mask |
405 |
+++ b/profiles/prefix/darwin/macos/10.9/x86/use.mask |
406 |
@@ -30,8 +30,5 @@ |
407 |
# Modular X: mask for architectures on which they aren't available |
408 |
video_cards_newport |
409 |
|
410 |
-#codec support |
411 |
--x264 |
412 |
- |
413 |
# ibm is only used for ppc64 stuff |
414 |
ibm |