Update libva 1.2.1 compatibility patch for live version; fixes bug #505586, reported by jospezial.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 30 insertions, 12 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b33b6c08da36..735b9dd3f457 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.896 2014/03/19 13:57:10 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.897 2014/03/26 15:29:51 tomwij Exp $
+
+  26 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-9999-libva-1.2.1-compat.patch, vlc-9999.ebuild:
+  Update libva 1.2.1 compatibility patch for live version; fixes bug #505586,
+  reported by jospezial.
 
   19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
   Temporarly block non-live FFMPEG versions in live VLC with USE flag vdpau;
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 10c5b3979468..5b698193ca19 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,6 +10,7 @@ AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236
 AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa6443e5e9f69528f1d668bfc53d SHA512 e13541f116a11e27ffc25a25ff3e94c7122dcfdbe4eed8ad97abe3b672df135648523716eb2d0cd191caf0b59af010b4aab48202b3fbf5f1f7d6ab2144093122 WHIRLPOOL 8c0278e069ea73593a57d013b045380fe99ff7cfb79ffbca08d9cd761ee5b3ebccbcaaaab939861016af38dee35b9c327bb573ee8bef36934c64bf3ab8207d86
 AUX vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch 1953 SHA256 bd1694702a2faef7175b746dd0bf710aaa155d07cfc8023ca3d503347844cb53 SHA512 9b0d8ab9ba8578d99dc098fbbdd2d04a73e2ba60b4a00308fb9b66cd1ffddf14d85a7f158766ff73b07aabc22abdf0257d2f3811f4a9377a5eb0ab19e7c6a3e2 WHIRLPOOL 637894d3fa9503280da9825168c3e894274b6dbcb67d1bbe0cee025d025b5ca3a2216d25e04cc3142f7579153a0ecac5d5969f2181af5491a5fc12319b1b16f2
 AUX vlc-2.1.1-freetype-2.5.1-support.patch 764 SHA256 424fd612665c1c3d8f9247053379de1f93f56f81cb788d15470076c583d949e4 SHA512 aa11369b9cc5a91a0edaf7e23ada1651cdab01fa3acd54d454358c0789db2b2539fc4200c798b6ac58448341f6a2cfa32c987d2a44ac1af815fa4c2a7b091597 WHIRLPOOL 9c11f2b6ba5b903443991654b80ac2f6b1fe898c08b5b3c8004c3cc11fa5a9f4b20fb76e5eaaf137fcdb2a84e871a357aa72d3955668e5301de63ed4d1ff3d79
+AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb97097030f1d372bb81b63ef88231a17e5f237 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 WHIRLPOOL df5cfdb4ba36ccd92e79de7b913b14c5416aca0834025dc51f8178db6c88f5eecb332ae7096800607d6f7526a56c7fb94e2f593bc0c0e19f643428bcd3eb5868
 DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
 DIST vlc-2.0.7.tar.xz 18538256 SHA256 243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314 SHA512 6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2 WHIRLPOOL 7524f518a8c4575ac417261857326dcc6a2787cafd09f64a181fd597358b04433be09a4f418eb1186bb093ef467bb4de75f809721c392d60c117e1eefa0cce48
 DIST vlc-2.0.8.tar.xz 18858236 SHA256 a02af28345d4560e718066623f881b6eaf29ddce3b778fbf839e08b2415d1702 SHA512 ef096dd71b7e019ea96b1e75235f2e46377ae4c27913486233bcec15c91239bf32b9634b1c81b8cd665512e00e2ed29c3d2bf70244a681298b15d8affa0a939c WHIRLPOOL 6bb2ba95854bf67e8f28ce4aac00e16d1de6b84dd969432c76b1ea32ce36568f80e5eb79a1c5d1c4f608bfe17113de656d026a53670afca6ff5abfb8b34b11e4
@@ -31,18 +32,18 @@ EBUILD vlc-2.1.1.ebuild 14111 SHA256 064cd3dcc88fbf40334d9345c3fb801a4f1cebc2663
 EBUILD vlc-2.1.2.ebuild 14111 SHA256 bacaf3cd5b1182023386370d5fcc8c00484c8f258095413466e48277dc80cfb8 SHA512 cc29d52ef9ff0dc2eb2474baa57720d3db3788860c0051fe59d3d2ed312242186d25b49e385b5a90c2f48950c1cceb2bb85e4ba9b06c8d550fec2272cf9332ac WHIRLPOOL 5224e7ecf47f38b6ae2e5dedb1c0bed9b4d866d33234d4f501d6ab9dba6d581e4061b9bf2471bcc5a2e4ff1aeb3fdc5447352ba243746d6f6fa702d62d6a9927
 EBUILD vlc-2.1.4.ebuild 14486 SHA256 c4de16a8a6dc508c7f0a04711c5e0b4d58ade2c62a48a25bd63b5fffcd00c90c SHA512 8e9071cd163df3026ec83d5cab4917a3bf978ae470ff1e12279290d441dd266a9c586d493027249ab717351bc2c7b920127e458652721629ee2187ffdb0b7c61 WHIRLPOOL 4f22a732c503aa8707636f99de7248c03b883efc93cd8ad4d61fc40070a782704e87e64ad89b93dd5b74cd21fb0c95e1514c6f6a63c6500343927b7b0d10e915
 EBUILD vlc-2.1.9999.ebuild 14502 SHA256 a2b9ba15c8697fffecff6ae091be6a163ebeea3e2f63a76844ffc9f62392c691 SHA512 235848446bca021d4db005d4e932471088a2043373196f8f3244fd960b625166aaaf73b14bf7d9a2196d157923d3174c419d716f6842bca3b0fe9ee31e3b5bca WHIRLPOOL 41da9a81b1f763175ce0f1088933ca252c5bbdaa6bc6d2443d762c814b83cca8634ce8c4ed40473d6797608817c0b1db4f52c68f357230fbeaf61ea6ac6c6070
-EBUILD vlc-9999.ebuild 14837 SHA256 6c929fb1be611e24ba0ade54bcb8fb4f6639bff2ab9c4c07f37df5ac25d59b2a SHA512 9800e38317fc88800620631c16fb2faa6f4222243ebe5387ef1507a93561e37a83c8ea7bddc1db987cea44cd3f168c12db06c0cd8652c1fcbd23f4c809e77a2d WHIRLPOOL 2c0127aa07d7a20736d98ddbd86dc5e96d4e999975b7bee159bdfbdf6c009cd7918bd041e741453b6846d2f99d8e9d169effe995fb76c786f60402ee3ae7b128
-MISC ChangeLog 25767 SHA256 ae61ee7c60f3e17e1c8ab57cee40040c42b0c7191e77feddf71ed8a177758c7c SHA512 0fb7b95a1c3d88c19e7fc230fac14db5f8cc4653e56d63a837cd9d861b2cbd1f5751ece59d9a3281a33a6ddd7ebca33a8c020a8ba0641ed7c62c366c8abcbc33 WHIRLPOOL 10123b4c199db560fde26fe41af46c76a3f1a9a891ec00eed7424d3ef7182d42e93fec2441179f2568823c6fa3c193359048f52baf8e7df491d6036a4f90bd56
+EBUILD vlc-9999.ebuild 14830 SHA256 4537716748a2d409682cb502aa9df759cebb146e8b526119bf21c15a94ee4273 SHA512 6f2dd5dde43e775127be0b878080e52219dc6dd757a1b283d115dc8c565dfe6c749698ed3b29a1574ad3a875857304ab6f0a1f652e2575d7da4c1f1246c96a21 WHIRLPOOL 8b2188697b707ad8d87dfda9d116a1924bcb2bdfeb96be9184c346383f629b1d15ff35a8d1488ba2187d2afab9283e64b882d44ac71414320e3772ec94211978
+MISC ChangeLog 25979 SHA256 ef6e452dc4d5970559878403b0873e71ac09c3f7f7a8ca038b37f80b090f9726 SHA512 0e39d0f05e10596497b72927e7736551d97cba8c092d8dd19fc30a693236afc6857a45da8e154a6451777729d6257a8b3e055d0473e4371e08fcbbf14a997c36 WHIRLPOOL 84ea684e5ae0f43aaf4afe7c5e410155e4c276e7332c562b6a7bf2ac30c9722707b5d13f56751e96eb6e800b9637e9d74e1619e29e66cc6a989722bf3af3c2b7
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 7078 SHA256 06f15f0f664689d21c79529dcd73781bc7be5c087df60cb7512c634445ab62bd SHA512 0186ee55a67cc50a935a7fb39bcbc3119165f27c342bef97695262c6cebf05a792babd899a7933dc79e2255b01d26b9f737c1f55b2b329078edeac3ab4a57319 WHIRLPOOL 674a810ff112b97d341e2453d97d15f4e82bddbf83c61baa970e19ebdf45d3193bd7509f889fea72c309a64146c2879e1bedcb0f9d0b18a3c71fef3990b080c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTKaI0AAoJEJWyH81tNOV9azgH/AtiW8JOPqGL3JBQUTB8oine
-DSNve4+Jhwm2eWwJaG4dnlO9hNKi61UPMcwc1zpnW2waA8T64YZrNgQoUQZhTJQ7
-oKIC1HFV7LAeGxFsxSiCIppRt7rEm5YBEQN8Z0nfPMfSwN8kStezAOzYuSas0Qk5
-79jIil6edAcaM7UMWZ1y2AENXP/x9L7D7GXLrzwvcHlDrUM8XGRj/g23QQ8DmhqK
-wxxdkrJFx/YUTMZDvjMp84cfAB0RKqmU1gM2crZl1TOaBBhr8naNz8JF971yEsWf
-OaXrIbUqe4mKGsq8GZF5zJmfhWfur8syDxxI+Lw8c7dVgThcSsuxIA4X9bMVDtg=
-=vrVp
+iQEcBAEBCAAGBQJTMvJjAAoJEJWyH81tNOV97TkH/i7bSAdVRMTECjT8QutglZnV
+3Klndj+O5jup+0uqS3ibDbYNky9Al00JrnGNyJxreLGqogkjrh9xHCVwncvqA5rG
+dsUH/TyHlcGqVvktcgADV5XIHjw4EFIF2NYhpTA58J6BjExh66IjPIugyOovbneK
+055pktUJ5j+UnH421n9672RoJOIMC2TamNshWNazkULz67/ffsyCiHOjsVvha+Qr
+RonFbnPr2oARcGO/xMlSh/7flGXBPG22A9yaMyqfmMjV7OlP01gRx13aejtnix2W
+VyMEFE6SfrxfJJOrrM7L1qdDdRT3HgjtKVZAoEVtdAFDBLT0/gmsY2+5X36JV98=
+=HMzV
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
new file mode 100644
index 000000000000..adfdefec56af
--- /dev/null
+++ b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -34,6 +34,9 @@
+ #ifdef VLC_VA_BACKEND_XLIB
+ # include <vlc_xlib.h>
+ # include <va/va_x11.h>
++#if VA_MINOR_VERSION >= 34
++# include <va/va_compat.h>
++#endif
+ #endif
+ #ifdef VLC_VA_BACKEND_DRM
+ # include <sys/types.h>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index fd4cc386975b..62365ad63076 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.215 2014/03/19 13:57:10 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.216 2014/03/26 15:29:51 tomwij Exp $
 
 EAPI="5"
 
@@ -244,7 +244,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
 
 	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch
+	epatch "${FILESDIR}"/${P}-libva-1.2.1-compat.patch
 
 	# Fix up broken audio when skipping using a fixed reversed bisected commit.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch