Add vaapi useflag and support, by Frank Richter <res@crystalspace3d.org>, bug #317319

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

6 files changed, 36 insertions, 18 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fc11b3e33d1d..83199db80a79 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.582 2010/05/14 16:39:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.583 2010/05/15 08:57:58 aballier Exp $
+
+  15 May 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.0_pre4.ebuild,
+  vlc-1.1.9999.ebuild, vlc-9999.ebuild, metadata.xml:
+  Add vaapi useflag and support, by Frank Richter <res@crystalspace3d.org>,
+  bug #317319
 
   14 May 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.0.6.ebuild,
   vlc-1.0.9999.ebuild, vlc-1.1.0_pre4.ebuild, vlc-1.1.9999.ebuild,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5c360890d030..f6e0d6947879 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -8,15 +8,15 @@ DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
 EBUILD vlc-1.0.6.ebuild 12229 RMD160 54623261dbe29fdc712d16cc14f3d64873821914 SHA1 c00550fe5f870d412d20b813ae716c70ecc034ae SHA256 3fd4b59e9a8a7566e26e88e8c76db3a842cf48c9737da9116cf453e05f00a315
 EBUILD vlc-1.0.9999.ebuild 12187 RMD160 d9350315d425b13583fc156f0f4f08479d2ffd16 SHA1 d2636b329f4f855234b22428b2dc063c91d5f8b4 SHA256 d0d04cc1ecf202e8a0f2b0c19dfeda7cfc1d38e188fdf1944d5cc23b5caffe30
-EBUILD vlc-1.1.0_pre4.ebuild 11817 RMD160 efed3571a1101f9647eed75ec805da53fcd878d7 SHA1 bb37a71214134542220164375d723605ea25afb4 SHA256 598d5333e273ba40f7adaa60a2de9b770f8839d1d7f2b756936dd47f311f7ae6
-EBUILD vlc-1.1.9999.ebuild 11763 RMD160 9449ce94473408af56eade48ba2f3d28d3252a64 SHA1 76104b1e36ac2b1263d8d8aa613fac1e6200ffe9 SHA256 cd5a4ca54c0e48e0beddeb8d13fa677dc835fc06a9e135dc38e754d00399ced3
-EBUILD vlc-9999.ebuild 11760 RMD160 728214bad333d782097e30a233752bcf6e6e8dd5 SHA1 18b94eaa5bd9fe0937bc573fb61431c3bb0b61af SHA256 8a8ec36fbb8df79aecf16c4a7bba5cbd05ba6f8580f10f16a3f5a9127e389313
-MISC ChangeLog 90037 RMD160 5171e8c2cd7a36a4ee70f466bd44db85c9dc8d97 SHA1 b99ff706be38ea95332c9ee6453ce009cc5e0cfd SHA256 135cdc64761fd6a41621045e283fe7912795f5ef76b6fd16a6d4f40bc5657252
-MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632
+EBUILD vlc-1.1.0_pre4.ebuild 11983 RMD160 e66e25df27b412fae0e609816781a81f40c4f70e SHA1 40648d3b2f5773c13b055469cf64e91c374bc32f SHA256 f0fef55acd1194ed9b09bd32024ea7ba15994e8627187a4d35de9f710afdbca2
+EBUILD vlc-1.1.9999.ebuild 11929 RMD160 453f7753b59afdbab483105f58813d1bab6d6297 SHA1 ac8da389abee96403bb03804140d27320e567eda SHA256 9381bb8070d79681c17b84e6b8ba85b4711b7c226335f6e1747a853774b546c8
+EBUILD vlc-9999.ebuild 11926 RMD160 f231d6e30ce37f1378093f9ad0c57d84d8058284 SHA1 9c6c6cac710826c4cf24f5e605d750855e967894 SHA256 69301e31fc0e573a6037613e6aafa05a5f196529f3e4fa266467788b28d047d1
+MISC ChangeLog 90257 RMD160 97a02a64cc38d164bd8483bf5de049b21f6ecf72 SHA1 c208ecf5791f13b2bad52224bb39674094b3cfbe SHA256 b2bf7d6c3b0f99510c36d1fcc67f7981c216f1b63c6569a99c112f14b198bf43
+MISC metadata.xml 4240 RMD160 548096f0459b43b103c315e07db92e50563ea1e7 SHA1 8a12510531e256c4fad1fc6dd6c28e56c0ab46eb SHA256 fdf69f66df99eb7339d0d12d2baddb8b8d338c839ae7d12051375e38621006a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvtfOcACgkQvFcC4BYPU0rbfQCgqf0JrdPHzGY1pdryIvAfQym8
-HggAoI31OlsVFH2/o4aoWxZkl5tfAjDJ
-=SOX/
+iEYEARECAAYFAkvuYiIACgkQvFcC4BYPU0rKwACeK1NqpfZxqBB/5u7RStczuMwn
+WoAAoMM6um4vlD8c8791ofNoFWel+Tzb
+=HDFY
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 6b11944e2948..345a3c514a55 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -44,6 +44,7 @@
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
     <flag name="udev">Enables Linux udev services discovery.</flag>
     <flag name="upnp">Enables support for Intel UPnP stack.</flag>
+	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
     <flag name="vcdinfo">Enables VCD information library support.</flag>
     <flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
     <flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
diff --git a/media-video/vlc/vlc-1.1.0_pre4.ebuild b/media-video/vlc/vlc-1.1.0_pre4.ebuild
index 951ea57e726a..0c444aaf4814 100644
--- a/media-video/vlc/vlc-1.1.0_pre4.ebuild
+++ b/media-video/vlc/vlc-1.1.0_pre4.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/vlc/vlc-1.1.0_pre4.ebuild,v 1.2 2010/05/14 16:39:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre4.ebuild,v 1.3 2010/05/15 08:57:58 aballier Exp $
 
 EAPI="2"
 
@@ -52,7 +52,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
-	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vcdx vlm
+	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
 	vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
@@ -136,6 +136,7 @@ RDEPEND="
 		upnp? ( net-libs/libupnp )
 		v4l2? ( libv4l2? ( media-libs/libv4l ) )
 		v4l? ( libv4l? ( media-libs/libv4l ) )
+		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
@@ -185,6 +186,7 @@ pkg_setup() {
 	vlc_use_force skins truetype
 	vlc_use_force skins qt4
 	vlc_use_force vlm stream
+	vlc_use_force vaapi ffmpeg
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -316,6 +318,7 @@ src_configure() {
 		$(use_enable v4l) \
 		$(use_enable v4l2) \
 		$(use_enable vcdx) \
+		$(use_enable vaapi libva) \
 		$(use_enable vlm) \
 		$(use_enable vorbis) \
 		$(use_enable win32codecs loader) \
@@ -333,7 +336,8 @@ src_configure() {
 		$(vlc_use_enable_force vlm sout) \
 		$(vlc_use_enable_force skins qt4) \
 		$(vlc_use_enable_force skins freetype) \
-		$(vlc_use_enable_force remoteosd libgcrypt)
+		$(vlc_use_enable_force remoteosd libgcrypt) \
+		$(vlc_use_enable_force vaapi avcodec)
 }
 
 src_install() {
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 1150f3039ed0..ae461c6a4213 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.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/vlc/vlc-1.1.9999.ebuild,v 1.3 2010/05/14 16:39:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.4 2010/05/15 08:57:58 aballier Exp $
 
 EAPI="2"
 
@@ -52,7 +52,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
-	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vcdx vlm
+	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
 	vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
@@ -136,6 +136,7 @@ RDEPEND="
 		upnp? ( net-libs/libupnp )
 		v4l2? ( libv4l2? ( media-libs/libv4l ) )
 		v4l? ( libv4l? ( media-libs/libv4l ) )
+		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
@@ -185,6 +186,7 @@ pkg_setup() {
 	vlc_use_force skins truetype
 	vlc_use_force skins qt4
 	vlc_use_force vlm stream
+	vlc_use_force vaapi ffmpeg
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -316,6 +318,7 @@ src_configure() {
 		$(use_enable v4l) \
 		$(use_enable v4l2) \
 		$(use_enable vcdx) \
+		$(use_enable vaapi libva) \
 		$(use_enable vlm) \
 		$(use_enable vorbis) \
 		$(use_enable win32codecs loader) \
@@ -333,7 +336,8 @@ src_configure() {
 		$(vlc_use_enable_force vlm sout) \
 		$(vlc_use_enable_force skins qt4) \
 		$(vlc_use_enable_force skins freetype) \
-		$(vlc_use_enable_force remoteosd libgcrypt)
+		$(vlc_use_enable_force remoteosd libgcrypt) \
+		$(vlc_use_enable_force vaapi avcodec)
 }
 
 src_install() {
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 48e9a30fdb1c..c3e6e6e7e5e2 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.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/vlc/vlc-9999.ebuild,v 1.70 2010/05/14 16:39:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.71 2010/05/15 08:57:58 aballier Exp $
 
 EAPI="2"
 
@@ -52,7 +52,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
-	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vcdx vlm
+	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
 	vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
@@ -136,6 +136,7 @@ RDEPEND="
 		upnp? ( net-libs/libupnp )
 		v4l2? ( libv4l2? ( media-libs/libv4l ) )
 		v4l? ( libv4l? ( media-libs/libv4l ) )
+		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
@@ -185,6 +186,7 @@ pkg_setup() {
 	vlc_use_force skins truetype
 	vlc_use_force skins qt4
 	vlc_use_force vlm stream
+	vlc_use_force vaapi ffmpeg
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -316,6 +318,7 @@ src_configure() {
 		$(use_enable v4l) \
 		$(use_enable v4l2) \
 		$(use_enable vcdx) \
+		$(use_enable vaapi libva) \
 		$(use_enable vlm) \
 		$(use_enable vorbis) \
 		$(use_enable win32codecs loader) \
@@ -333,7 +336,8 @@ src_configure() {
 		$(vlc_use_enable_force vlm sout) \
 		$(vlc_use_enable_force skins qt4) \
 		$(vlc_use_enable_force skins freetype) \
-		$(vlc_use_enable_force remoteosd libgcrypt)
+		$(vlc_use_enable_force remoteosd libgcrypt) \
+		$(vlc_use_enable_force vaapi avcodec)
 }
 
 src_install() {