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

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d423e8e9b31e5e44ef8234eb735f2285a74160c3..b28a2cf7c7cc47233207415daf52952d903c5e39 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6033 2011/12/21 17:30:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6034 2011/12/22 12:27:03 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!
 
+  22 Dec 2011; Alexis Ballier <aballier@gentoo.org>
+  arch/amd64/package.use.mask, arch/amd64/use.mask, arch/x86/package.use.mask,
+  arch/x86/use.mask, base/package.use.mask, base/use.mask:
+  mask vdpau globally and unmask on x86/amd64 as requested in bug #392269
+
   21 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
   +default/linux/arm/10.0/package.use.mask,
   +default/linux/sparc/10.0/package.use.mask:

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e75bfe256aa812e8529a838bf265ee7d294d4c36..3aa956a2ad533c173b7f7a6765ad1b7a9ebaabac 100644 (file)
--- 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 6ca10dd2d2c0cf3ff3cf393c8874ad814723b224..b75baa365ff3afe209b52d211ac4df7f6491b2a1 100644 (file)
--- 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 dc625105083e4f38a9102a2b57a296269ee62d8b..3e58606d5bde2607787ea57777f82c15aea5d566 100644 (file)
--- 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 e73078714a632587a8b76b907b7f056ecf20cac4..b2b913536eea43ddbe5366c9b8968d11f4d0c3f6 100644 (file)
--- 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

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index dea4bfaf1bdf8a9f41e377bbfe969aceac3c853e..c6f05569631a8d17ec148c91689dfc7a2d3387c2 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/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/base/package.use.mask,v 1.295 2011/12/06 22:00:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.296 2011/12/22 12:27:04 aballier Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -120,7 +120,7 @@ x11-libs/libnotify test
 
 # Luca Barbato <lu_zero@gentoo.org> (28 Mar 2011)
 # Mask mplayer2 arch specific flags
-media-video/mplayer2 vdpau bluray
+media-video/mplayer2 bluray
 
 # Diego E. Pettenò <flameeyes@gentoo.org> (27 Mar 2011)
 #
@@ -302,8 +302,7 @@ dev-java/ibm-jre-bin alsa
 # Raúl Porcel <armin76@gentoo.org> (09 Nov 2008)
 # CPU opts: This needs amd64, x86 and ppc on some of them
 # dvdnav: hard masked dependency
-# vdpau: availble on x86, amd64 only
-media-video/mplayer cpudetection custom-cpuopts bindist vdpau
+media-video/mplayer cpudetection custom-cpuopts bindist
 
 # Steve Dibb <beandog@gentoo.org> (26 Feb 2009)
 # Unmask internal real player codec support on newer mplayer

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b3ac9e26b4d7eb10fdafd6ece7a46357e1631c05..ea09701ac19df620bbb76c24b29c0a8226624c5a 100644 (file)
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.129 2011/12/18 09:04:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.130 2011/12/22 12:27:04 aballier Exp $
+
+# vdpau is currently only available with binary nvidia-drivers, thus amd64/x86*
+vdpau
 
 # nvidia-cuda-toolkit is amd64/x86 only
 opencl