diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2009-10-10 10:46:03 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2009-10-10 10:46:03 +0000 |
| commit | 00426dc959a70bbd0df8ca2ba15819c0e02fb930 (patch) | |
| tree | 1b143ebe058bb8fbfc6f62eaa3642f9b929fd4e8 | |
| parent | Version bump to fix build issue with 2.6.31, bug #287656 thank xo0ox for repo... (diff) | |
| download | historical-00426dc959a70bbd0df8ca2ba15819c0e02fb930.tar.gz historical-00426dc959a70bbd0df8ca2ba15819c0e02fb930.tar.bz2 historical-00426dc959a70bbd0df8ca2ba15819c0e02fb930.zip | |
Fixing samba deps for samba 3.4, fixes #288381.
Package-Manager: portage-2.2_rc44/cvs/Linux x86_64
| -rw-r--r-- | media-video/vlc/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 14 | ||||
| -rw-r--r-- | media-video/vlc/vlc-1.0.2.ebuild | 5 |
3 files changed, 9 insertions, 15 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 9a51e6d95769..36c3cb54e55d 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/vlc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.516 2009/10/02 22:29:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.517 2009/10/10 10:46:03 patrick Exp $ + + 10 Oct 2009; Patrick Lauer <patrick@gentoo.org> vlc-1.0.2.ebuild: + Fixing samba deps for samba 3.4, fixes #288381. 02 Oct 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.9999.ebuild: Remove x264 patch merged upstream diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 64c6d7547528..e4c814af83cc 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST vlc-0.9.10.tar.bz2 17526464 RMD160 25a96098e3507d48f7d62d1b2f3a1138c2004832 SHA1 8b562a5327c358a332f97d9012702ca2b445c0ed SHA256 54f6ef6e592e0c0315da82ccbe76304210073d0b778e65e3c47e1e950c12b726 DIST vlc-1.0.2.tar.bz2 20958212 RMD160 36f93339d1947483bb5ef4877cbb4b3ab200b3cd SHA1 5207d227f09d16a44823ae4a8b2144b3ce18eefb SHA256 38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54 @@ -9,15 +6,8 @@ DIST vlc-patches-72.tar.bz2 4940 RMD160 7c5afdd17d64171d832e52ad21379252c76f5f2a DIST vlc-patches-77.tar.bz2 8054 RMD160 fbab51b6f9867880b272d27803112dff46d1bbdd SHA1 ce04a37e372ec3651a4352084190cf0e20a173df SHA256 dadaccd4fa5ec714b683354abd3b96406952320463ab246276dbe914cbf3ae68 DIST vlc-patches-78.tar.bz2 7106 RMD160 44575d5236cf753cadb1611ba032b6ce6dd78bf5 SHA1 2c8be84e9988d358347f7cf58415b13dd214cd6e SHA256 0586e95fb793bb0d24d890cd9cbe6cc6ae26857e9a6e95729bc3b96526769ad3 EBUILD vlc-0.9.10.ebuild 11217 RMD160 3e74034201c55964f4b415859af65b2cfacbe77b SHA1 404de36f361fa4859f04426e7334cd902e42ff35 SHA256 63de3fdeef487c7af556b9203ac58af408b10434a686c3646d11793b76f096aa -EBUILD vlc-1.0.2.ebuild 11953 RMD160 ca7725a6f426306e4f68ad62bd353f8184211daa SHA1 6b98541ed3b9c2f2921a7734c77b576f78a7f06c SHA256 23b758369f32ee46b16ddc2ddec971293362dbc9f6da13481508c508740a7c0e +EBUILD vlc-1.0.2.ebuild 12004 RMD160 4b0f0853665d064c59edc0dcdd73b831589acdd3 SHA1 5779e16c7ba49348aa024ac286d891aa6b6206ec SHA256 8bc2a7d93d75bb251bc43d30eaa797fe22d1dfe683d651396f4f2f4fe13fe571 EBUILD vlc-1.0.9999.ebuild 11915 RMD160 b9a1c377daee631b029f969b93601f0b242c7356 SHA1 0cbe401e27fecd779b6084c8e220ece42981970f SHA256 df32ef0723b777bc47d1e82f25b287a163cf90a3187aea9d4b81ea6a4f38da76 EBUILD vlc-9999.ebuild 11847 RMD160 5cd40612df6dc3531b6335fbeafc07734cf8ec2e SHA1 da8f25799d428593fd1449531152485e3628b699 SHA256 922731dccdc3ee953143d4d23a357a3259a0cd4cf8c9e2b57aa8bca31aa963b7 -MISC ChangeLog 81539 RMD160 e0a1e5ab88d29a4edb383174933019d2acc3d27d SHA1 86dd7f56a58a020a87279ba73a0783604cabbf75 SHA256 77b0c893f92d16f8b7d53e7c97eda3fef06594b80003e934bcb0e778f42ad304 +MISC ChangeLog 81657 RMD160 44715954677771b37968b942d076c97843745158 SHA1 8e5502a1ad502fc1f54f1e61c22d9fbc8bb52dd4 SHA256 f5e8d1e02f3efc8b13d6d8ac89b19d987bd317b5099091ea6ac686e346b1bc3c MISC metadata.xml 4017 RMD160 2f8beef230b8a858e6653b52d1c86e7f5c66f54e SHA1 874fd0d99f1233ce5ed5f09493ce4d7ba68df9a4 SHA256 4831b6f500d5051ebfbb96f04679dc7574296f5f439707a87564c62050ba21d0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrGftgACgkQvFcC4BYPU0peOgCeMtcT3mq4ryTpB6m8SQ6QuPcE -RI8AoJVyxJkWKnL7a60cbwKU/7Sz+O4Y -=iOty ------END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.0.2.ebuild b/media-video/vlc/vlc-1.0.2.ebuild index 4ba5dba8b0f4..2ae892869d72 100644 --- a/media-video/vlc/vlc-1.0.2.ebuild +++ b/media-video/vlc/vlc-1.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.2.ebuild,v 1.9 2009/10/02 21:51:17 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.2.ebuild,v 1.10 2009/10/10 10:46:03 patrick Exp $ EAPI="2" @@ -123,7 +123,8 @@ RDEPEND=" pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) 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 ) + samba? ( || ( >=net-fs/samba-libs-3.4[smbclient] + <net-fs/samba-3.4 ) ) schroedinger? ( >=media-libs/schroedinger-1.0.6 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image ) ) |