media-gfx/blender: Fix compilation

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

4 files changed, 28 insertions, 7 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 47c70061e2ce..923741bbebfd 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.219 2012/02/06 21:48:17 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.220 2012/02/11 23:10:36 sping Exp $
+
+  11 Feb 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
+  +files/blender-2.61-opencollada-debug.patch:
+  Fix compilation for USE="debug collada", patch by Anthoine Bourgeois
 
   06 Feb 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
   metadata.xml:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b2398da14a06..ca9dea13845f 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -37,6 +37,7 @@ AUX blender-2.60a-enable_site_module.patch 974 RMD160 e93ddcd1372751951b6e56f72c
 AUX blender-2.60a-insecure.desktop 594 RMD160 48d7b683f4ae057a1766dabb267e5048e92114f6 SHA1 1d6d2c61a0c79b6c78842ad354746ffe5a2d7ffa SHA256 2b7920c517c93d4f1430dc7ee70a414d32c1b17648a0e8395bbd900d1be8dd84
 AUX blender-2.60a-libav-0.7.patch 1181 RMD160 66dc84d6ca37a97bb43886ed86b72499383636b6 SHA1 be60d7fd39821fb28b3e23a659df8f7eb51d1f60 SHA256 d8e7a08b042ce8311bd71e2edec7457ddf8fe8b64243f30f179d391ea170ab50
 AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
+AUX blender-2.61-opencollada-debug.patch 846 RMD160 55c37aea862c4318624fb394ca32f67775bc95b8 SHA1 5866b3e4911ba95b071457cf1fd09e5a87b63236 SHA256 c2861bca33a9a72dc5f45dfe15e5b552fe93843ee9d6e10e594baec62ecb206b
 AUX blender.desktop 199 RMD160 a55286923d1422f620dff35226a42fcbaf8c60a9 SHA1 c5ad8c540571a254756ac541c64933e80406aa16 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
@@ -48,13 +49,13 @@ EBUILD blender-2.48a-r3.ebuild 4044 RMD160 831a9636988fb1a5ca9a406e45e6bf204511b
 EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e SHA1 3537ea47e3ccb11df14c321580559e04452bb7ee SHA256 67af33393f99caee9c451feb548d98836d2a0d75c714c253ec01416281339ed4
 EBUILD blender-2.49b-r2.ebuild 5050 RMD160 87bba6723e7f083f395666581f568848154c3233 SHA1 105297aa72047f8501775933f1d4b51bf992d60e SHA256 39dec297a537d22f07576adc90211ec8806f8d63c6c30906f58f6e51dc2cc764
 EBUILD blender-2.57-r1.ebuild 13944 RMD160 9454a84cc292579d40ac7eed698b37c721803185 SHA1 5500bbd689e39f2741a9d757df19866bc9184bb4 SHA256 ac0677eea62ded4647e09dacad093148261def41c66893a011d7a1ce4478724f
-EBUILD blender-2.60a.ebuild 14046 RMD160 c256bb8e183283489c4495aa075d544f602f5db8 SHA1 27b40ff482bc835fb6e09bae1dfbb07caffc0941 SHA256 517b98643fb281bf9194d6b71ac7b51c6e5258ebbf93c75de92406ac12934140
-MISC ChangeLog 34146 RMD160 5acf2233987f862faf3a6853a7df537400f4155c SHA1 2f5cd8b933a574e673292a5657ca08d43eac363d SHA256 d928e3a2d8bdea57da3c68720c7e40d3dab1b3981860ecbebfd2bbc714280294
+EBUILD blender-2.60a.ebuild 14103 RMD160 a2998bc5228958fd8aae1ef5106220074825431d SHA1 517a806fce552f97f6304a28c4c6255fd2d644d4 SHA256 d848dbcf4a109b5e9db8991633831d77e70cc93f07642f5b994254c9c0c4c38b
+MISC ChangeLog 34339 RMD160 733bdc757f5b456c117e47a144e22431b26ef4fe SHA1 4336208c9967231374a16cee266ec41eae41cc67 SHA256 e061e4f4402055abe336ce6ebc79a3530eb26e70176695c45757611b98e7ec1f
 MISC metadata.xml 1965 RMD160 3f48332ec841384161d2377ff0a2e02c37a4a909 SHA1 bf4dce385ef1e309b5d6ac4a8a631463587cf949 SHA256 ec5973923a2cce6ae374f6dfed03b15f401b1c9a05b1e8520440cdd5756a1c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8wSo0ACgkQsAvGakAaFgA5qwCg1IYdqcrwnIFGBCYTgfuVymgD
-rT0An3LH0bYeVkMWMWHa97YfSwVzF7+y
-=JxR8
+iEYEARECAAYFAk829VIACgkQsAvGakAaFgBHUACgtjrAdS0+L3K5h1l13vQXHBcK
+ObUAnAzizLG/Zgk9oJr1Dhp22ve7J+aG
+=zj6o
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index b81910d96d8f..87701df3d5f6 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.7 2012/02/06 21:48:17 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.8 2012/02/11 23:10:36 sping Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -120,6 +120,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-desktop.patch
 	epatch "${FILESDIR}"/${P}-collada.patch
+	epatch "${FILESDIR}"/${PN}-2.61-opencollada-debug.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-doxyfile.patch
 
 	# TODO: write a proper Makefile to replace the borked bmake script
diff --git a/media-gfx/blender/files/blender-2.61-opencollada-debug.patch b/media-gfx/blender/files/blender-2.61-opencollada-debug.patch
new file mode 100644
index 000000000000..0310c478736d
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.61-opencollada-debug.patch
@@ -0,0 +1,15 @@
+diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py
+--- blender-2.61.orig/build_files/scons/tools/Blender.py	2012-02-08 22:33:29.133700566 +0100
++++ blender-2.61/build_files/scons/tools/Blender.py	2012-02-08 22:35:13.459698722 +0100
+@@ -276,10 +276,7 @@ def setup_syslibs(lenv):
+         syslibs += Split(lenv['BF_PTHREADS_LIB'])
+     if lenv['WITH_BF_COLLADA']:
+         syslibs.append(lenv['BF_PCRE_LIB'])
+-        if lenv['BF_DEBUG']:
+-            syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
+-        else:
+-            syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
++        syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
+         syslibs.append(lenv['BF_EXPAT_LIB'])
+     if lenv['WITH_BF_COLAMD']:
+         syslibs += Split(lenv['BF_COLAMD_LIB'])