add vaapi useflag, by Olivier Huber <oli.huber@gmail.com>, bug #308857

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

4 files changed, 16 insertions, 9 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0b833f1a82dd..83619bf69a5d 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.350 2010/05/11 09:50:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.351 2010/05/11 10:18:21 aballier Exp $
+
+  11 May 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild,
+  metadata.xml:
+  add vaapi useflag, by Olivier Huber <oli.huber@gmail.com>, bug #308857
 
   11 May 2010; Alexis Ballier <aballier@gentoo.org>
   ffmpeg-0.5_p20373.ebuild, ffmpeg-0.5_p22846.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 3ce5e22d4419..916880081903 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,13 +5,13 @@ DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0
 DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccbed3cf8 SHA1 d207570ed009b63c94485ccc64439107cf700f39 SHA256 a52d82476afa7c8ed62c1a52760e49907947c1ef1ecfc3e9022fa713e9783f2f
 EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
-EBUILD ffmpeg-9999-r1.ebuild 7506 RMD160 a972af9e4ebbefeea08aea2e848109377d233b75 SHA1 06307a2df84a8c540c7cafcf8f9c6ce8794feecb SHA256 55404f8df8fa5c5c43394cb660d6cc9f297d13e65ec4892609880adefa8ce1cd
-MISC ChangeLog 52564 RMD160 75305e54d56336fabe457a42223e75f7731a3783 SHA1 131f090e35cedae5ce0f37053b6b80095929adf5 SHA256 839ee39238e916769782a7510d0a71fe578cc8e599bd397f2002c2b425ff168c
-MISC metadata.xml 1742 RMD160 9471b0e1a844b21af5a875e2618847aeaaea126f SHA1 0f574b277a0d395e15c59ea406d1a75685687c42 SHA256 55112c676590fe2edb972c39407bac9de0ffbf940f1ed281493a7dd6f71bbeff
+EBUILD ffmpeg-9999-r1.ebuild 7588 RMD160 067d2e9842222a956e2036a83412c70fd42300af SHA1 7238bc36c44ec58c7a80c6409e299d537d752956 SHA256 ce74e35c000a1b765a2d6cf62ad6b0e77b69c7af81fd0827e11217b9d5e84fa1
+MISC ChangeLog 52729 RMD160 855d3b5b6c5c08956fbec01454c41e276c89fd08 SHA1 a75e9b54685d91b944bda6174839f75efd53117b SHA256 6212eddd7cc186cca8bf1f7fcc489f59435fc9f4ee373947d89f7d02be9b11db
+MISC metadata.xml 1830 RMD160 88d52f0a9539230e1addcab5fd704400d34b84d3 SHA1 9e2bdcf8205744623d964f1e426dadacbf24b0e1 SHA256 eb541891f7dab5e5ed4b46975a578d4ff19b88d9d80e44668f2195774fb157c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvpKHcACgkQvFcC4BYPU0qI1ACgxtFKoQJg+15S1s+vUcj2KNql
-8o0AoKoVozHBvpQOLq1y6wFjH9jRgkmE
-=Wj+J
+iEYEARECAAYFAkvpLvIACgkQvFcC4BYPU0pn7ACgkH2GQM0LvcwdqXiVFLpY8LHg
+3MQAoI/K+Q6bLY7ZrN2FA8QeLo0BW9R+
+=LIrv
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 73504fa9bbbc..8f2ac91b644b 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.32 2010/04/23 12:49:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.33 2010/05/11 10:18:21 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -29,7 +29,7 @@ IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
 	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
 	  theora threads x264 xvid network zlib sdl X mp3 amr
 	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k vdpau"
+	  speex +ssse3 jpeg2k vaapi vdpau"
 
 VIDEO_CARDS="nvidia"
 
@@ -58,6 +58,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	X? ( x11-libs/libX11 x11-libs/libXext )
+	vaapi? ( x11-libs/libva )
 	video_cards_nvidia? (
 		vdpau? ( x11-libs/libvdpau )
 	)"
@@ -142,6 +143,7 @@ src_configure() {
 	#done
 	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
 	use vdpau || myconf="${myconf} --disable-vdpau"
+	use vaapi || myconf="${myconf} --disable-vaapi"
 
 	# CPU features
 	for i in mmx ssse3 altivec ; do
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 9ca0f77a687e..afa3011c064a 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="pic">Force shared libraries to be built as PIC (this is slower)</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="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
 	<flag name="vdpau">Enables VDPAU decoders (requires nVidia video cards to offload CPU processing to video card</flag>
   </use>
 </pkgmetadata>