summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-07-17 08:02:24 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-07-17 08:02:24 +0000
commit5e177703ed85ee952845f17e6504e3b6a241c438 (patch)
tree096a549d171f8f59dad5e0fb3520f5b4f3da4ace
parentFix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 an... (diff)
downloadgentoo-2-5e177703ed85ee952845f17e6504e3b6a241c438.tar.gz
gentoo-2-5e177703ed85ee952845f17e6504e3b6a241c438.tar.bz2
gentoo-2-5e177703ed85ee952845f17e6504e3b6a241c438.zip
Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 and -r2 have it, part of bug #231831.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
-rw-r--r--media-gfx/blender/ChangeLog7
-rw-r--r--media-gfx/blender/blender-2.45-r4.ebuild4
-rw-r--r--media-gfx/blender/blender-2.46.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 29afd493675a..3bcc07224041 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/blender
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.143 2008/06/25 21:09:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.144 2008/07/17 08:02:24 aballier Exp $
+
+ 17 Jul 2008; Alexis Ballier <aballier@gentoo.org> blender-2.45-r4.ebuild,
+ blender-2.46.ebuild:
+ Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1
+ and -r2 have it, part of bug #231831.
25 Jun 2008; Markus Meier <maekke@gentoo.org> blender-2.43-r2.ebuild:
does not build with python-2.5, so DEPEND on 2.4, bug #225109
diff --git a/media-gfx/blender/blender-2.45-r4.ebuild b/media-gfx/blender/blender-2.45-r4.ebuild
index 292eb4a82ac4..44adf66468d0 100644
--- a/media-gfx/blender/blender-2.45-r4.ebuild
+++ b/media-gfx/blender/blender-2.45-r4.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-gfx/blender/blender-2.45-r4.ebuild,v 1.1 2008/05/07 21:07:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r4.ebuild,v 1.2 2008/07/17 08:02:24 aballier Exp $
inherit multilib flag-o-matic eutils python
@@ -15,7 +15,7 @@ LICENSE="|| ( GPL-2 BL )"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND=">=dev-libs/openssl-0.9.6
- ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1
+ ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r20
media-libs/x264 )
jpeg? ( media-libs/jpeg )
media-libs/tiff
diff --git a/media-gfx/blender/blender-2.46.ebuild b/media-gfx/blender/blender-2.46.ebuild
index 903eedf0c1a6..278531210b76 100644
--- a/media-gfx/blender/blender-2.46.ebuild
+++ b/media-gfx/blender/blender-2.46.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-gfx/blender/blender-2.46.ebuild,v 1.2 2008/05/24 13:30:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.46.ebuild,v 1.3 2008/07/17 08:02:24 aballier Exp $
inherit multilib flag-o-matic eutils python
@@ -15,7 +15,7 @@ LICENSE="|| ( GPL-2 BL )"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND=">=dev-libs/openssl-0.9.6
- ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1
+ ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r20
media-libs/x264 )
jpeg? ( media-libs/jpeg )
media-libs/tiff