summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-01-17 16:51:58 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-01-17 16:51:58 +0000
commit3ef688c34d6256166beea7b34a6df699f83b6564 (patch)
tree50f10543cbb10f6aaf99b0e8884c9c51d4c7ab6e /media-video/mplayer
parentUse built-in Python sqlite3 support rather than pysqlite package. (diff)
downloadgentoo-2-3ef688c34d6256166beea7b34a6df699f83b6564.tar.gz
gentoo-2-3ef688c34d6256166beea7b34a6df699f83b6564.tar.bz2
gentoo-2-3ef688c34d6256166beea7b34a6df699f83b6564.zip
we need ffmpeg-1.1 for the libav-9 patch
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/mplayer-1.1-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index d6c2c2d8b656..2d06a9c7f14a 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.871 2013/01/17 15:42:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.872 2013/01/17 16:51:58 aballier Exp $
+
+ 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild:
+ we need ffmpeg-1.1 for the libav-9 patch
17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild,
+files/mplayer-1.1-planaraudio.patch:
diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild
index 1c64de83f83f..3c9ed5aca965 100644
--- a/media-video/mplayer/mplayer-1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.17 2013/01/17 15:42:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.18 2013/01/17 16:51:58 aballier Exp $
EAPI=4
@@ -268,7 +268,7 @@ src_prepare() {
fi
base_src_prepare
- if has_version '>=media-video/libav-9_rc' || has_version '>=media-video/ffmpeg-1' ; then
+ if has_version '>=media-video/libav-9_rc' || has_version '>=media-video/ffmpeg-1.1' ; then
epatch "${FILESDIR}/${P}-libav-9.patch" \
"${FILESDIR}/${P}-planaraudio.patch"
fi