Add some usemasks for cpu related useflags that will be added to media-video/ffmpeg. Unmask relevant flags on amd64/x86. Leave arm and mips useflags to the arch team that know better where to unmask them.

4 files changed, 26 insertions, 6 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index af90d879e606..8830d4548bbe 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8535 2014/01/14 18:33:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8536 2014/01/14 19:15:08 aballier Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  14 Jan 2014; Alexis Ballier <aballier@gentoo.org> arch/amd64/use.mask,
+  arch/x86/use.mask, base/use.mask:
+  Add some usemasks for cpu related useflags that will be added to
+  media-video/ffmpeg. Unmask relevant flags on amd64/x86. Leave arm and mips
+  useflags to the arch team that know better where to unmask them.
+
   14 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
   media-plugins/vdr-sky masked for removal ~ 14/02/2014, wrt bug 420869
 
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index a54e92716490..7f8ce3e4b035 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.51 2013/08/22 16:10:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.52 2014/01/14 19:15:08 aballier Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64
@@ -119,11 +119,13 @@
 -sse4
 -sse4a
 -sse4_1
+-sse4_2
 -avx
 -avx128fma
 -avx256
 -3dnow
 -3dnowext
+-fma4
 
 # George Shapovalov <george@gentoo.org> (8 Apr 2007)
 # supported on amd64
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 462964ed9652..d2afa4a1a55a 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.54 2013/08/22 16:10:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.55 2014/01/14 19:15:08 aballier Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -x86
@@ -78,11 +78,13 @@
 -sse3
 -sse4
 -sse4_1
+-sse4_2
 -sse4a
 -ssse3
 -avx
 -avx128fma
 -avx256
+-fma4
 -svga
 -kqemu
 -nvram
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index ad9a4e9d1ac2..5b8cb9ee4bcf 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.182 2014/01/02 06:59:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.183 2014/01/14 19:15:08 aballier Exp $
 
 # masking here and unmasking in default/linux/
 kmod
@@ -58,10 +58,12 @@ sse3
 sse4
 sse4a
 sse4_1
+sse4_2
 ssse3
 avx
 avx128fma
 avx256
+fma4
 svga
 nvram
 
@@ -75,6 +77,10 @@ n32
 n64
 fixed-point
 loongson2f
+mips32r2
+mipsdspr1
+mipsdspr2
+mipsfpu
 
 # ppc64 arch specific USE flags
 ibm
@@ -85,6 +91,10 @@ vis
 ultra1
 
 # arm arch specific USE flags
+armvfp
+armv5te
+armv6
+armv6t2
 iwmmxt
 neon