diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-16 12:40:02 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-16 12:40:02 +0000 |
| commit | e29f0b974f2982e1e5b93ab4493fac0e5dd712c0 (patch) | |
| tree | 0574be69381274551c69ac76a4a39be688708528 /virtual/ffmpeg | |
| parent | Mask virtual for new libav/ffmpeg. (diff) | |
| download | gentoo-2-e29f0b974f2982e1e5b93ab4493fac0e5dd712c0.tar.gz gentoo-2-e29f0b974f2982e1e5b93ab4493fac0e5dd712c0.tar.bz2 gentoo-2-e29f0b974f2982e1e5b93ab4493fac0e5dd712c0.zip | |
Add new virtual for 1.1/9 series. Masked. Also it has switched dep order as will be announced upon unmasking.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'virtual/ffmpeg')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 11 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild | 22 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-9.ebuild | 22 |
3 files changed, 31 insertions, 24 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index e0f352df61f8..5cee0a0870a5 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for virtual/ffmpeg -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.47 2012/12/05 13:34:39 scarabeus Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.48 2013/01/16 12:40:02 scarabeus Exp $ + +*ffmpeg-9 (16 Jan 2013) + + 16 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +ffmpeg-9.ebuild, + -ffmpeg-0.10.2-r1.ebuild: + Add new virtual for 1.1/9 series. Masked. Also it has switched dep order as + will be announced upon unmasking. 05 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> ffmpeg-0.10.2-r1.ebuild, ffmpeg-0.10.3.ebuild: diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild deleted file mode 100644 index 914e8ed83f5d..000000000000 --- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# 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.2-r1.ebuild,v 1.11 2012/05/18 00:21:34 ssuominen Exp $ - -EAPI=4 - -DESCRIPTION="Virtual package for FFmpeg implementation" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264" - -RDEPEND=" - || ( - >=media-video/ffmpeg-0.10.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] - >=media-video/libav-0.8.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] - ) -" -DEPEND="" diff --git a/virtual/ffmpeg/ffmpeg-9.ebuild b/virtual/ffmpeg/ffmpeg-9.ebuild new file mode 100644 index 000000000000..8f4abd053fbb --- /dev/null +++ b/virtual/ffmpeg/ffmpeg-9.ebuild @@ -0,0 +1,22 @@ +# 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.1 2013/01/16 12:40:02 scarabeus Exp $ + +EAPI=4 + +DESCRIPTION="Virtual package for FFmpeg implementation" +HOMEPAGE="" +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" +IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x264" + +RDEPEND=" + || ( + >=media-video/libav-9[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] + >=media-video/ffmpeg-1.1[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] + ) +" +DEPEND="" |