diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-24 01:58:41 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-24 01:58:41 +0000 |
| commit | 80d0c45b6a3c7e0806724a78481e4894ba9684c2 (patch) | |
| tree | 208e19e59e9ab2b350f0c7a7c8528d8a3ef4a07f /virtual | |
| parent | Version bump. (diff) | |
| download | gentoo-2-80d0c45b6a3c7e0806724a78481e4894ba9684c2.tar.gz gentoo-2-80d0c45b6a3c7e0806724a78481e4894ba9684c2.tar.bz2 gentoo-2-80d0c45b6a3c7e0806724a78481e4894ba9684c2.zip | |
take ffmpeg dep down to 1.0 as it is unmasked
(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-9.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index d362baaa048b..681580580c40 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.49 2013/04/14 23:16:16 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.50 2013/06/24 01:58:41 aballier Exp $ + + 24 Jun 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9.ebuild: + take ffmpeg dep down to 1.0 as it is unmasked 14 Apr 2013; Luca Barbato <lu_zero@gentoo.org> ffmpeg-9.ebuild, metadata.xml: Expose opus support diff --git a/virtual/ffmpeg/ffmpeg-9.ebuild b/virtual/ffmpeg/ffmpeg-9.ebuild index b4191080c0ca..bac4d6cf02ee 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.2 2013/04/14 23:16:16 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9.ebuild,v 1.3 2013/06/24 01:58:41 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.1[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?] ) " DEPEND="" |