diff options
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.2_pre20130729.ebuild | 4 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 3b6968b8c71f..4b596f6c4b18 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # 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.909 2013/07/29 21:38:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.910 2013/08/11 22:52:39 aballier Exp $ + + 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> + mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild: + depend on ffmpeg:0 *mplayer-1.2_pre20130729 (29 Jul 2013) diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild index 17ec68999bc5..d871a42f0ecc 100644 --- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild +++ b/media-video/mplayer/mplayer-1.2_pre20130729.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.2_pre20130729.ebuild,v 1.1 2013/07/29 21:38:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.2 2013/08/11 22:52:39 aballier Exp $ EAPI=5 @@ -60,7 +60,7 @@ RDEPEND+=" sys-libs/ncurses app-arch/bzip2 sys-libs/zlib - || ( >=media-video/ffmpeg-1.2.1:= >=media-video/libav-9.8:= ) + || ( >=media-video/ffmpeg-1.2.1:0= >=media-video/libav-9.8:= ) 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 1895cb034c00..681bba45d484 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.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-9999.ebuild,v 1.152 2013/07/29 20:55:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.153 2013/08/11 22:52:39 aballier Exp $ EAPI=5 @@ -60,7 +60,7 @@ RDEPEND+=" sys-libs/ncurses app-arch/bzip2 sys-libs/zlib - || ( >=media-video/ffmpeg-2.0:= >=media-video/libav-9:= ) + || ( >=media-video/ffmpeg-2.0:0= >=media-video/libav-9:= ) a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) |