add patch to fix issue with xcb, fixes bug #541928, thx to maintainer for patch lodged upstream

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 32 insertions, 7 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index abd7afcc3d7f..8ff55cd80512 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.945 2015/04/18 06:27:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.946 2015/04/18 07:05:35 idella4 Exp $
+
+  18 Apr 2015; Ian Delaney <idella4@gentoo.org> +files/vlc-2.2.0-fix-xcb.patch,
+  vlc-2.2.0.ebuild:
+  add patch to fix issue with xcb, fixes bug #541928, thx to maintainer for
+  patch lodged upstream
 
   18 Apr 2015; Ian Delaney <idella4@gentoo.org> vlc-2.2.9999.ebuild,
   vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9a61cd98ab0d..c8434ac3191d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,6 +6,7 @@ AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 SHA256 91752f1ed1fbe
 AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83ebe2bcea78a5247798a74c0b86ace6d39463 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae WHIRLPOOL 39d9d1670e244169087ecc81654b1d6407c9e5f0f0da1bb1b15d7c89a7dab232b9a174c2a5e9ed2586a57a370f3cd9d2c9434381387a1fbc70b7f7bd8de2ef85
 AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236486a885b9f64b4c80004db7964b2b931c1 SHA512 74cba8136b2abb7a78b5ee8c8b5a9b3509a4a16ff9d4f136a3a7e2d6ff634ce20e34b8d140810ac63dd6cd3115d71cbb87a6e213fb172485494e55ade1b5230a WHIRLPOOL 1d2e747f4097c7903b798d7dfd17e11de41c01e903afda0b2c766ef5d7977da32362c52e5bc41c93a1f801a93c857c08d2cee3840f76a55afe0b2a768250073e
 AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa6443e5e9f69528f1d668bfc53d SHA512 e13541f116a11e27ffc25a25ff3e94c7122dcfdbe4eed8ad97abe3b672df135648523716eb2d0cd191caf0b59af010b4aab48202b3fbf5f1f7d6ab2144093122 WHIRLPOOL 8c0278e069ea73593a57d013b045380fe99ff7cfb79ffbca08d9cd761ee5b3ebccbcaaaab939861016af38dee35b9c327bb573ee8bef36934c64bf3ab8207d86
+AUX vlc-2.2.0-fix-xcb.patch 732 SHA256 bee17ce12d869ba809a6b7120d0e85f26c4dbf2f0f4af950f1bd473e0677675c SHA512 7eef6285f61931b291db8d667ca8e14226bc1be63aad95cafb6a68746e85c55510b8bc6539d6a3dc5fd18587529798ac8783b05c561af005cfb4619dad5eac01 WHIRLPOOL c8a9dfa236dddc6dae51fdc35af59b80d84e0900f15d76ef16292a4fdf3100425afb7380c4ff4b597f24825d98fb61b7c69d6c64c9d81239b8dccebe92f47d61
 AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb97097030f1d372bb81b63ef88231a17e5f237 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 WHIRLPOOL df5cfdb4ba36ccd92e79de7b913b14c5416aca0834025dc51f8178db6c88f5eecb332ae7096800607d6f7526a56c7fb94e2f593bc0c0e19f643428bcd3eb5868
 DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
@@ -13,16 +14,16 @@ DIST vlc-2.2.0.tar.xz 20861760 SHA256 5e0a27e248c47da723a696420aca3a4dd15cc3ed8c
 EBUILD vlc-2.1.2.ebuild 14652 SHA256 f349764f2fe11b16f89fa6d48048722b21936dc59d350ed59c9c19ea4861118f SHA512 05b0f1f9f1309208359b535ec1b47a49b9a03ba0a46e889bc4bda69d9abbcc602b139df660f9ea0fe9a513823e262ab0c97a9e320d24c6ca2afca91e72297d2e WHIRLPOOL 6b096a3ae3d7eb8a3f89031ceb61fbb5e87a3e04faedb1c43a939f26eeb254c8add24473725c84f2b36f732920888b2cd183019b8bcdfaf5bf61ef3f5101ef57
 EBUILD vlc-2.1.5-r1.ebuild 15387 SHA256 97a50e19ac49cb4c9dcc6853fdceec04e4f00c1f856dbbcef1763852cd7c94ab SHA512 421f017215367523e62cac6ad89931449f76a78d439fb89b44e9a4088d6a199baddb4ffcef0726bcc94968540407ec993a9e560c53f38f1d547152cd17b4b3cf WHIRLPOOL cce9190e813c6b34fe8fde31061d98e526eeb61e06522978c3401b03b92095143e2d201c95e098dd03f61c7ac12d7fdc8e5a2d437e1861c9293a756fad427245
 EBUILD vlc-2.1.9999.ebuild 15308 SHA256 9ad081efa162ae762eaaef79510ce450ec12460fb11c864d25542828c387d925 SHA512 83864352df405eb3872a8fc3d546c91114e5fc7cbb74ed767d94ce4299787dde8fe8ee97c26fef1597809b524e7ce7a49dfd95774e3424e87ab64f122144de8b WHIRLPOOL c52b17f248cf34e86a4a469662d674ea8b223386a152488747b75a67bf8b0d1e0c6e4a8dfefab4aa7be5c804608a73be0eba539009d13ad31bc286efa0635620
-EBUILD vlc-2.2.0.ebuild 15525 SHA256 1bbf06b50829da72a031a9a71baeedc87c07356e294ef3bdb0b7d80c16b19cfa SHA512 a90ab2505671d6180e2ea36c880b9cbdd80b6b8e2154a435b84b2c5281dea2116df25c655d7d1046727a499b38269ca2b0a244bd8f539abe6284a1a98f1cde76 WHIRLPOOL e5997eefeeb96bd9cadd3c6b2a012732f616e934764095a9ac442c952272e932b27870200f2b87b7af231fcfc3cdaa684dde9203ee7e600362120048372e8246
+EBUILD vlc-2.2.0.ebuild 15582 SHA256 23e1bb3e2591b34a339773fea29a085122c36601c4b3c425456d10e526ceef4f SHA512 46db3ab721c3657a1d3aaa191fe79e173c39096b83e4181ea2c4e100039553f76d13a492d0579e70d215c25c12041ba19b4272b7c9a13d02ca717fa0aa4aed00 WHIRLPOOL d5bac1409c183bde19285db15fb38695a22bd2868ff660af79f26858ce5d75535e4a9d2f450e4b4cb11af5cf06cf6707546d1d355cdb360e35fc2d11d2214f4f
 EBUILD vlc-2.2.9999.ebuild 15500 SHA256 5742f7434783bdadd32c62363cd4254cc15baf850c5b3941ad7ceea4f92a94ee SHA512 75ab0c7ca577d2f9e02ceba1a8aba7c7a70baf3e79ddf4ca30122ba42498af86c13592d274a741125278f39ce4d9a6a1202653f3cc8adfec53151172f87c2565 WHIRLPOOL da1c15a418b11f63261d4108990494a1d4cbf40c3777962470fc754ad5d55fc478e2ef3d4c4e42692939d7cbfab18623f5afded4d3f133dad9bae78a22cf984d
 EBUILD vlc-9999.ebuild 15491 SHA256 4bad4f9a24d0b96ff50c3f5d5264bccda22f985a999571f55088d1bff5f344e7 SHA512 d89daa6515edd01aae9e66bd4cfc3939f0d15b4329074d5bb846878b81c801ed520e51f3bb8a4f0e43e7b34a6b8d64bc695bec03fa6ca4e17a4e0eeeaf8eb91c WHIRLPOOL a24f4a8395e0fc87538e247d076fc6cefe01101ad2ffc471ee90c176efa4d5d6dbf656d771d08be64703e50d9953ec98569bc9ff1c78092122cacb58f9730dbd
-MISC ChangeLog 36169 SHA256 5105e5407ccb8d2bae066459614d9aac7e637aff2232613dfe7fce39b7224164 SHA512 f04340f4f643b4e029f8b89d14857cfbc5d6f133f9ef14f4c0f252e50a9737048601e2faa006d024e6f2ca3e37d81d39b39e38403b7073189ad0aea961b96e19 WHIRLPOOL 19d77297622b3250c2620fc98da5f7e0041e09cbda91139ba395a2c95f710c082136aa0d6c31039fe75b7484cb3ded7febb0c3effb8e926f68eef492da96d94b
+MISC ChangeLog 36370 SHA256 49afb236fe0bbba4b5371ef91a0ae315ac35a1aa807fbe77283da305f3f5b0ca SHA512 c87b086a74818b510dcc3b50b2616ff6d0ae7b0fcc0268f00d7395ccc7c0d67c11e774b1a4d3e2ea4a1bb95a9f9584ccc3b441abfd89fddcb21b22cbab459ad4 WHIRLPOOL cfbaa4b7fcac1a66e14656a376b1f2f56ff32fe86fc67d03fca8888cade1cfd601c61c9442bf9c667fa45e4bff0dce163efdd9205a2d50f739ca44776e9b8e16
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6538 SHA256 cee37b9633b574305f8c07a19d7eee2d4362bd6de51822f98b7f150367ee5fe1 SHA512 29e8b36e5e4c89fdeb7cd3a9e9014a03855540d5b8246172febd4a5465cb50030187366c4d2c982115b08e0cd71e72e9dca7d49fd6ab8f263ad5b718df392345 WHIRLPOOL f15ca39b118e250412484a3be271f3eb2f476430e4957c77596cb11ca51752b80410e820adb559409dfd43fc631fc3262c87ac3f3ba2e4e8c53eb75c5a3baa8e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUx+WQACgkQso7CE7gHKw2hoQCcCJ3jTAZzB14WJ7dosiCbIEmg
-VewAoM84ki611NSV/mCvRo2XEzCEjKig
-=FWmp
+iEYEAREIAAYFAlUyAkwACgkQso7CE7gHKw1TAQCfW7BZARzed/DFUOkvPG2Zjo0l
+CSYAoJ9LlpwW/4uESpMGoEh3ivYz8f1J
+=lvdv
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.2.0-fix-xcb.patch b/media-video/vlc/files/vlc-2.2.0-fix-xcb.patch
new file mode 100644
index 000000000000..c6a1b94658d2
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.0-fix-xcb.patch
@@ -0,0 +1,16 @@
+https://github.com/videolan/vlc/commit/c354efa3a2843d479c8fa9e929ff1064e5526bfa
+--- modules/hw/vdpau/Makefile.am.orig	2015-04-16 22:29:26.299342749 -0700
++++ modules/hw/vdpau/Makefile.am	2015-04-16 22:31:40.886340950 -0700
+@@ -45,6 +45,7 @@
+ libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
+ vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
+ 
++if HAVE_XCB
+ libvdpau_display_plugin_la_SOURCES = display.c
+ libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb
+ libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
+@@ -52,3 +53,4 @@
+ 	../../video_output/libvlc_xcb_events.la \
+ 	$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
+ vdpau_LTLIBRARIES += libvdpau_display_plugin.la
++endif
diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild
index f226df221fdb..513e8bcf9e04 100644
--- a/media-video/vlc/vlc-2.2.0.ebuild
+++ b/media-video/vlc/vlc-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.6 2015/04/18 06:11:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.7 2015/04/18 07:05:35 idella4 Exp $
 
 EAPI="5"
 
@@ -258,6 +258,9 @@ src_prepare() {
 	# Fix up broken audio when skipping using a fixed reversed bisected commit.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
+	# Bug #541928
+	epatch "${FILESDIR}"/${P}-fix-xcb.patch
+
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die