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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 49 insertions, 11 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/Manifest b/media-video/ffmpeg/Manifest
index 2acba7dd766d..78952903dd21 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,7 +1,7 @@
 DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dceecdb5a1a174 SHA1 97262f1bc663c4bd4fdcb12e8572628174cceae6 SHA256 60af968bdcac2284799a2395d4d9cdcb5319493c91da231992f5f90cd663647a
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 EBUILD ffmpeg-0.4.9_p20090201.ebuild 6278 RMD160 8c239d62af63bc5f04d3535d4773027335c10c4c SHA1 07abf1371986258b9557d3a4f3739ba57f0490b7 SHA256 58ee0192b3395c13ae25ffe8c5396ad4314c4dfc2199cc53fb083513992e1a99
-EBUILD ffmpeg-0.5-r1.ebuild 6229 RMD160 81216c394d7d4e5ba14a587e7fd9fe378bf35277 SHA1 3e03ce767abe60e4e7e5a1d4c33757e8e6632c2a SHA256 e5fe63cfd62e1fdcd3a644793cf5cbc1b9dd185aa53a71f73509b34778f24770
-EBUILD ffmpeg-9999-r1.ebuild 6106 RMD160 004058d619e02f78befaf4d78134adea71f04da5 SHA1 f7a81c57ec139569f6db72314a6a245660e7d43f SHA256 7ab8f30bf2779ee60ab36bd635ef168437b9cb940e62094b4ace1db8cf9d3b2a
-MISC ChangeLog 45655 RMD160 72d72765d024655c7110f06cbdd2a376bede25a2 SHA1 2f6c0e910e144dba8d9382e4c6a4c56f8b1847d4 SHA256 7629e56e436ead20c9e9f5ca6866afe898a00442c6c48e5e0442c963e52f58f8
-MISC metadata.xml 1798 RMD160 bf7be02af72b3455d18eda5253da7e8a4cb5b4fd SHA1 efe70dc4c31f732c793f3b1b6820d27bea0ebd1e SHA256 8253fdc43d056bdc3787a1d6884db1b1268b8c4565c69864da80245860f904fa
+EBUILD ffmpeg-0.5-r1.ebuild 6549 RMD160 7d3dc6f710b1944022c6a607737ea8be4e0b7385 SHA1 23b88211d4e61f9b49c7b8a3a1f85ed1616cf1b8 SHA256 83d0453256174cd98f8d7fbc0c8fca48f1b0ddd681e5345a796af1c0350668d9
+EBUILD ffmpeg-9999-r1.ebuild 6514 RMD160 06a9daf89ee89b1640cdd6bbc833173eac50d8ef SHA1 c2500ea95fd6a658f2b3e0690dd49d96531ef2a2 SHA256 1842358d6e261b7dfb07a2f656f46fdbe589331e70d19863c9003f08a02023d1
+MISC ChangeLog 45845 RMD160 f6c3d8e8af2ed6a420323188b9312a92c5a0b0df SHA1 06f438c54c00ca2e7a928a86c5a84d5107fa6bde SHA256 968291c2b8d77946e7df50fc4c72c158c36fe4f5292ffd1cf78fd797a56e9fe7
+MISC metadata.xml 1917 RMD160 7e8a17dac9e2f84b7d6f1847a143cbaabd356f03 SHA1 558ae5ec3ef20f719746528d14c3d5c69e0c2260 SHA256 12f3ca404045c542c113ba34169c104f45a75d68800382b8c677a498ddd45e9f
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>