Fix compability with x11-libs/libvdpau >= 0.8 wrt #517778 by Justin Lecher

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 75 insertions, 5 deletions

diff --git a/x11-libs/libva-vdpau-driver/ChangeLog b/x11-libs/libva-vdpau-driver/ChangeLog
index 7365c812b417..aa355da6f16f 100644
--- a/x11-libs/libva-vdpau-driver/ChangeLog
+++ b/x11-libs/libva-vdpau-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libva-vdpau-driver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/ChangeLog,v 1.8 2014/07/15 15:47:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/ChangeLog,v 1.9 2014/07/24 15:28:12 ssuominen Exp $
+
+*libva-vdpau-driver-0.7.4-r2 (24 Jul 2014)
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch,
+  +libva-vdpau-driver-0.7.4-r2.ebuild:
+  Fix compability with x11-libs/libvdpau >= 0.8 wrt #517778 by Justin Lecher
 
   15 Jul 2014; Pacho Ramos <pacho@gentoo.org>
   libva-vdpau-driver-0.7.4-r1.ebuild:
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index c267784e84b0..f9699acd54c0 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -3,18 +3,24 @@ Hash: SHA256
 
 AUX libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch 892 SHA256 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98 SHA512 f60e84f88eca17e762e3d5a53404d0215bca27051c02ff3e4441ad2c2897c0c04297b8e7b4693c37404bde95d7b5d7a6392b4c17ab1ece5f1bd78e6af376b301 WHIRLPOOL 801511b1d4d91ffc50f03c1ed53b5469db495fe62b88ea987857e2c109b53eb441aeabbd1043c0f265ff0bf020da090ff978239d3b8d4d2e89e5e2fff37ca591
 AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 SHA256 031f1a6b43c20fc3ac2f9da841eff02f6950569cb34f0b4be9fc93642d2dd927 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de WHIRLPOOL 2a28f72863c6fa0b36f99d398dead39051d895dfdbf3929809d3f5185a121569da96148c2c49a7ccd17cd3ded058f71de0be18fd9ade6844d0989c0d02be6ca5
+AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 442 SHA256 74b9ccd36e7fb90655e0855cf62111fd555390d1a396983af5687b9e8af64cd8 SHA512 969fb8011408acb2bc78a52672cb5a227ae876a2beb5cf209ae558031d71cf255849d5aeb301479f420de97a69b0055990d4ecdd3e0c684f678845b08e6b6632 WHIRLPOOL 22ee9c6a5dbc9f62f28d6602ceaf9729753d45eb1b097005df1ab9cf4d4c06ea497dde8a6abeead13707a2c0412dc510a927bc44240771ff08adc82de74f96c1
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 SHA256 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 WHIRLPOOL b6ba281a482dc944acff67d83d26d5a5ac7f15ea1de05c921383bdf0f6dae769d0389e6d15b607e01a8d4e18d3254f66391bbd497aa4e0eed2adbab54a13bce1
 DIST vdpau-video-0.7.3.tar.gz 400121 SHA256 28f66adc7d87a513a765dd79fda469e895b76692173d2aa79a26f4a618f91266 SHA512 ddaf232dcdd207939e659c88eac4f38a212566e95d6a08afbc22d274585c7a0972c8462c9273b26459628f95ade26081a171f9140cf857386d341e1dda98d63c WHIRLPOOL cddeb9c7de9176b82f11bee96be78fa6be613d1e097f4070e686f6d08a448567a7092f36673aa1c55fd5d3c7493390714c9b1031bf1820a64cb46fb60537685c
 EBUILD libva-vdpau-driver-0.7.3.ebuild 1052 SHA256 cb93ed4cf6bd4e5d96a6bb03e98a5ca39926162c370dae1f330e21e6681b0937 SHA512 34a536dabe2b80a9ba76f01406f352bc43b639bfce1a37ae406d7b973b52dcba861b03ea25fdcb8ca2c37910486618f7b68068c36e3fc53b1c711bec090998cd WHIRLPOOL d761ff628b11391918b40dad39cdad6c89042486b6c247c4c656752702fcf473e34216cab10c9c76c7a5bd4c279344ffa9610185918a863c5f22152a30c3a9af
 EBUILD libva-vdpau-driver-0.7.4-r1.ebuild 1221 SHA256 a6acc0eee99de9091157b95a7d8e1116ff1ff2674e8ba90225c379428790a94e SHA512 c9aee9a973fef0d9e351c04787ae449277dd34b1e2c404e7dbe3de8f1810358126adee95389f244f1db622c9d8c618c7e75046fa8ae026ba366ebd46200adcc5 WHIRLPOOL 44b087e9ce87cb59e2d1b94c2315e785ee7ee5cf554f0f4e9ddc5b7af1dfac180946b00653fc5d83eb2090fdd9931991391b97a2d6ec18f44a3110f968f81416
+EBUILD libva-vdpau-driver-0.7.4-r2.ebuild 1268 SHA256 54cf25097a4531cbcb43bcf09342825af7b2d271fe33261ae3064bb4ff83cc4f SHA512 33e53e4986e12eaac6daf3340edd0be100d363cb073331a0cfbc810de74f246a807ed12cb71dccea4e008e9b83e4d0541bb5b5392b6206ef7f06b42f004ba86a WHIRLPOOL a93f151c304a60377c8c61f93eac12f4adfa3e1081b8fe7dcc46d801b7b7ccbcd9ed5ccdea01720d7744328ff262ad04f01cb108b21815c063f07543031bf461
 EBUILD libva-vdpau-driver-0.7.4.ebuild 1115 SHA256 bc032f05336565738817202b79f0c344e067b70926eee462f2859eeff06af6c9 SHA512 3c78b5a695bba075cbeb0974c6f99bd730e04da3e154c569e2cd561551d532db2657d91904b3bcb3ecaf1206bf75d6cf60be9faf60fba298a72802a7e21a394a WHIRLPOOL 8259d12ede7d4374fe916fb32748ee282f0554d7932439980a9af239160871b1e50290e0a6884f765aea786ed47ff921101e184e75988a2594b03e6f7b205850
 EBUILD libva-vdpau-driver-9999.ebuild 1299 SHA256 9ab0f0adb4f08743ef52f0bfe7b837c1f386b6fda0e857126a2a9df3b81ee5ea SHA512 f3d14be3db94e12244b2689aedd0d09e0e9b85ddc85e6984811cd91122844b35bd5b2ac6e9055e1469d9b2be734f006d2c5563e4b1308f3f9b0bc8532a413cfb WHIRLPOOL 9958e5f6eb11ae9ea923c46f1c2d0bae5328e7161fff1d449120961fba1b2c94e51f070777e33973353c380294fceed33d2c30388593eec82e146deb5d3b8699
-MISC ChangeLog 4466 SHA256 a4b9b0e185eb32716881c63f29aa1640ceb7f1a2e6142bcc350636a9ff448f16 SHA512 ff031f317ae6d1a38b6f800c2de7627f5ff483d877c071fea511074768192f1f09c1a1c606c797e38fdb1d214864c257a1541a5f52a1b0a35cb92535bc29a9e1 WHIRLPOOL a5eb7d658a2b81e7bf786843a8372c0cce4b8230a8d2a9fb13045600e6e201d3cd037265581748ea7b270c19e6da1b71a8c9d4ef19c458cade5f25952bd02583
+MISC ChangeLog 4739 SHA256 ba54ac2d25383dac1554d32b16d992148fc5f2ed03577ca5d38888468c825e77 SHA512 16628b424d879e839ead64be5a050a6a07c30c5d46dd28d9e47e237beb24cdbe452763e264bccff377788d391cfd215f9df007eecfec3fab002f4d31727c97fa WHIRLPOOL dd659e198d7bd7b5928b41580efff04b3692660857886d3a7628de73f227966b7ca7a1d8784c9a1f46fec16038e0dbbb37605c4cf31260843a43fcc48a3bfa0b
 MISC metadata.xml 260 SHA256 b988a48d8a4e40a98f84e7a463852923b7f2103584e3ca7a46a9212cb621125d SHA512 438a7ea3bc4a9abfa5da583ab08c3a9c195b384fdb6d302996971b0249826cf5edd290640e8d210081178bc48a9df796c9a7d3279599f437eab6e9ccaa32251d WHIRLPOOL e42bf3eb50d3c67373a648d1de56c66c61d6f1ab7762993bdce2adb86254a8bdf219bdad0a849468102d6f3bf6d520bb007e7c28193c52dc331d97eebf42fec6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPFTRUACgkQCaWpQKGI+9SoRACeIOl8XalWuXx+9eA6XSIGN1zZ
-NygAn2wJ1ZbdXOa534GPyc2pfgLAAEgo
-=FaBe
+iQEcBAEBCAAGBQJT0SYLAAoJEEdUh39IaPFN7vUH+wSJziyAIT92/s00hfD3k2Cf
+xWHVeCYDgYKMuO6o3e4h64zfTs+DnUEabLHpxoGUGZIlUBNB0UTzt6J2ewOqwJef
+wFj45a9ajEw440xucbc4NDIJ3AirzYB0XjrtT2Cj0BHgm3oFdrP4X3aKvegvrmj+
+JsbVPuT5KLK7KmVywMVN00A4MBwdUgAcz8Ht3owj8SI51HDLEvVdQt0fh6UkWdpl
+pH2uO8ivnp2s90Bv3ZTBno9omwWlJsdgVUl40Pq6uGCP2ol4qY2476HPL9k8kl2J
+R14W94BifWt2DiZz54OmEOC0rx8tu5ildN+lzaDj8CDrFDAubBozZP1fwNCm0FU=
+=Y/O6
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
new file mode 100644
index 000000000000..6d6d47ad0b06
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/517778
+
+--- src/vdpau_decode.c
++++ src/vdpau_decode.c
+@@ -1289,7 +1289,7 @@
+             driver_data,
+             obj_context->vdp_decoder,
+             obj_surface->vdp_surface,
+-            (VdpPictureInfo)&obj_context->vdp_picture_info,
++            (VdpPictureInfo *)&obj_context->vdp_picture_info,
+             obj_context->vdp_bitstream_buffers_count,
+             obj_context->vdp_bitstream_buffers
+         );
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild
new file mode 100644
index 000000000000..691b425e6bfa
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild,v 1.1 2014/07/24 15:28:12 ssuominen Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib eutils
+
+DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	>=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
+	!x11-libs/vdpau-video"
+
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-glext-missing-definition.patch \
+		"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \
+		"${FILESDIR}"/${P}-libvdpau-0.8.patch
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable opengl glx)
+	)
+	autotools-utils_src_configure
+}