profiles: Revert x264 mask logic. It should work everywhere.

johu · Mar 4, 2017 · b3b2301 · b3b2301
1 parent b9ca7b1
commit b3b2301
Show file tree

Hide file tree

Showing 26 changed files with 8 additions and 75 deletions.
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
@@ -163,9 +163,6 @@ mpd
 # USE=d seems to break gcc-4.1.2 (#178896)
 d
 
-# This works
--x264
-
 # uses gnat/ada which is too big to support currently
 topal
 

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
@@ -105,10 +105,6 @@
 # nVidia XvMC support works on amd64
 -nvidia
 
-# 2006/03/03 - Luca Barbato <[email protected]>
-# codec support x264
--x264
-
 # 2006/01/28 - Donnie Berkholz <[email protected]>
 # Modular X: unmask for architectures on which they are available
 -input_devices_synaptics

diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Alexis Ballier <[email protected]> (4 Mar 2017)
+# media-libs/x264 not stable yet. Remove when it is.
+x264
+
 # Andrey Grozin <[email protected]> (16 May 2014)
 # No stable gcl
 gcl

diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
@@ -59,10 +59,6 @@ llvm
 # No known OpenCL providers (bug #482096)
 opencl
 
-# Jeroen Roovers <[email protected]> (19 Jun 2013)
-# media-libs/x264 works
--x264
-
 # Samuli Suominen <[email protected]> (12 Mar 2013)
 # NVIDIA Cg toolkit for binary drivers
 cg

diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Alexis Ballier <[email protected]> (4 Mar 2017)
+# gst-plugins-x264 is not stable on ia64
+media-plugins/gst-plugins-meta x264
+
 # Pacho Ramos <[email protected]> (15 Jan 2017)
 # Missing keywords, bug #559770
 >=net-misc/networkmanager-1.4.4 consolekit

diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
@@ -13,10 +13,6 @@ gnuefi
 # dependencies not keyworded yet
 ayatana
 
-# Anthony G. Basile <[email protected]> (10 Jul 2014)
-# codec support x264, bug #516856
--x264
-
 #Klibc does not work
 klibc
 

diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
@@ -238,9 +238,6 @@ alsa_cards_sbawe
 alsa_cards_sscape
 alsa_cards_wavefront
 
-# Enable H264 with x264
--x264
-
 # Copied over from default-linux/sparc/sparc64
 -vis
 

diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
@@ -142,9 +142,6 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # Diego Pettenò <[email protected]> (4 Jan 2007)
 # Unmask the flags for PHP that are available only on x86
 #

diff --git a/profiles/default/linux/use.mask b/profiles/default/linux/use.mask
@@ -6,9 +6,6 @@
 # profile (such as the selinux profiles) have a USE flag associated with
 # them.
 
-# ppc and x86/amd64
-x264
-
 # Diego Elio Pettenò <[email protected]> (27 Aug 2012)
 # netlink is a Linux-specific interface
 -netlink

diff --git a/profiles/prefix/darwin/macos/10.10/x64/use.mask b/profiles/prefix/darwin/macos/10.10/x64/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.10/x86/use.mask b/profiles/prefix/darwin/macos/10.10/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.12/x64/use.mask b/profiles/prefix/darwin/macos/10.12/x64/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.12/x86/use.mask b/profiles/prefix/darwin/macos/10.12/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.4/x86/use.mask b/profiles/prefix/darwin/macos/10.4/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.5/x64/use.mask b/profiles/prefix/darwin/macos/10.5/x64/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.5/x86/use.mask b/profiles/prefix/darwin/macos/10.5/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.6/x64/use.mask b/profiles/prefix/darwin/macos/10.6/x64/use.mask
@@ -32,8 +32,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.6/x86/use.mask b/profiles/prefix/darwin/macos/10.6/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.7/x64/use.mask b/profiles/prefix/darwin/macos/10.7/x64/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.7/x86/use.mask b/profiles/prefix/darwin/macos/10.7/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.8/x64/use.mask b/profiles/prefix/darwin/macos/10.8/x64/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.8/x86/use.mask b/profiles/prefix/darwin/macos/10.8/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.9/x64/use.mask b/profiles/prefix/darwin/macos/10.9/x64/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
diff --git a/profiles/prefix/darwin/macos/10.9/x86/use.mask b/profiles/prefix/darwin/macos/10.9/x86/use.mask
@@ -30,8 +30,5 @@
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
 
-#codec support
--x264
-
 # ibm is only used for ppc64 stuff
 ibm
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,9 +163,6 @@ mpd @@
     # USE=d seems to break gcc-4.1.2 (#178896)
     d
-    # This works
-    -x264
     # uses gnat/ada which is too big to support currently
     topal
@@ Expand Down @@