diff options
author | Alexis Ballier <aballier@gentoo.org> | 2013-08-11 22:54:24 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-11 22:54:24 +0000 |
commit | d02520aaf41dc322178da2b1e1429a464039dfd6 (patch) | |
tree | 54289037153378d98b44cdcb1987bc98d4930873 /media-video | |
parent | depend on ffmpeg:0 (diff) | |
download | gentoo-2-d02520aaf41dc322178da2b1e1429a464039dfd6.tar.gz gentoo-2-d02520aaf41dc322178da2b1e1429a464039dfd6.tar.bz2 gentoo-2-d02520aaf41dc322178da2b1e1429a464039dfd6.zip |
depend on ffmpeg:0
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/mplayer2/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/mplayer2/mplayer2-2.0_p20130126.ebuild | 4 | ||||
-rw-r--r-- | media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild | 4 | ||||
-rw-r--r-- | media-video/mplayer2/mplayer2-9999.ebuild | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 960b885fce10..7d66d718db96 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.109 2013/07/10 02:33:18 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.110 2013/08/11 22:54:24 aballier Exp $ + + 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> + mplayer2-2.0_p20130126.ebuild, mplayer2-2.0_p20130428-r1.ebuild, + mplayer2-9999.ebuild: + depend on ffmpeg:0 10 Jul 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml: Remove unneeded useflag descriptions from metadata.xml diff --git a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild index 83d39a23e1c3..03def7d77581 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20130126.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/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.15 2013/06/29 19:19:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.16 2013/08/11 22:54:24 aballier Exp $ EAPI=4 @@ -99,7 +99,7 @@ RDEPEND+=" png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) - postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) ) + postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg:0 ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( >=media-libs/libquvi-0.4.1 ) rar? ( diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild index dd301df53ee7..cd6d4a13140b 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20130428-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/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.1 2013/07/09 16:06:35 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.2 2013/08/11 22:54:24 aballier Exp $ EAPI=5 @@ -98,7 +98,7 @@ RDEPEND+=" postproc? ( || ( media-libs/libpostproc - media-video/ffmpeg + media-video/ffmpeg:0 ) ) pulseaudio? ( media-sound/pulseaudio ) diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index fdabd3175a00..9aec56d275fc 100644 --- a/media-video/mplayer2/mplayer2-9999.ebuild +++ b/media-video/mplayer2/mplayer2-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/mplayer2/mplayer2-9999.ebuild,v 1.60 2013/07/09 16:06:35 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.61 2013/08/11 22:54:24 aballier Exp $ EAPI=5 @@ -98,7 +98,7 @@ RDEPEND+=" postproc? ( || ( media-libs/libpostproc - media-video/ffmpeg + media-video/ffmpeg:0 ) ) pulseaudio? ( media-sound/pulseaudio ) |