summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-09-21 15:52:18 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-09-21 15:52:18 +0000
commite1218ec78fc24ebaefade41bf46ec3616f46afa2 (patch)
treec16addb810cf316157b953bc8b7dae90b90b1d6f
parentAdd sys-devel/flex into DEPEND, bug #383477 thank bay and Dustin Polke for th... (diff)
downloadgentoo-2-e1218ec78fc24ebaefade41bf46ec3616f46afa2.tar.gz
gentoo-2-e1218ec78fc24ebaefade41bf46ec3616f46afa2.tar.bz2
gentoo-2-e1218ec78fc24ebaefade41bf46ec3616f46afa2.zip
fix zlib dep, bug #383351; for now we will force to use the older version until bug #383179 is sorted out with respective upstreams
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-1.1.11.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 903d0d55464a..a2d02a683536 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# 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.740 2011/09/21 08:58:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.741 2011/09/21 15:52:18 aballier Exp $
+
+ 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
+ until bug #383179 is sorted out with respective upstreams
21 Sep 2011; Michał Górny <mgorny@gentoo.org> vlc-1.1.9999.ebuild,
vlc-9999.ebuild:
diff --git a/media-video/vlc/vlc-1.1.11.ebuild b/media-video/vlc/vlc-1.1.11.ebuild
index 7751b58a941f..07aefab4fa21 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.5 2011/08/27 17:38:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.6 2011/09/21 15:52:18 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
+ <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 )