diff options
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -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 |
4 files changed, 12 insertions, 7 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/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 ) |