summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-05-24 14:45:34 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-05-24 14:45:34 +0000
commit6ba90efdb2b7764dfdb9e796ed1b64e0c635d8cc (patch)
tree5e64e296d297f09cf75b36a082128dbc0d15d3fd /media-video
parentStable on amd64 wrt bug #368459 (diff)
downloadgentoo-2-6ba90efdb2b7764dfdb9e796ed1b64e0c635d8cc.tar.gz
gentoo-2-6ba90efdb2b7764dfdb9e796ed1b64e0c635d8cc.tar.bz2
gentoo-2-6ba90efdb2b7764dfdb9e796ed1b64e0c635d8cc.zip
ffmpeg patch is merged upstream, drop it
(Portage version: 2.2.0_alpha35/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog5
-rw-r--r--media-video/vlc/vlc-1.1.9999.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 3ef54401af32..97e27bb830a4 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
# 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.719 2011/05/17 23:16:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.720 2011/05/24 14:45:34 aballier Exp $
+
+ 24 May 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.9999.ebuild:
+ ffmpeg patch is merged upstream, drop it
*vlc-1.1.9-r1 (17 May 2011)
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index c97f08bf85f5..e0a16584fd98 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.28 2011/05/17 23:16:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.29 2011/05/24 14:45:34 aballier Exp $
EAPI="3"
@@ -24,7 +24,7 @@ MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
VLC_SNAPSHOT_TIME="0013"
-PATCHLEVEL="97"
+PATCHLEVEL="98"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild