nsplugin requires xcb, bug #329343 by Johannes Rauh <jarauh@hotmail.com>

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

5 files changed, 27 insertions, 17 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 773b4b023b1b..f17794e9f270 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.611 2010/07/22 06:24:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.612 2010/07/22 06:39:54 aballier Exp $
+
+  22 Jul 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.1.ebuild,
+  vlc-1.1.9999.ebuild, vlc-9999.ebuild:
+  nsplugin requires xcb, bug #329343 by Johannes Rauh <jarauh@hotmail.com>
 
   22 Jul 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.9999.ebuild:
   remove patch merged upstream
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 837fbc4e9137..676a7e4e3c8c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,15 +9,15 @@ DIST vlc-patches-86.tar.bz2 3359 RMD160 29db216fa1424db0ad5cb0a129b01d01ab08141b
 DIST vlc-patches-87.tar.bz2 3793 RMD160 0876f924de9130612835cea55b7b6974a045ae0f SHA1 55b3dd9d706e859ef9a5d845dec35ee1f5be17c9 SHA256 d4ef1181f97719f285bcc1a8763a4ddb04f6fcea17a2c7669aeeafd8b02224b2
 DIST vlc-patches-88.tar.bz2 3341 RMD160 b29676117f2a4033e66f4c956b5de1cc1be872b0 SHA1 93bbfd854270596fa6e5084e68c93a66dc73c616 SHA256 64544578d02a9c2cfa5aa9ba3181106d9e631c5cd2989874d632caed38acd3d1
 EBUILD vlc-1.0.6.ebuild 12224 RMD160 5a6b842122fb912a688c23e23dd8aaff77d1532c SHA1 2dd9d563450ae53fd833fc4d6de9ddda288d41ec SHA256 a451ef21f95174ee1bbd78526c233d7c414efe64e66dca5b487089921d6f3055
-EBUILD vlc-1.1.1.ebuild 11757 RMD160 e70db9cc3e88ad57991069d5b8fb04942fc09a4c SHA1 8de99a054ec211149c65109f063e75c0ee0dbfe6 SHA256 eb0b04a25c35f9572087c42cb4eb4e7c066e69af7e165ce41a9a69441106cd1a
-EBUILD vlc-1.1.9999.ebuild 11721 RMD160 47897bfc35bb0f368e2e88d6183c250ca5974441 SHA1 f43a54b14ab785e3350c07efde992c787699f86f SHA256 95262c8067f98b5c0f070c866de7c83e5b14c06842ea21ab4ab57bf85fe56e54
-EBUILD vlc-9999.ebuild 11545 RMD160 87883c52ef9d4f867372615100316b1caad50066 SHA1 60564c4e2cd304293c96ce85d5cb172df370484b SHA256 8703affd3aafe1e36abd6f65cb69e1408537a8cc330bfd06a02f7813db929a2c
-MISC ChangeLog 94369 RMD160 affa27e380a98bf6ca943d558478fbe0164e5ade SHA1 a7aaf7711e093edae6d55806bc40d455c91378a8 SHA256 4afae8973a6b5356ed8e860ffae5b12080f55e63f74d381d74257e5b930704bb
+EBUILD vlc-1.1.1.ebuild 11860 RMD160 6a80c6132fc06f09f0e5b923b2366e96baad4839 SHA1 4ab4b810286054583735244418b87abc65a486f0 SHA256 200c842d66bea834f03af69919f050b79d3690887e032e41a6db901689cebff7
+EBUILD vlc-1.1.9999.ebuild 11824 RMD160 2f3893d8200683bd6a08409b88b673a932b43892 SHA1 8e34ce10e6ecc1fdf9e1295ff1c77475dff3f04c SHA256 65924ba15a8198dcaa51c5594aa9929d4313fd44c3f742550285f5e71b58a4d8
+EBUILD vlc-9999.ebuild 11648 RMD160 4b2fd3f6ccbf8f1a11b496bf11b0a9407006f051 SHA1 e853839f7d99275fcb41b87557f2e25506a6e91f SHA256 99406630bc8b8bb25adfd057c9d62fd607cc8a9b02aad670a960aee39b098824
+MISC ChangeLog 94555 RMD160 183b40f7aa093870a6694f7a61a19ce7afe44e5c SHA1 d661c17c673c10bffd6f75ff5dd870bc85e59cd1 SHA256 75b7f2604e361a54fd371fa4345ca7305031387c60f886c9b589ed2b85864fe8
 MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxH5EAACgkQvFcC4BYPU0queACfZW+z6/SiW1GxQoXGAyHtCmsQ
-zjYAnj7oiXRW2AfGGmTaOku8vWv6gylJ
-=eq5Z
+iEYEARECAAYFAkxH58EACgkQvFcC4BYPU0p3uQCfdEVqY/C7GrRT7usImCBiNOYN
+yuYAnimRtBUuffFc0+47KoPF1gTP8MCW
+=MXsg
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.1.ebuild b/media-video/vlc/vlc-1.1.1.ebuild
index 2268eff55b35..2ab2c0f01435 100644
--- a/media-video/vlc/vlc-1.1.1.ebuild
+++ b/media-video/vlc/vlc-1.1.1.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.1.ebuild,v 1.1 2010/07/21 07:48:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.1.ebuild,v 1.2 2010/07/22 06:39:54 aballier Exp $
 
 EAPI="3"
 
@@ -99,7 +99,7 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-1.0.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt )
+		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl x11-libs/libX11[xcb] )
 		png? ( media-libs/libpng sys-libs/zlib )
@@ -177,6 +177,7 @@ pkg_setup() {
 	vlc_use_force skins qt4
 	vlc_use_force vlm stream
 	vlc_use_force vaapi ffmpeg
+	vlc_use_force nsplugin xcb
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -329,7 +330,8 @@ src_configure() {
 		$(vlc_use_enable_force skins freetype) \
 		$(vlc_use_enable_force remoteosd libgcrypt) \
 		$(vlc_use_enable_force gnutls libgcrypt) \
-		$(vlc_use_enable_force vaapi avcodec)
+		$(vlc_use_enable_force vaapi avcodec) \
+		$(vlc_use_enable_force nsplugin xcb)
 }
 
 src_install() {
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 2000874bca34..a7ecf68c5b47 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.16 2010/07/22 06:24:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.17 2010/07/22 06:39:54 aballier Exp $
 
 EAPI="3"
 
@@ -99,7 +99,7 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-1.0.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt )
+		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl x11-libs/libX11[xcb] )
 		png? ( media-libs/libpng sys-libs/zlib )
@@ -177,6 +177,7 @@ pkg_setup() {
 	vlc_use_force skins qt4
 	vlc_use_force vlm stream
 	vlc_use_force vaapi ffmpeg
+	vlc_use_force nsplugin xcb
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -329,7 +330,8 @@ src_configure() {
 		$(vlc_use_enable_force skins freetype) \
 		$(vlc_use_enable_force remoteosd libgcrypt) \
 		$(vlc_use_enable_force gnutls libgcrypt) \
-		$(vlc_use_enable_force vaapi avcodec)
+		$(vlc_use_enable_force vaapi avcodec) \
+		$(vlc_use_enable_force nsplugin xcb)
 }
 
 src_install() {
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 8f615642a5f2..746b3d2d5add 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.87 2010/07/21 07:52:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.88 2010/07/22 06:39:54 aballier Exp $
 
 EAPI="3"
 
@@ -97,7 +97,7 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-1.0.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt )
+		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl x11-libs/libX11[xcb] )
 		png? ( media-libs/libpng sys-libs/zlib )
@@ -174,6 +174,7 @@ pkg_setup() {
 	vlc_use_force skins qt4
 	vlc_use_force vlm stream
 	vlc_use_force vaapi ffmpeg
+	vlc_use_force nsplugin xcb
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -323,7 +324,8 @@ src_configure() {
 		$(vlc_use_enable_force skins freetype) \
 		$(vlc_use_enable_force remoteosd libgcrypt) \
 		$(vlc_use_enable_force gnutls libgcrypt) \
-		$(vlc_use_enable_force vaapi avcodec)
+		$(vlc_use_enable_force vaapi avcodec) \
+		$(vlc_use_enable_force nsplugin xcb)
 }
 
 src_install() {