diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2012-12-05 13:34:39 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-12-05 13:34:39 +0000 |
commit | 1eed615b272ab1c43a3271f58bdbc83f3a23f39a (patch) | |
tree | d283ce50d7aea0fec2df062613009f3202fb2516 /virtual | |
parent | Remove overshadowed. (diff) | |
download | gentoo-2-1eed615b272ab1c43a3271f58bdbc83f3a23f39a.tar.gz gentoo-2-1eed615b272ab1c43a3271f58bdbc83f3a23f39a.tar.bz2 gentoo-2-1eed615b272ab1c43a3271f58bdbc83f3a23f39a.zip |
Raise libav dep and stabilise as it passes repoman.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'virtual')
-rw-r--r-- | virtual/ffmpeg/ChangeLog | 6 | ||||
-rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.3.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index a8bec7a31110..e0f352df61f8 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.46 2012/11/26 13:52:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.47 2012/12/05 13:34:39 scarabeus Exp $ + + 05 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> ffmpeg-0.10.2-r1.ebuild, + ffmpeg-0.10.3.ebuild: + Raise libav dep and stabilise as it passes repoman. 26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml: Update to global useflag. diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild index 68766fccda0c..6794705afb66 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 # 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.9 2012/07/26 20:12:54 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.10 2012/12/05 13:34:39 scarabeus Exp $ EAPI=4 @@ -10,13 +10,13 @@ SRC_URI="" LICENSE="" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x264" RDEPEND=" || ( >=media-video/ffmpeg-0.10.3[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] - >=media-video/libav-0.8.2-r2[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?] ) " DEPEND="" |