diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-11 21:26:15 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-11 21:26:15 +0000 |
| commit | 953a4e1c8ac9a79bd32e4f17c1b9e70bb98a3933 (patch) | |
| tree | e8b5dec06256590188729093b0859f0b50e1c444 /virtual/ffmpeg | |
| parent | drop the no ctf patch now that its not needed anymore. (diff) | |
| download | gentoo-2-953a4e1c8ac9a79bd32e4f17c1b9e70bb98a3933.tar.gz gentoo-2-953a4e1c8ac9a79bd32e4f17c1b9e70bb98a3933.tar.bz2 gentoo-2-953a4e1c8ac9a79bd32e4f17c1b9e70bb98a3933.zip | |
depend on slot 0 for ffmpeg
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'virtual/ffmpeg')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.3.ebuild | 6 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-9.ebuild | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index 681580580c40..a9b1b7ca9340 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.50 2013/06/24 01:58:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.51 2013/08/11 21:26:15 aballier Exp $ + + 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.3.ebuild, + ffmpeg-9.ebuild: + depend on slot 0 for ffmpeg 24 Jun 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9.ebuild: take ffmpeg dep down to 1.0 as it is unmasked diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild index 6794705afb66..ef0136e52132 100644 --- a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild +++ b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.10 2012/12/05 13:34:39 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.11 2013/08/11 21:26:15 aballier Exp $ EAPI=4 @@ -15,7 +15,7 @@ IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x26 RDEPEND=" || ( - >=media-video/ffmpeg-0.10.3[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] + >=media-video/ffmpeg-0.10.3:0[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] >=media-video/libav-0.8.4[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) " diff --git a/virtual/ffmpeg/ffmpeg-9.ebuild b/virtual/ffmpeg/ffmpeg-9.ebuild index bac4d6cf02ee..5577a7817cbb 100644 --- a/virtual/ffmpeg/ffmpeg-9.ebuild +++ b/virtual/ffmpeg/ffmpeg-9.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/virtual/ffmpeg/ffmpeg-9.ebuild,v 1.3 2013/06/24 01:58:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9.ebuild,v 1.4 2013/08/11 21:26:15 aballier Exp $ EAPI=4 @@ -16,7 +16,7 @@ IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpa RDEPEND=" || ( >=media-video/libav-9[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] - >=media-video/ffmpeg-1.0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] + >=media-video/ffmpeg-1.0:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) " DEPEND="" |