media-gfx/blender: Collada support (bug #390431)

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 30 insertions, 8 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 61ab9d46d193..5abf7b97f74f 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.216 2011/11/14 09:30:17 lu_zero Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.217 2012/01/16 18:28:11 sping Exp $
+
+  16 Jan 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
+  +files/blender-2.60a-collada.patch, metadata.xml:
+  Enable support for collada based on just-packaged media-libs/opencollada (bug
+  #390431)
 
   14 Nov 2011; Luca Barbato <lu_zero@gentoo.org>
   files/blender-2.60a-libav-0.7.patch:
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index 7b15513e9a34..6788206a7cd7 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4 2011/11/13 22:43:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.5 2012/01/16 18:28:11 sping Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -10,11 +10,11 @@ SCM="subversion"
 ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
 fi
 
-inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
+inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
 
 IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
 	+dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
-	redcode +zlib iconv contrib verse"
+	redcode +zlib iconv contrib collada verse"
 
 LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
 for X in ${LANGS} ; do
@@ -60,7 +60,8 @@ RDEPEND="virtual/jpeg
 	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	sndfile? ( media-libs/libsndfile )
-	lcms? ( media-libs/lcms )"
+	lcms? ( media-libs/lcms )
+	collada? ( media-libs/opencollada )"
 
 DEPEND="dev-util/scons
 	apidoc? (
@@ -117,6 +118,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-collada.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-doxyfile.patch
 
 	# TODO: write a proper Makefile to replace the borked bmake script
@@ -271,10 +273,14 @@ src_configure() {
 		'sse rayoptimization' \
 		'redcode' \
 		'zlib' \
+		'collada' \
 		'verse' ; do
 		blend_with ${arg}
 	done
 
+	echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
+	echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
+
 	# libspnav not yet packaged (bug #390427)
 	echo 'WITH_BF_3DMOUSE=0' >> "${S}"/user-config.py
 
diff --git a/media-gfx/blender/files/blender-2.60a-collada.patch b/media-gfx/blender/files/blender-2.60a-collada.patch
new file mode 100644
index 000000000000..980b6407493f
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.60a-collada.patch
@@ -0,0 +1,11 @@
+--- source/blender/collada/SConscript	2012-01-16 19:04:02.438027832 +0100
++++ source/blender/collada/SConscript	2012-01-16 19:03:59.787060970 +0100
+@@ -35,7 +35,7 @@
+ if  env['OURPLATFORM']=='darwin':
+     incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+ else:
+-    incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
++    incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+ 
+ if env['BF_BUILDINFO']:
+     defs.append('WITH_BUILDINFO')
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index ef1de5bbae43..f5b51b70c2df 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -26,7 +26,7 @@
 			Install contrib scripts.
 		</flag>
 		<flag name='collada'>
-			Add support for Collada interchange format.
+			Add support for Collada interchange format through <pkg>media-libs/opencollada</pkg>.
 		</flag>
 		<flag name='verse'>
 			Adds verse clustering features to Blender.