From 0e51e9f26e46aa16e12abc629a3cd300105ca1f0 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Wed, 19 May 2010 07:32:11 +0000 Subject: [PATCH] pulseaudio requires libX11, bug #319003 by Tobias Jakobi Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-video/vlc/ChangeLog | 8 +++++++- media-video/vlc/Manifest | 18 +++++++++--------- media-video/vlc/vlc-1.0.6.ebuild | 6 ++++-- media-video/vlc/vlc-1.0.9999.ebuild | 6 ++++-- media-video/vlc/vlc-1.1.0_pre4.ebuild | 4 ++-- media-video/vlc/vlc-1.1.9999.ebuild | 4 ++-- media-video/vlc/vlc-9999.ebuild | 4 ++-- 7 files changed, 30 insertions(+), 20 deletions(-) diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 83199db80a79..592eccb61eec 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,12 @@ # 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.583 2010/05/15 08:57:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.584 2010/05/19 07:32:11 aballier Exp $ + + 19 May 2010; Alexis Ballier vlc-1.0.6.ebuild, + vlc-1.0.9999.ebuild, vlc-1.1.0_pre4.ebuild, vlc-1.1.9999.ebuild, + vlc-9999.ebuild: + pulseaudio requires libX11, bug #319003 by Tobias Jakobi + 15 May 2010; Alexis Ballier vlc-1.1.0_pre4.ebuild, vlc-1.1.9999.ebuild, vlc-9999.ebuild, metadata.xml: diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index f6e0d6947879..b25a493bcd68 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -6,17 +6,17 @@ DIST vlc-1.1.0-pre4.tar.bz2 22790722 RMD160 475fdd211101b26d3457ea8f4d1717f2e489 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8 -EBUILD vlc-1.0.6.ebuild 12229 RMD160 54623261dbe29fdc712d16cc14f3d64873821914 SHA1 c00550fe5f870d412d20b813ae716c70ecc034ae SHA256 3fd4b59e9a8a7566e26e88e8c76db3a842cf48c9737da9116cf453e05f00a315 -EBUILD vlc-1.0.9999.ebuild 12187 RMD160 d9350315d425b13583fc156f0f4f08479d2ffd16 SHA1 d2636b329f4f855234b22428b2dc063c91d5f8b4 SHA256 d0d04cc1ecf202e8a0f2b0c19dfeda7cfc1d38e188fdf1944d5cc23b5caffe30 -EBUILD vlc-1.1.0_pre4.ebuild 11983 RMD160 e66e25df27b412fae0e609816781a81f40c4f70e SHA1 40648d3b2f5773c13b055469cf64e91c374bc32f SHA256 f0fef55acd1194ed9b09bd32024ea7ba15994e8627187a4d35de9f710afdbca2 -EBUILD vlc-1.1.9999.ebuild 11929 RMD160 453f7753b59afdbab483105f58813d1bab6d6297 SHA1 ac8da389abee96403bb03804140d27320e567eda SHA256 9381bb8070d79681c17b84e6b8ba85b4711b7c226335f6e1747a853774b546c8 -EBUILD vlc-9999.ebuild 11926 RMD160 f231d6e30ce37f1378093f9ad0c57d84d8058284 SHA1 9c6c6cac710826c4cf24f5e605d750855e967894 SHA256 69301e31fc0e573a6037613e6aafa05a5f196529f3e4fa266467788b28d047d1 -MISC ChangeLog 90257 RMD160 97a02a64cc38d164bd8483bf5de049b21f6ecf72 SHA1 c208ecf5791f13b2bad52224bb39674094b3cfbe SHA256 b2bf7d6c3b0f99510c36d1fcc67f7981c216f1b63c6569a99c112f14b198bf43 +EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c +EBUILD vlc-1.0.9999.ebuild 12274 RMD160 907353609dd74ed3feae7521b68bd935b1c41314 SHA1 052cf8cf27b9e8719c8807a1561b8b10d3d48adc SHA256 7fbeecfc14a13c0e315e9a85e6b2389497fbc5f88abc4ad83953fa477d42102d +EBUILD vlc-1.1.0_pre4.ebuild 11999 RMD160 59a6988fa31956cfc63360b7f4c57155e0cb179d SHA1 3ec071c6c6cb251cc8d6e03e46a42d1499fa69ec SHA256 94938c61fb0f844da1f4d639b3d45ce61954d981c0e30572cbd259b84e491997 +EBUILD vlc-1.1.9999.ebuild 11945 RMD160 8005b062d2130522dcedb470e66c22943d87937c SHA1 cb8d66c6cf58034f6448a55e5caf2dd85383200b SHA256 b36c8f4ea0265d0d2cfee0a92eecf5ad3d317afa9019e6012a4d075578d03284 +EBUILD vlc-9999.ebuild 11942 RMD160 7f2265c0264c42f85b6187916c4eda2ca7f119a0 SHA1 c9bf24a0a0fd7a5802dc418b5a7e29a40752e8e6 SHA256 51c715498c3716c6667c7836619f41d5854dea9a3e4a591e256ca7c4541881ce +MISC ChangeLog 90497 RMD160 62db3a4d15d766884a1cf278f246b2a13d00d723 SHA1 1e464e193c33c9e51cea963ce9e22fe8300f7525 SHA256 29b71cdf2ee9ac97b85b6298b41305ace53eeaabdb51999b4f9b428f54e9a6fa MISC metadata.xml 4240 RMD160 548096f0459b43b103c315e07db92e50563ea1e7 SHA1 8a12510531e256c4fad1fc6dd6c28e56c0ab46eb SHA256 fdf69f66df99eb7339d0d12d2baddb8b8d338c839ae7d12051375e38621006a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvuYiIACgkQvFcC4BYPU0rKwACeK1NqpfZxqBB/5u7RStczuMwn -WoAAoMM6um4vlD8c8791ofNoFWel+Tzb -=HDFY +iEYEARECAAYFAkvzlAQACgkQvFcC4BYPU0pxqgCglqEXKn6xTcol1ROk7FXeZSm3 +t3YAnAo/sJQRr3Dfm7+HIXaERmfzaM6n +=aJ2Y -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.0.6.ebuild b/media-video/vlc/vlc-1.0.6.ebuild index 05f6c50d2551..21e5e9c2155f 100644 --- a/media-video/vlc/vlc-1.0.6.ebuild +++ b/media-video/vlc/vlc-1.0.6.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.0.6.ebuild,v 1.8 2010/05/14 16:39:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.9 2010/05/19 07:32:11 aballier Exp $ EAPI="2" @@ -115,7 +115,7 @@ RDEPEND=" ogg? ( media-libs/libogg ) pda? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] @@ -209,6 +209,7 @@ pkg_setup() { vlc_use_force skins qt4 vlc_use_force skins X vlc_use_force qt4 X + vlc_use_force pulseaudio X vlc_use_force vlm stream use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." if use qt4 || use skins ; then @@ -368,6 +369,7 @@ src_configure() { $(vlc_use_enable_force skins qt4) \ $(vlc_use_enable_force skins freetype) \ $(vlc_use_enable_force skins x11) \ + $(vlc_use_enable_force pulseaudio x11) \ $(vlc_use_enable_force remoteosd libgcrypt) } diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild index f6cf1bd64d60..c1cd64e01265 100644 --- a/media-video/vlc/vlc-1.0.9999.ebuild +++ b/media-video/vlc/vlc-1.0.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.0.9999.ebuild,v 1.41 2010/05/14 16:39:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.42 2010/05/19 07:32:11 aballier Exp $ EAPI="2" @@ -115,7 +115,7 @@ RDEPEND=" ogg? ( media-libs/libogg ) pda? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] @@ -209,6 +209,7 @@ pkg_setup() { vlc_use_force skins qt4 vlc_use_force skins X vlc_use_force qt4 X + vlc_use_force pulseaudio X vlc_use_force vlm stream use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." if use qt4 || use skins ; then @@ -368,6 +369,7 @@ src_configure() { $(vlc_use_enable_force skins qt4) \ $(vlc_use_enable_force skins freetype) \ $(vlc_use_enable_force skins x11) \ + $(vlc_use_enable_force pulseaudio x11) \ $(vlc_use_enable_force remoteosd libgcrypt) } diff --git a/media-video/vlc/vlc-1.1.0_pre4.ebuild b/media-video/vlc/vlc-1.1.0_pre4.ebuild index 0c444aaf4814..19fe253d51b1 100644 --- a/media-video/vlc/vlc-1.1.0_pre4.ebuild +++ b/media-video/vlc/vlc-1.1.0_pre4.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.0_pre4.ebuild,v 1.3 2010/05/15 08:57:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre4.ebuild,v 1.4 2010/05/19 07:32:11 aballier Exp $ EAPI="2" @@ -109,7 +109,7 @@ RDEPEND=" opengl? ( virtual/opengl ) png? ( media-libs/libpng sys-libs/zlib ) projectm? ( media-libs/libprojectm ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild index ae461c6a4213..24fb174b7460 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.4 2010/05/15 08:57:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.5 2010/05/19 07:32:11 aballier Exp $ EAPI="2" @@ -109,7 +109,7 @@ RDEPEND=" opengl? ( virtual/opengl ) png? ( media-libs/libpng sys-libs/zlib ) projectm? ( media-libs/libprojectm ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index c3e6e6e7e5e2..98c0fd1706e7 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.71 2010/05/15 08:57:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.72 2010/05/19 07:32:11 aballier Exp $ EAPI="2" @@ -109,7 +109,7 @@ RDEPEND=" opengl? ( virtual/opengl ) png? ( media-libs/libpng sys-libs/zlib ) projectm? ( media-libs/libprojectm ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] -- 2.26.2