diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 21:09:24 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 21:09:24 +0000 |
| commit | 421863feeff7202cfea91f0ef654b81503058df7 (patch) | |
| tree | 261a71c20e17d475704281e6f4c433c8417ff522 /virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild | |
| parent | Version bump (diff) | |
| download | historical-421863feeff7202cfea91f0ef654b81503058df7.tar.gz historical-421863feeff7202cfea91f0ef654b81503058df7.tar.bz2 historical-421863feeff7202cfea91f0ef654b81503058df7.zip | |
Fix last change differently.
Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64
Diffstat (limited to 'virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild')
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild index 8dc5160d5af4..13999dfc3b61 100644 --- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild +++ b/virtual/ffmpeg/ffmpeg-0.10.2-r1.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.2-r1.ebuild,v 1.8 2012/05/17 20:56:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.9 2012/05/17 21:09:24 ssuominen Exp $ EAPI=4 @@ -16,7 +16,12 @@ 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=] + >=media-video/libav-0.8.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] + ) + || ( + media-video/ffmpeg + media-libs/libpostproc + <=media-video/libav-0.8.2 ) " DEPEND="" |