summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-11-02 21:38:16 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-11-02 21:38:16 +0000
commit8b181f4632c0d6d7eb8b3bcec7886d77bd17aee5 (patch)
treef70637de98134caaaed3dce1e60ba4e07bb40c11 /media-video/ffmpeg
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-8b181f4632c0d6d7eb8b3bcec7886d77bd17aee5.tar.gz
gentoo-2-8b181f4632c0d6d7eb8b3bcec7886d77bd17aee5.tar.bz2
gentoo-2-8b181f4632c0d6d7eb8b3bcec7886d77bd17aee5.zip
Raise media-sound/lame depend to >= 3.98.3 wrt #343467 by Kai Krakow.
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 3fbdbf957516..9e8bbb26a0a7 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.380 2010/10/30 15:42:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.381 2010/11/02 21:38:16 ssuominen Exp $
+
+ 02 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+ ffmpeg-0.6_p25423.ebuild, ffmpeg-9999.ebuild:
+ Raise media-sound/lame depend to >= 3.98.3 wrt #343467 by Kai Krakow.
30 Oct 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
bump x264 requirements
diff --git a/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild b/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
index 827c51099724..719d65fa6d91 100644
--- a/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.3 2010/10/11 22:13:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.4 2010/11/02 21:38:16 ssuominen Exp $
EAPI="2"
@@ -43,7 +43,7 @@ RDEPEND="
dirac? ( media-video/dirac )
encode? (
faac? ( media-libs/faac )
- mp3? ( media-sound/lame )
+ mp3? ( >=media-sound/lame-3.98.3 )
theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
vorbis? ( media-libs/libvorbis media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20100605 )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 382b0c20fdc8..7365999a89c2 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.23 2010/10/30 15:42:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.24 2010/11/02 21:38:15 ssuominen Exp $
EAPI="2"
@@ -43,7 +43,7 @@ RDEPEND="
dirac? ( media-video/dirac )
encode? (
faac? ( media-libs/faac )
- mp3? ( media-sound/lame )
+ mp3? ( >=media-sound/lame--3.98.3 )
theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
vorbis? ( media-libs/libvorbis media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20101029 )