diff options
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 14 | ||||
| -rw-r--r-- | media-video/vlc/vlc-1.1.11.ebuild | 4 | ||||
| -rw-r--r-- | media-video/vlc/vlc-1.1.9999.ebuild | 4 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 4 |
5 files changed, 19 insertions, 14 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index a2d02a683536..4a1cbb23864a 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.741 2011/09/21 15:52:18 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.742 2011/09/22 15:29:42 aballier Exp $ + + 22 Sep 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.11.ebuild, + vlc-1.1.9999.ebuild, vlc-9999.ebuild: + use minizip from zlib when available: with a or dep for 1.1 and always use it + for 1.2, bug #383351 21 Sep 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.11.ebuild: fix zlib dep, bug #383351; for now we will force to use the older version diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 02b4a117caf5..ad3bb8f0dca9 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -4,15 +4,15 @@ Hash: SHA1 DIST vlc-1.1.11.tar.bz2 26319862 RMD160 fa8a32a8e81a5f707b3cace6fa9808d5d7cb9fe6 SHA1 068e75bdbfe6e595a4db14ad49e05688c8b1d5ad SHA256 682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9 -EBUILD vlc-1.1.11.ebuild 12391 RMD160 554f9c6bd824d15a404b4956a07ff8202d15e60a SHA1 d60a8c6ca04bd915636c6576ce4e450660dc87e6 SHA256 0bdc4c4bfd0373f87ac4492e40ade1f0d7a8365a36886078f84e8c147b0ffeb4 -EBUILD vlc-1.1.9999.ebuild 12290 RMD160 18b9846b2b7e51219a4590965ac125993716665c SHA1 eb6e7f85ffc5e408a385429b4ef2e0b84d5adbe1 SHA256 4d6be0e05f2aeff08bebe416715e5dc8997b3c3190956290eeae82d46077466f -EBUILD vlc-9999.ebuild 10894 RMD160 f94bd245527f3ad4507f3805df12dbdf3beae2de SHA1 f273f3d53096ae51a5199dbaeffa1e082f68b796 SHA256 58b29667e71a149ce26bd5b2719ded29ec5f7497ddb960de581e0711f2c1439d -MISC ChangeLog 110204 RMD160 e66f0d917a7780e8f12820efe8fb607f59a1f25d SHA1 1c7e252310a7e71db25f202fdc79974d0e62834e SHA256 1a81947555baa4466e30b711c3b5166bed52291bbe3bbc989052c4a46c8ba27d +EBUILD vlc-1.1.11.ebuild 12434 RMD160 841ccd134aefacdaf865478cb9cc70225b2e6a65 SHA1 69b27da2bff3f063981711beb585e55cf834f90c SHA256 941fe6c49003c443920845246e57a3d6ce4b38edd6780a59cc264b8c2dc92f12 +EBUILD vlc-1.1.9999.ebuild 12347 RMD160 2c6e70371161e8def7ef908338917ee0561414db SHA1 d8ca1b960700e7ae68c62a465e62b80449bc308a SHA256 b7f47cdc537b0ec0b334cf7f85269f20eb01e976c2855fdc3921de7539958d78 +EBUILD vlc-9999.ebuild 10918 RMD160 0b99b52040aa5621513499f820870f8fcbfc13cd SHA1 638b33d492ca30066f92289dda664163e9405475 SHA256 26ca8b5f6e36bb207818fcea2f0a1e71070e9467bf3b57bb9ee7da6437dd3bb1 +MISC ChangeLog 110419 RMD160 727aef16757123184db27cf78d8c9dbf22ff884b SHA1 81a48c83fb1e98ee917cac92d9df3dcbc8f6d1b0 SHA256 581bfa805fdb19d6aac1925d0ed772b89038045e376192fb3166b220c2db3ffe MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk56CDgACgkQvFcC4BYPU0plRACeOneaLAve2PJOcsM4glpGoyrC -jT0AoIG9IE6gZgPLbq79HTosQ5EEH53P -=tf9c +iEYEARECAAYFAk57VG0ACgkQvFcC4BYPU0qpcwCguQ9cS7AGFmmhHaoBINRvURCh +CJAAnRiB0NWM/XyZfLOUNaLx1vrliKi7 +=/Flt -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.1.11.ebuild b/media-video/vlc/vlc-1.1.11.ebuild index 07aefab4fa21..d851d640b9b2 100644 --- a/media-video/vlc/vlc-1.1.11.ebuild +++ b/media-video/vlc/vlc-1.1.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.6 2011/09/21 15:52:18 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.7 2011/09/22 15:29:42 aballier Exp $ EAPI="3" @@ -60,7 +60,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394 vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi" RDEPEND=" - <sys-libs/zlib-1.2.5.1-r1 + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) >=media-libs/libdvbpsi-0.1.6 a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib x11-libs/libX11 ) diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild index ca529765d890..523b8ddfb5cb 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-2011 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.32 2011/09/21 08:58:32 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.33 2011/09/22 15:29:42 aballier Exp $ EAPI="3" @@ -58,7 +58,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394 vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi" RDEPEND=" - sys-libs/zlib + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) >=media-libs/libdvbpsi-0.1.6 a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib x11-libs/libX11 ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 27742639c7f9..4d759075c24f 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.148 2011/09/21 08:58:32 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.149 2011/09/22 15:29:42 aballier Exp $ EAPI="4" @@ -58,7 +58,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi" RDEPEND=" - sys-libs/zlib + >=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) |