diff options
Diffstat (limited to 'media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch')
| -rw-r--r-- | media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch b/media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch new file mode 100644 index 0000000..37680b6 --- /dev/null +++ b/media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch @@ -0,0 +1,24 @@ +diff -urN /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//build_files/scons/tools/Blender.py /tmp/blender-2.59//build_files/scons/tools/Blender.py +--- /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//build_files/scons/tools/Blender.py 2011-08-11 18:47:18.000000000 +0200 ++++ /tmp/blender-2.59//build_files/scons/tools/Blender.py 2011-10-18 10:52:39.340067631 +0200 +@@ -268,7 +268,7 @@ + syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])] + else: + syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) +- syslibs.append(lenv['BF_EXPAT_LIB']) ++ syslibs.append('xml2') + + if not lenv['WITH_BF_STATICLIBSAMPLERATE']: + syslibs += Split(lenv['BF_LIBSAMPLERATE_LIB']) +diff -urN /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//source/blender/collada/SConscript /tmp/blender-2.59//source/blender/collada/SConscript +--- /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//source/blender/collada/SConscript 2011-08-11 18:44:01.000000000 +0200 ++++ /tmp/blender-2.59//source/blender/collada/SConscript 2011-10-18 10:53:20.775067619 +0200 +@@ -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('NAN_BUILDINFO') |