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 | 44e594b143e6ea8486a4423e603683c4b8029c81 (patch) | |
| tree | 38b0eee0062522c9b390047219781224cda4c6e3 /virtual/ffmpeg | |
| parent | Version bump (diff) | |
| download | gentoo-2-44e594b143e6ea8486a4423e603683c4b8029c81.tar.gz gentoo-2-44e594b143e6ea8486a4423e603683c4b8029c81.tar.bz2 gentoo-2-44e594b143e6ea8486a4423e603683c4b8029c81.zip | |
Fix last change differently.
(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)
Diffstat (limited to 'virtual/ffmpeg')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 8 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index 966c8ba72389..7c2802befb3f 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,12 +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.36 2012/05/17 20:56:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.37 2012/05/17 21:09:24 ssuominen Exp $ 17 May 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.10.2-r1.ebuild: - Change >=media-video/libav-0.8.2 to <=media-video/libav-0.8.2 for ensuring - stable users will have postproc as required by media-libs/xine-lib wrt - #416407. Alternative is to force media-video/ffmpeg in media-libs/xine-lib - again. + || ( ) block for allowing media/video/ffmpeg, media-libs/libpostproc and + <=media-video/libav-0.8.2 as providers for getting postproc wrt #416407 17 May 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.3.ebuild: ffmpeg provides libpostproc 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="" |