diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 20:56:09 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 20:56:09 +0000 |
| commit | 2822b8ca2b6c7de5a1f0c9cc155ce213746d3ce3 (patch) | |
| tree | 437030a8fc8ae6cffc361d8801ce60c54e554cc9 /virtual/ffmpeg | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | gentoo-2-2822b8ca2b6c7de5a1f0c9cc155ce213746d3ce3.tar.gz gentoo-2-2822b8ca2b6c7de5a1f0c9cc155ce213746d3ce3.tar.bz2 gentoo-2-2822b8ca2b6c7de5a1f0c9cc155ce213746d3ce3.zip | |
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.
(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 | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index 14830daf86c1..966c8ba72389 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.35 2012/05/17 20:45:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.36 2012/05/17 20:56:09 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. 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 2dfd393cf70c..8dc5160d5af4 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.7 2012/05/16 13:04:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.8 2012/05/17 20:56:09 ssuominen Exp $ EAPI=4 @@ -16,7 +16,7 @@ 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.1[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="" |