summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/blender/blender-2.60a.ebuild')
-rw-r--r--media-gfx/blender/blender-2.60a.ebuild7
1 files changed, 5 insertions, 2 deletions
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index daa9ef8565fa..d614d099160c 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.10 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.11 2012/04/02 13:34:47 ssuominen Exp $
PYTHON_DEPEND="3:3.2"
EAPI=4
@@ -54,7 +54,10 @@ RDEPEND="virtual/jpeg
openexr? ( media-libs/openexr )
ffmpeg? (
>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
+ jpeg2k? (
+ !<media-libs/openjpeg-1.5.0
+ >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k]
+ )
)
openal? ( >=media-libs/openal-1.6.372 )
fftw? ( sci-libs/fftw:3.0 )