diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-10-18 22:35:19 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-10-18 22:35:19 +0000 |
| commit | cf2ac0131856762b91f9c1a484fdc5443a6a8c96 (patch) | |
| tree | 52ce2071eec99516b6cc2b36892f0484fca4d31c | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-cf2ac0131856762b91f9c1a484fdc5443a6a8c96.tar.gz gentoo-2-cf2ac0131856762b91f9c1a484fdc5443a6a8c96.tar.bz2 gentoo-2-cf2ac0131856762b91f9c1a484fdc5443a6a8c96.zip | |
Fixup 20080326 dependency on x264 to be <0.0.20081006.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64)
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 4fb5d6e89f39..969730447a87 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.233 2008/10/18 10:08:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.234 2008/10/18 22:35:19 loki_val Exp $ + + 18 Oct 2008; Peter Alfredsen <loki_val@gentoo.org> + ffmpeg-0.4.9_p20080326.ebuild: + Fixup 20080326 dependency on x264 to be <0.0.20081006. 18 Oct 2008; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.4.9_p20081014.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild index c051e17e8a13..053e9c87ac5e 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.5 2008/10/14 16:12:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.6 2008/10/18 22:35:19 loki_val Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -27,7 +27,7 @@ RDEPEND="imlib? ( >=media-libs/imlib2-1.4.0 ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis ) theora? ( media-libs/libtheora ) - x264? ( media-libs/x264 ) + x264? ( <media-libs/x264-0.0.20081006 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) aac? ( media-libs/faad2 ) a52? ( >=media-libs/a52dec-0.7.4-r4 ) |