diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-03-20 10:43:13 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-03-20 10:43:13 +0000 |
| commit | 3b8780ee510ddb1fd760aebb55df887fd7258377 (patch) | |
| tree | 0b51966535f05ca9a1bfd3cc799e9d0e707c841e /media-video | |
| parent | Fix dep on avahi[mono] (#348068 by Jens Pranaitis), and tests (#295889). (diff) | |
| download | gentoo-2-3b8780ee510ddb1fd760aebb55df887fd7258377.tar.gz gentoo-2-3b8780ee510ddb1fd760aebb55df887fd7258377.tar.bz2 gentoo-2-3b8780ee510ddb1fd760aebb55df887fd7258377.zip | |
allow stable zlib too, vlc will build its bundled minizip version with it though, bug #408881
(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.0.1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 87f1dbed0a4f..7a577dfcf831 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.786 2012/03/20 09:19:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.787 2012/03/20 10:43:13 aballier Exp $ + + 20 Mar 2012; Alexis Ballier <aballier@gentoo.org> vlc-2.0.1.ebuild: + allow stable zlib too, vlc will build its bundled minizip version with it + though, bug #408881 *vlc-2.0.1 (20 Mar 2012) diff --git a/media-video/vlc/vlc-2.0.1.ebuild b/media-video/vlc/vlc-2.0.1.ebuild index 35bbeba5e24b..1923bba5b3a2 100644 --- a/media-video/vlc/vlc-2.0.1.ebuild +++ b/media-video/vlc/vlc-2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.1 2012/03/20 09:19:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.2 2012/03/20 10:43:13 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-1.2.5.1-r2[minizip] + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) |