summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-10-12 08:01:39 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-10-12 08:01:39 +0000
commitd104e123672dc1576efac2b8217594c65467813a (patch)
tree7171ab1d91d7bd5bc826077cabf12c0de06c9f66 /media-video
parentmask newest mplayer for bug #525070 along with newest ffmpeg: it is needed fo... (diff)
downloadgentoo-2-d104e123672dc1576efac2b8217594c65467813a.tar.gz
gentoo-2-d104e123672dc1576efac2b8217594c65467813a.tar.bz2
gentoo-2-d104e123672dc1576efac2b8217594c65467813a.zip
require ffmpeg on latest versions as it doesnt build with libav, bug #525070
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/mplayer-1.2_pre20141011.ebuild4
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 5baabcdae517..4230c2fd22a2 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.926 2014/10/11 11:58:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.927 2014/10/12 08:01:39 aballier Exp $
+
+ 12 Oct 2014; Alexis Ballier <aballier@gentoo.org>
+ mplayer-1.2_pre20141011.ebuild, mplayer-9999.ebuild:
+ require ffmpeg on latest versions as it doesnt build with libav, bug #525070
*mplayer-1.2_pre20141011 (11 Oct 2014)
diff --git a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
index cd834c371c13..d7bb0cc919ad 100644
--- a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.1 2014/10/11 11:58:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.2 2014/10/12 08:01:39 aballier Exp $
EAPI=5
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses
app-arch/bzip2
sys-libs/zlib
- || ( >=media-video/ffmpeg-2.0:0 >=media-video/libav-9 )
+ >=media-video/ffmpeg-2.0:0
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index fbb01af2d75f..eed0dba67815 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.162 2014/09/01 16:47:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.163 2014/10/12 08:01:39 aballier Exp $
EAPI=5
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses
app-arch/bzip2
sys-libs/zlib
- || ( >=media-video/ffmpeg-2.0:0 >=media-video/libav-9 )
+ >=media-video/ffmpeg-2.0:0
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )