Add VAAPI support via USE-flag, wrt bug #481118

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 25 insertions, 24 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index b34f144bedbc..99ef0470f5c3 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.20 2013/08/25 12:57:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.21 2013/09/02 08:10:12 pinkbyte Exp $
+
+  02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-9999.ebuild,
+  metadata.xml:
+  Add VAAPI support via USE-flag, wrt bug #481118
 
 *mpv-0.1.3 (25 Aug 2013)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 62cc44bd4d23..860144213424 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -3,23 +3,17 @@ Hash: SHA256
 
 DIST mpv-0.1.3.tar.gz 1650206 SHA256 5f06cf484f0826fe3829563d98fff5ebfd2385beed617dcf7be4d1f38373083c SHA512 0867efd92f32fabd6410e88bf1f441ed2b33d5b705550cf3fc2d6d4ecc72d79f97ed0dfcec1a4bae4f9a1701d740c0e08b3453c2816b68c9d72e8b1037b6002f WHIRLPOOL a9cb967b9cbd03e31f2c1fffdf05968e5c876ea68c411887e5dfcab26755cd1312fa689b9a4f84d3db5c42b4f6c0475b2157584e846d34da602c87beaf7143ad
 EBUILD mpv-0.1.3.ebuild 7815 SHA256 85faf33dc18484049dbfd6836338938e7a2af32634a904274c9abf87d08a98ff SHA512 ced28f7e4d1fe643cf8e2cdf02ed0c1e9521811c01a1977f165b8a901ad7a6f55199269482b41947a76bc571c83bb5392a9dab9971ee79acf2bb28590ad9b65a WHIRLPOOL ff70724a0d5984b69abbe5552058345f14b3ca19e6497826d5e2e4d3501214ab5547b0cf7036f56cd03cedb59e47cad9f6c0b27375ca43e9a4b77fc2837489f7
-EBUILD mpv-9999.ebuild 7815 SHA256 d7868e4096731f4ed69eaa5f630622327941e5e0a27cc06be2ff0c584da3d894 SHA512 c2c8f910a64df13597702801f69e4dacf26458a7158e855de6378f528b05815205b6f833a9b30626743d90aab22c7bfe804ce13872404794809d0635e4854958 WHIRLPOOL c505b2b67f5794dbc0ffe23a50fb5f1290d5f8bdfd6046dfd0a821b1a08a116c90cfcfa60db09bac7f14cb99981b177b1ed1a6fbbaa51014957179e17fab02c9
-MISC ChangeLog 3667 SHA256 5f26f3db967ecccc454f6dcdf122a63dee7d39fe2833415ee8561962bd3164cc SHA512 290d61aa4e536abef14ac0aeca54f865fb5ffd30b89fb60d673feb7365d649e76723eaa769485c5c57c2e548986c8080b346b6d75ea118817d4cb013142b5ab7 WHIRLPOOL 6695a9dccfe8e0e2be3d8a17f42385dc54d89f50ade22b6ea29ae8144b7cd403d8def2cfa3acf1c404ade7adfbb6f52f2abf18a2dc49abd065f11aed00d9e331
-MISC metadata.xml 1321 SHA256 1e951d6688463e6728cdb83c41d23dc0c2840edfa7e03cac4e231d10e2a2655c SHA512 c59ef454cf661b9db0e1de5b8cef16ff87131743958071b36a1449a4553b08025d122df2dd91e9fff89cbf48e55000005e51b9228a399cb72eb87b4bbda5839e WHIRLPOOL c115f057f1082c14b01dfde758fccda25a0aa98e6255d1f4291fc2b05280f070494a54c5341887fbb3696be03593c3c47eb40aec401a408cb21677778898975a
+EBUILD mpv-9999.ebuild 7895 SHA256 39fed1f7007409060f6dca0bb696933c3f8faed43c71a956ffb040cc47e75014 SHA512 415e07b47e35dcc8bc77d596b00e8f8a615a2282f6236840534d5a5c27839efa728105307703e4b19cc4c7ef73905a40d6141973867e3fd2d49c4614fa41a673 WHIRLPOOL b9c1bb076c7b70587d5d26e94331c7ebc2caaf66792f9d3afeecd90fbab14eb00d2b6eaffb32148f197e308190f57afb8203ae3eabbb052776544ca036811247
+MISC ChangeLog 3800 SHA256 e0d568ac25d887e84d9e494976dde3333d2088c9961614fd72d2bd078a884e85 SHA512 fc7b2590358ade5ce254fa1d1d3d03bd9409cf683ad084b8a5ab1cb27a83fcdf46507dd28486f8ad03c5031ee770f5a37e48f3e604942a703ef09d5db9b97f69 WHIRLPOOL f62c0870b703c0f3081f03a9dd22d0d85e7a1a29948b8dd77c26acec9a64133517cbcb5f23317095f69ea4b7d2edbe3ed99d4d740bb197c4cac3f42b573f1a57
+MISC metadata.xml 1408 SHA256 0ddd7b21997148e1b3d0184573553f5406442bee5e907ee841908e7d069e07d8 SHA512 5572a3f43400a83f36b58e4cd276e0092984a304d821471b7aad9df597711be7d407aff65b6382f9e6afe1708140c658d9502aa6ce70f564524cc5b62d184f9e WHIRLPOOL e1917c2e7b7090697a93f0b736d03cfb58da6da731b010e3584ba2dd537650a9b6da883a57ef5b0bcf7069cd13056e9b33d342b02cdf9c28b71ae2a3ce02ceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSGf8dAAoJEOSiRoyO7jvoqxUP/R3agwSw8jrbdpNptaek81DX
-HjJpXZ+V+aWpu36Oxc9asYL/ZUdWcCZQNVz6XH6Nan6NttNV3a5QtCCfRDdXrpKv
-dHrXMNTpG+F5dAxRZw8RYy9el9dZs6Jyxwnc3YzGjIB2yOhB4RHfmPHlGse8LcrK
-WT3cwZNjjsbQa+YLaguOeIrsu8FIRQY303egS3/BlLy2X+3oLrY7SMK/y2qfisFL
-SQV4yIQKrFDy0wcVBM9AoIbHdopsPgpyxNlnbPA7cp1VL3gRzA/uv/Eq0rzWvtXS
-t6qtwWpgOQfJVHzCWbdIACKDHpTGEhe7PpXsninzlTWTqiJr38+o+bv1kW6rBc8Y
-TiVLqNA7V7qI8DM3mB25nYvhinAb+EHKxavV1uOuQ3jSNzdq7dnQHMY2uGUJqixr
-uO/HHKghTu3IYxW9l69n2fwA5aB5MtEssFX2oMHMU6CkYUgepgQogLSGgX2Bd1YY
-NdL3N18vWgUbyDxqnI/WK3xw5aBd5SrUBN7UeQIiRu/3J/JUHW7XkFsZh0eadn7x
-dvCCNcjprT2ALC5mJbQmoXkeFRbjBj8p/qyl2PGlh/caClzIjPUtXW+a4YA+QcJA
-xRCP/zaH4dl+GjJvPxDsibivUbxtN9MHkUI7pvwnFa+0vi7GhjuWS3F0YtRandKl
-dCsapPXqTjedP1q1ni0r
-=VzQI
+iQEcBAEBCAAGBQJSJEeHAAoJECo/aRed9267dAEH/3eVZvGdr/4FBBgXvlwwu1hr
+n/FquM4wZq8vYwhPuREzvcTcv3F0o+Ofbm/uv9eVL43ugf2bE0BnE5AO/XpxelfF
+Fq3beJqL+Lzbt2YIpQtuflQvA6BPVP2QBLetmEO4T07Snc7JTYCEuwA3ygvSlodt
+jfgRQNdy0E+woQyyY59RSW8VtD7GO5CnPMTgSCcS0loF15qY6U+5ojvsjL+jaJMW
+f9CA82YGy+6UR7VD9JrYYMDzf0SElqp6O8XVXW8/3yekPl0TlROVS6n1Scs59lue
+gI7NRlzFjBdDiwxYw7p+AEZAXJ43+X4Xsg/DHuHIdi9685XbjQp1X1FJ2rC3Kak=
+=sy7E
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 2eb6022b99c1..66302f793406 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -19,6 +19,7 @@
 	<flag name="quvi">Enable support for streaming sites using <pkg>media-libs/libquvi</pkg></flag>
 	<flag name="radio">Enable V4L2 radio interface and support</flag>
 	<flag name="shm">Enable support for shm</flag>
+	<flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding</flag>
 	<flag name="vf-dlopen">Install additional video filters for using with -vf dlopen</flag>
 </use>
 </pkgmetadata>
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 7347e3ae365d..1308de1e42bd 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.16 2013/08/19 13:32:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.17 2013/09/02 08:10:12 pinkbyte Exp $
 
 EAPI=5
 
@@ -20,8 +20,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa aqua bluray bs2b +cdio dvb +dvd +enca encode +iconv jack joystick
 jpeg ladspa lcms +libass libcaca libguess lirc mng +mp3 -openal +opengl oss
-portaudio +postproc pulseaudio pvr +quvi radio samba +shm +threads v4l vcd
-vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
+portaudio +postproc pulseaudio pvr +quvi radio samba +shm +threads v4l vaapi
+vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
 
 REQUIRED_USE="
 	enca? ( iconv )
@@ -32,6 +32,7 @@ REQUIRED_USE="
 	pvr? ( v4l )
 	radio? ( v4l || ( alsa oss ) )
 	v4l? ( threads )
+	vaapi? ( X )
 	vdpau? ( X )
 	wayland? ( opengl )
 	xinerama? ( X )
@@ -41,8 +42,8 @@ REQUIRED_USE="
 
 RDEPEND+="
 	|| (
-		>=media-video/libav-9:=[encode?,threads?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads?,vdpau?]
+		>=media-video/libav-9:=[encode?,threads?,vaapi?,vdpau?]
+		>=media-video/ffmpeg-1.2:0=[encode?,threads?,vaapi?,vdpau?]
 	)
 	sys-libs/ncurses
 	sys-libs/zlib
@@ -51,6 +52,7 @@ RDEPEND+="
 		x11-libs/libXxf86vm
 		opengl? ( virtual/opengl )
 		lcms? ( media-libs/lcms:2 )
+		vaapi? ( x11-libs/libva[X(+)] )
 		vdpau? ( x11-libs/libvdpau )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
@@ -86,7 +88,7 @@ RDEPEND+="
 	postproc? (
 		|| (
 			media-libs/libpostproc
-			>=media-video/ffmpeg-1.2:0[encode?,threads?,vdpau?]
+			>=media-video/ffmpeg-1.2:0[encode?,threads?,vaapi?,vdpau?]
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
@@ -252,7 +254,7 @@ src_configure() {
 	# X enabled configuration #
 	###########################
 	use X || myconf+=" --disable-x11"
-	uses="vdpau wayland xinerama xv"
+	uses="vaapi vdpau wayland xinerama xv"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done