mask vdpau globally and unmask on x86/amd64 as requested in bug #392269

4 files changed, 16 insertions, 8 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e75bfe256aa8..3aa956a2ad53 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.114 2011/11/29 23:44:51 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.115 2011/12/22 12:27:04 aballier Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -67,7 +67,7 @@ dev-lang/php -firebird
 
 # Luca Barbato <lu_zero@gentoo.org> (28 Feb 2011)
 # Masked in base, unmask for amd64/x86
-media-video/mplayer2 -bluray -vdpau
+media-video/mplayer2 -bluray
 
 # Tim Harder <radhermit@gentoo.org> (13 Feb 2011)
 # Masked in base, unmask for amd64/x86
@@ -146,7 +146,7 @@ media-libs/imlib2 mmx
 # Jeremy Olexa <darkside@gentoo.org> (24 Dec 2008)
 # unmask USE=bindist on amd64 - also unmasking the other flags that were under a
 # bad comment heading. see bug #246144
-media-video/mplayer -cpudetection -custom-cpuopts -bindist -vdpau
+media-video/mplayer -cpudetection -custom-cpuopts -bindist
 
 # Vlastimil Babka <caster@gentoo.org> (12 Dec 2008)
 # finally a 64bit java plugin
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 6ca10dd2d2c0..b75baa365ff3 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,12 +1,16 @@
 # Copyright 1999-2011 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.28 2011/10/21 07:03:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.29 2011/12/22 12:27:04 aballier Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64
 
 # SECTION: Unmask
 
+# 2011/12/22 - Alexis Ballier <aballier@gentoo.org>
+# Unmask vdpau as its supported here
+-vdpau
+
 # 2011/07/11 - Samuli Suominen <ssuominen@gentoo.org>
 # Unmask amd64/x86 only opencl support for nvidia-cuda-toolkit
 -opencl
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index dc625105083e..3e58606d5bde 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.73 2011/12/06 13:29:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.74 2011/12/22 12:27:04 aballier Exp $
 
 # This file requires >=portage-2.1.1
 
@@ -59,7 +59,7 @@ sci-mathematics/fricas -cmucl
 
 # Luca Barbato <lu_zero@gentoo.org> (28 Feb 2011)
 # # Masked in base, unmask for amd64/x86
-media-video/mplayer2 -bluray -vdpau
+media-video/mplayer2 -bluray
 
 # Tim Harder <radhermit@gentoo.org> (13 Feb 2011)
 # Masked in base, unmask for amd64/x86
@@ -150,4 +150,4 @@ dev-java/ibm-jdk-bin -alsa
 dev-java/ibm-jre-bin -alsa
 
 # Steve Dibb <beandog@gentoo.org> (29 Sept 2008)
-media-video/mplayer -cpudetection -custom-cpuopts -win32codecs -bindist -vdpau
+media-video/mplayer -cpudetection -custom-cpuopts -win32codecs -bindist
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index e73078714a63..b2b913536eea 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.27 2011/10/03 20:29:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.28 2011/12/22 12:27:04 aballier Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -x86
@@ -9,6 +9,10 @@
 # x86 profile.  This works, for example, if another architecture's
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
+# 2011/12/22 - Alexis Ballier <aballier@gentoo.org>
+# Unmask vdpau as its supported here
+-vdpau
+
 # 2011/07/11 - Samuli Suominen <ssuominen@gentoo.org>
 # Unmask amd64/x86 only opencl support for nvidia-cuda-toolkit
 -opencl