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

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

4 files changed, 15 insertions, 25 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/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"