vdpau is not nvidia only now, thanks to Nikoli for testing and the patch provided in bug #406269

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

5 files changed, 23 insertions, 33 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 06f4d9dd710c..c438bf30cf1b 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.55 2012/02/09 22:28:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.56 2012/02/29 10:18:12 lu_zero Exp $
+
+  29 Feb 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8.ebuild,
+  libav-0.8.9999.ebuild, libav-9999.ebuild:
+  vdpau is not nvidia only now, thanks to Nikoli for testing and the patch
+  provided in bug #406269
 
   09 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.8.9999.ebuild,
   libav-0.8.ebuild, libav-9999.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 0c73c54fb290..b2343ad2de04 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST libav-0.6.5.tar.xz 3193172 RMD160 5a796c6cc6bf2b26bfda93800c010a54a5934851 SHA1 bab032f699cbac063e77030a0a2eddcc04f64888 SHA256 439491a93f3c85d6fcafb50758be5ad312f3d0795852c52c33157ea11005df7e
 DIST libav-0.7.4.tar.xz 3613872 RMD160 d6f07bb8889f69fdd282fbeb689bee9e3b7463d5 SHA1 9000cb3ec3e37bd442b9049a57b923187818a5ce SHA256 bd98dc5dc3621d6d028334233c63e44928e1453a6e03c5a8165537f11baed59a
@@ -7,15 +7,15 @@ DIST libav-0.8.tar.xz 3802608 RMD160 3a37ade904fea59f1e28fe1d51f09d37f4dde50f SH
 EBUILD libav-0.6.5.ebuild 7540 RMD160 a44cf312424486cfed22c19db6248c8ca095ffc1 SHA1 5f9d6e9a6aba4a01d460a39139be875ba9c6f824 SHA256 ba25e0441bc9ac01d16b5d038df4e42821417d388b09fe944e9c7ffb04c10aca
 EBUILD libav-0.7.4.ebuild 7945 RMD160 d11d4439bb4338e04d5e8c10583eba824db6270c SHA1 5552936ca2109a3462b07fe477d6672120802855 SHA256 502a23eebb04ad21fb6ce491d6423933d4dde265d6f7964558a718233ee7ba97
 EBUILD libav-0.7.9999.ebuild 7962 RMD160 56987c877505b2140922d66b84f9ab8a16e1dd0d SHA1 faeeb7828ad50832dea9000812496244aa0ca468 SHA256 ab4971d99252dea5fc4fb31b86e8a1281848e4186b49de49029386e1064bf56c
-EBUILD libav-0.8.9999.ebuild 9069 RMD160 a13f51a2dc2f2eb1f21ba05a468a836a3b6da58b SHA1 04e79599ba2e975dcb68ac1c6ac24a11a0228626 SHA256 f01d7d90b794c78d85dbbaad99b24e5098a0c3b25c6920c60087060e707f01ab
-EBUILD libav-0.8.ebuild 9064 RMD160 2e4fb5235b9d457a88d0f9f38b86238391eb99da SHA1 b15fd1544c33767bcb2f6bcc0406a0aab50525fa SHA256 c1800c03596c7f5794a22df6d0160b620a514057e573d3cc93d877e1cf6dd01b
-EBUILD libav-9999.ebuild 9066 RMD160 177cfc2c0dfddde7a6cff47d17c7c198c4341263 SHA1 ea7b060d473db6c915599910bf0c152d83fae67e SHA256 1c8271930105ec3ae2c0472d2d463f34be6fea1e77c43646ad6fd7c41ce32d49
-MISC ChangeLog 8589 RMD160 9db31ecfece5708815096314e9422be8cda855e0 SHA1 8ecfa5692ef73786705594703cfb6e601d14fcd9 SHA256 fcb9b1adae34d31d722f3dfb5d4e7718927c23d1adc1cb89916594c1eb1c3b70
+EBUILD libav-0.8.9999.ebuild 8929 RMD160 4be118a6aed624a912640f3933a721cdc2410e31 SHA1 b42348c926fd21b4fd1c6444dc424f36ff2b1206 SHA256 d2ae11efbf1168360358a668b37df11f090b33ce142edd95d47f001496cda6cb
+EBUILD libav-0.8.ebuild 8924 RMD160 0d3f526410e77d69783f818c78aa3a38245b01ca SHA1 29b1530a885e318cf7ba8b9f3aee8747406b71f3 SHA256 3870864d9e877cf1239e22d84661d0e8f1b65ed0ee0202ac30bf36ff0307a8f4
+EBUILD libav-9999.ebuild 8926 RMD160 3d3ebb55bdeeeab8ebd7d474118a85224a4f263c SHA1 8bc514a7132ab856636ba1fd523a017ac440a148 SHA256 3bfbc1df5030b1e459d5a04f3c72b26ba8cb14f972820bbc8ba22fac5f2168ba
+MISC ChangeLog 8800 RMD160 2f4cd8a38633cd8d9bbaac501b84f7beb124d762 SHA1 20d774119f0d995ab44411887f66bc7ea0948f5c SHA256 ab99b037b340cffc7f9faaa07fbae473565c23080c781aef4fd179ac2faa692f
 MISC metadata.xml 2901 RMD160 a803fd4d095dede8d2e8d1e1150dd4dbdc593772 SHA1 b963c57764c3464383eb61decdbfad757f553101 SHA256 246c0b2f532a0514d458eb166855abb1809740d037ed76ab41a5f107c83a9b1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk80SIoACgkQAiZjviIA2XiTDQCguLGttwY/6Uc4bn9RV16nNBFr
-PyIAoKtSDEGbVtjrI7JQRIT0w1/yqaH3
-=jHgx
+iF4EAREIAAYFAk9N+3MACgkQYpJnKVbCxcwipQD9E1rHWWJAU9Bp7pb7RYDFqHZg
+hJR+T47EEaF27AyHMJwBAIMxZdO3lQeakXGcRQ3bRWlXgqokBOt+gBcKyBkP0oDJ
+=T6qG
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index c0b6a03270d8..f225636c5cfa 100644
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.3 2012/02/09 22:28:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.4 2012/02/29 10:18:12 lu_zero Exp $
 
 EAPI=4
 
@@ -34,11 +34,6 @@ IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
 	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
 	  +zlib"
 
-VIDEO_CARDS="nvidia"
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
 CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
 
 for i in ${CPU_FEATURES}; do
@@ -75,7 +70,7 @@ RDEPEND="
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	vaapi? ( x11-libs/libva )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
+	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
 	X? ( x11-libs/libX11 x11-libs/libXext )
 	zlib? ( sys-libs/zlib )
@@ -140,7 +135,7 @@ src_configure() {
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
 	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
 	#done
-	use video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau"
+	use vdpau || myconf+=" --disable-vdpau"
 
 	use vaapi && myconf+=" --enable-vaapi"
 
diff --git a/media-video/libav/libav-0.8.ebuild b/media-video/libav/libav-0.8.ebuild
index 0286bc8360c6..7a30b6cf767e 100644
--- a/media-video/libav/libav-0.8.ebuild
+++ b/media-video/libav/libav-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.5 2012/02/09 22:28:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.6 2012/02/29 10:18:12 lu_zero Exp $
 
 EAPI=4
 
@@ -34,11 +34,6 @@ IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
 	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
 	  +zlib"
 
-VIDEO_CARDS="nvidia"
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
 CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
 
 for i in ${CPU_FEATURES}; do
@@ -75,7 +70,7 @@ RDEPEND="
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	vaapi? ( x11-libs/libva )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
+	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
 	X? ( x11-libs/libX11 x11-libs/libXext )
 	zlib? ( sys-libs/zlib )
@@ -140,7 +135,7 @@ src_configure() {
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
 	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
 	#done
-	use video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau"
+	use vdpau || myconf+=" --disable-vdpau"
 
 	use vaapi && myconf+=" --enable-vaapi"
 
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index cb8eab627e4f..e29f8c9662d7 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.29 2012/02/09 22:28:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.30 2012/02/29 10:18:12 lu_zero Exp $
 
 EAPI=4
 
@@ -34,11 +34,6 @@ IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
 	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
 	  +zlib"
 
-VIDEO_CARDS="nvidia"
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
 CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
 
 for i in ${CPU_FEATURES}; do
@@ -75,7 +70,7 @@ RDEPEND="
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	vaapi? ( x11-libs/libva )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
+	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
 	X? ( x11-libs/libX11 x11-libs/libXext )
 	zlib? ( sys-libs/zlib )
@@ -140,7 +135,7 @@ src_configure() {
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
 	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
 	#done
-	use video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau"
+	use vdpau || myconf+=" --disable-vdpau"
 
 	use vaapi && myconf+=" --enable-vaapi"