summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-02-01 13:50:25 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-02-01 13:50:25 +0000
commit50e6571956f0128c35ee7dce3c6b8b94dbc21da6 (patch)
treeb9d682f83e9a33c99888123e4f3c6bb18e25b9bb /media-video/vlc
parentRemove old. Cosmetic changes. (diff)
downloadgentoo-2-50e6571956f0128c35ee7dce3c6b8b94dbc21da6.tar.gz
gentoo-2-50e6571956f0128c35ee7dce3c6b8b94dbc21da6.tar.bz2
gentoo-2-50e6571956f0128c35ee7dce3c6b8b94dbc21da6.zip
backport upstream patch to fix build with latest zlib, bug #401629
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-1.1.13.ebuild4
-rw-r--r--media-video/vlc/vlc-1.1.9999.ebuild6
3 files changed, 10 insertions, 6 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 0b4e10402067..d463f7eee16f 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.775 2012/01/28 15:30:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.776 2012/02/01 13:50:25 aballier Exp $
+
+ 01 Feb 2012; Alexis Ballier <aballier@gentoo.org> vlc-1.1.13.ebuild,
+ vlc-1.1.9999.ebuild:
+ backport upstream patch to fix build with latest zlib, bug #401629
28 Jan 2012; Alexis Ballier <aballier@gentoo.org> -vlc-1.2.0_pre3.ebuild,
-vlc-1.2.0_pre4.ebuild:
diff --git a/media-video/vlc/vlc-1.1.13.ebuild b/media-video/vlc/vlc-1.1.13.ebuild
index 837718fa1072..bd19203dd1b9 100644
--- a/media-video/vlc/vlc-1.1.13.ebuild
+++ b/media-video/vlc/vlc-1.1.13.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-1.1.13.ebuild,v 1.5 2012/01/01 15:21:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.6 2012/02/01 13:50:25 aballier Exp $
EAPI="3"
@@ -22,7 +22,7 @@ MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
VLC_SNAPSHOT_TIME="0013"
-PATCHLEVEL="104"
+PATCHLEVEL="105"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index bbfd93c9fef0..31adf7fc858a 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
+# 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-1.1.9999.ebuild,v 1.38 2011/12/21 12:18:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.39 2012/02/01 13:50:25 aballier Exp $
EAPI="3"
@@ -22,7 +22,7 @@ MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
VLC_SNAPSHOT_TIME="0013"
-PATCHLEVEL="104"
+PATCHLEVEL="105"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild