USE vdpau with VIDEO_CARDS=nvidia wrt #262433, thanks to Bob Deblier for reporting.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 45 insertions, 7 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 797212dca1f8..541de6224dcb 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.300 2009/07/08 21:55:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.301 2009/07/09 13:43:14 ssuominen Exp $
+
+  09 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild,
+  ffmpeg-9999-r1.ebuild:
+  USE vdpau with VIDEO_CARDS=nvidia wrt #262433, thanks to Bob Deblier for
+  reporting.
 
   08 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   ffmpeg-0.4.9_p20090201.ebuild, ffmpeg-0.5-r1.ebuild,
diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
index a38f0b835794..ece802a2543e 100644
--- a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.14 2009/07/08 21:55:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.15 2009/07/09 13:43:14 ssuominen Exp $
 
 EAPI=2
 
@@ -15,10 +15,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc ieee1394
-	  +encode faac faad gsm ipv6 +mmx +mmxext vorbis test theora threads x264
+	  +encode faac faad gsm ipv6 +mmx +mmxext vdpau vorbis test theora threads x264
 	  xvid network zlib sdl X mp3 oss schroedinger +hardcoded-tables bindist
 	  v4l v4l2 speex +ssse3 vhook jpeg2k"
 
+VIDEO_CARDS="nvidia"
+
+for x in ${VIDEO_CARDS}; do
+	IUSE="${IUSE} video_cards_${x}"
+done
+
 RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 )
 	sdl? ( >=media-libs/libsdl-1.2.10 )
 	alsa? ( media-libs/alsa-lib )
@@ -44,7 +50,10 @@ RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	X? ( x11-libs/libX11 x11-libs/libXext )
-	amr? ( media-libs/amrnb media-libs/amrwb )"
+	amr? ( media-libs/amrnb media-libs/amrwb )
+	video_cards_nvidia? (
+		vdpau? ( >=x11-drivers/nvidia-drivers-180.29 )
+	)"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
@@ -118,6 +127,11 @@ src_configure() {
 									 --enable-nonfree"
 	fi
 
+	# This has changed since 0.5, please recheck for next version
+	if use video_cards_nvidia; then
+		use vdpau && myconf="${myconf} --enable-vdpau"
+	fi
+
 	# CPU features
 	for i in mmx ssse3 altivec ; do
 		use $i ||  myconf="${myconf} --disable-$i"
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 70bce1c906f6..69923f94f1fa 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.9 2009/07/08 21:55:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.10 2009/07/09 13:43:14 ssuominen Exp $
 
 EAPI=2
 
@@ -19,7 +19,13 @@ IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
 	  doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test
 	  theora threads x264 xvid network zlib sdl X mp3 opencore-amrnb
 	  opencore-amrwb oss schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k"
+	  speex +ssse3 jpeg2k vdpau"
+
+VIDEO_CARDS="nvidia"
+
+for x in ${VIDEO_CARDS}; do
+	IUSE="${IUSE} video_cards_${x}"
+done
 
 RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 	alsa? ( media-libs/alsa-lib )
@@ -42,7 +48,10 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( x11-libs/libX11 x11-libs/libXext )"
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	video_cards_nvidia? (
+		vdpau? ( >=x11-drivers/nvidia-drivers-180.29 )
+	)"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
@@ -115,6 +124,15 @@ src_configure() {
 		{ use faac ; } && myconf="${myconf} --enable-nonfree"
 	fi
 
+	disable-vdpau-support() {
+		for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+			myconf="${myconf} --disable-decoder=$i"
+		done
+	}
+
+	use video_cards_nvidia || disable-vdpau-support
+	use vdpau || disable-vdpau-support
+
 	# CPU features
 	for i in mmx ssse3 altivec ; do
 		use $i ||  myconf="${myconf} --disable-$i"
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index d400ab284121..9ec480fea64e 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -23,6 +23,7 @@
     <flag name="opencore-amrwb">Enables Adaptive Multi-Rate Wideband   support vie opencore-amr.</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
     <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+	<flag name="vdpau">Enables VDPAU decoders (requires nVidia video cards to offload CPU processing to video card</flag>
     <flag name="vhook">Enables video hooking support.</flag>
   </use>
 </pkgmetadata>