summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-10-26 23:36:36 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-10-26 23:36:36 +0000
commit9a89447f7f794f5d5f294515bad6e9e5bacb7d9c (patch)
treeb54e0e00258aa646c4d696474ab29fa39acf03d3 /media-video
parentold (diff)
downloadhistorical-9a89447f7f794f5d5f294515bad6e9e5bacb7d9c.tar.gz
historical-9a89447f7f794f5d5f294515bad6e9e5bacb7d9c.tar.bz2
historical-9a89447f7f794f5d5f294515bad6e9e5bacb7d9c.zip
Fix x264 dep for old snapshot.
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild4
2 files changed, 5 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index d9f12a229a75..5f75121d5688 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.322 2009/10/26 12:04:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.323 2009/10/26 23:36:36 ssuominen Exp $
*ffmpeg-0.5_p20373 (26 Oct 2009)
@@ -11,7 +11,8 @@
22 Oct 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
bump deps on x264
- 22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild:
+ 22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild,
+ ffmpeg-0.5_p19928.ebuild:
Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes'
Pettenò for reporting.
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild
index a5f46f89a7e2..972303427267 100644
--- a/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild,v 1.4 2009/09/26 21:52:02 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild,v 1.5 2009/10/26 23:36:36 ssuominen Exp $
EAPI=2
SCM=""
@@ -44,7 +44,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
mp3? ( media-sound/lame )
vorbis? ( media-libs/libvorbis media-libs/libogg )
theora? ( media-libs/libtheora[encode] media-libs/libogg )
- x264? ( >=media-libs/x264-0.0.20081006 )
+ x264? ( >=media-libs/x264-0.0.20081006 <media-libs/x264-0.0.20090923 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
faad? ( >=media-libs/faad2-2.6.1 )
zlib? ( sys-libs/zlib )