summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-10-22 15:04:20 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-10-22 15:04:20 +0000
commit06372d8b0e166c1e802a23cd80a7aad5e1183467 (patch)
treeabe7a7fceb00c3c51f3136e89facda072d17959c
parentVersion bump. (diff)
downloadhistorical-06372d8b0e166c1e802a23cd80a7aad5e1183467.tar.gz
historical-06372d8b0e166c1e802a23cd80a7aad5e1183467.tar.bz2
historical-06372d8b0e166c1e802a23cd80a7aad5e1183467.zip
bump deps on x264
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 328748d4b66d..058d213b5c80 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# 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.320 2009/10/22 09:39:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.321 2009/10/22 15:04:20 aballier Exp $
+
+ 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:
Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes'
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 4d40104de1a9..6f61fce552a1 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.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-9999-r1.ebuild,v 1.21 2009/09/28 22:49:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.22 2009/10/22 15:04:20 aballier 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.20090923 )
+ x264? ( >=media-libs/x264-0.0.20091021 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
faad? ( >=media-libs/faad2-2.6.1 )
zlib? ( sys-libs/zlib )