From 41245d32007471400635a3481ce94603db0df692 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Mar 23 2011 19:43:43 +0000 Subject: Update to snapshot svn35722 --- diff --git a/blender-2.49-scons.patch b/blender-2.49-scons.patch deleted file mode 100644 index 88d8d6d..0000000 --- a/blender-2.49-scons.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up blender-2.49/config/linux2-config.py.org blender-2.49/config/linux2-config.py ---- blender-2.49/config/linux2-config.py.org 2009-05-18 21:13:48.000000000 +0200 -+++ blender-2.49/config/linux2-config.py 2009-06-01 20:16:59.000000000 +0200 -@@ -181,6 +181,12 @@ CCFLAGS = ['-pipe','-fPIC','-funsigned-c - - CPPFLAGS = ['-DXP_UNIX'] - CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] -+ -+import os -+RPM_OPT_FLAGS = os.environ['RPM_OPT_FLAGS'].split() -+CCFLAGS += RPM_OPT_FLAGS -+CXXFLAGS += RPM_OPT_FLAGS -+ - REL_CFLAGS = ['-O2'] - REL_CCFLAGS = ['-O2'] - ##BF_DEPEND = True -diff -up blender-2.49/extern/SConscript.org blender-2.49/extern/SConscript ---- blender-2.49/extern/SConscript.org 2009-02-26 15:21:17.000000000 +0100 -+++ blender-2.49/extern/SConscript 2009-06-01 20:20:48.000000000 +0200 -@@ -2,8 +2,6 @@ - - Import('env') - --SConscript(['glew/SConscript']) -- - if env['WITH_BF_GAMEENGINE']: - if env['WITH_BF_SOLID']: - SConscript(['qhull/SConscript', 'solid/SConscript']) -diff -up blender-2.49/SConstruct.org blender-2.49/SConstruct ---- blender-2.49/SConstruct.org 2009-04-21 21:06:24.000000000 +0200 -+++ blender-2.49/SConstruct 2009-06-01 20:18:42.000000000 +0200 -@@ -223,7 +223,7 @@ if env['OURPLATFORM'] == 'linux2' : - - def CheckFreeAlut(context,env): - context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC ) -- env['LIBS'] = 'alut' -+ env['LIBS'] = 'alut, openal' - result = context.TryLink(mylib_test_source_file, '.c') - context.Result(result) - return result diff --git a/blender-2.49b-cve.patch b/blender-2.49b-cve.patch deleted file mode 100644 index 5141756..0000000 --- a/blender-2.49b-cve.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up blender-2.49b/source/blender/blenkernel/intern/blender.c.cve blender-2.49b/source/blender/blenkernel/intern/blender.c ---- blender-2.49b/source/blender/blenkernel/intern/blender.c.cve 2009-09-01 17:21:17.000000000 +0200 -+++ blender-2.49b/source/blender/blenkernel/intern/blender.c 2010-01-13 17:32:11.312632711 +0100 -@@ -41,6 +41,7 @@ - #define write _write - #endif - -+#include - #include - #include - #include -@@ -753,7 +754,7 @@ void BKE_undo_save_quit(void) - { - UndoElem *uel; - MemFileChunk *chunk; -- int file; -+ int file = -1; - char str[FILE_MAXDIR+FILE_MAXFILE]; - - if( (U.uiflag & USER_GLOBALUNDO)==0) return; -@@ -767,12 +768,20 @@ void BKE_undo_save_quit(void) - /* no undo state to save */ - if(undobase.first==undobase.last) return; - -- BLI_make_file_string("/", str, btempdir, "quit.blend"); -+ BLI_make_file_string("/", str, BLI_gethome(), ".blender/quit.blend"); - -- file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666); -- if(file == -1) { -- error("Unable to save %s, check you have permissions", str); -- return; -+ int flags = O_BINARY+O_WRONLY+O_TRUNC+O_EXCL+O_CREAT; -+ -+ while(file == -1) { -+ file = open(str,flags,0666); -+ if(file == -1) { -+ if(errno == EEXIST) { -+ flags ^= O_CREAT; -+ } else { -+ error("Unable to save %s, check you have permissions", str); -+ return; -+ } -+ } - } - - chunk= uel->memfile.chunks.first; -diff -up blender-2.49b/source/blender/python/BPY_interface.c.cve blender-2.49b/source/blender/python/BPY_interface.c ---- blender-2.49b/source/blender/python/BPY_interface.c.cve 2009-09-01 17:21:12.000000000 +0200 -+++ blender-2.49b/source/blender/python/BPY_interface.c 2010-01-13 17:08:19.567752630 +0100 -@@ -236,6 +236,11 @@ void BPY_start_python( int argc, char ** - Py_Initialize( ); - - PySys_SetArgv( argc_copy, argv_copy ); -+ -+ /* Sanitize sys.path to prevent relative imports loading modules in -+ the current working directory */ -+ PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)"); -+ - /* Initialize thread support (also acquires lock) */ - PyEval_InitThreads(); - diff --git a/blender-2.49b-uid.patch b/blender-2.49b-uid.patch deleted file mode 100644 index 968500f..0000000 --- a/blender-2.49b-uid.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up blender-2.49b/source/blender/blenlib/intern/storage.c.sf blender-2.49b/source/blender/blenlib/intern/storage.c ---- blender-2.49b/source/blender/blenlib/intern/storage.c.sf 2010-03-28 10:14:15.140027561 +0200 -+++ blender-2.49b/source/blender/blenlib/intern/storage.c 2010-03-28 10:19:55.630278553 +0200 -@@ -381,7 +381,8 @@ void BLI_adddirstrings() - struct passwd *pwuser; - pwuser = getpwuid(files[num].s.st_uid); - if ( pwuser ) { -- strcpy(files[num].owner, pwuser->pw_name); -+ strncpy(files[num].owner, pwuser->pw_name, sizeof(files[num].owner)-1); -+ files[num].owner[sizeof(files[num].owner)-1] = '\0'; - } else { - sprintf(files[num].owner, "%d", files[num].s.st_uid); - } diff --git a/blender-2.56-ext.patch b/blender-2.56-ext.patch index e8cb213..d594e98 100644 --- a/blender-2.56-ext.patch +++ b/blender-2.56-ext.patch @@ -1,101 +1,19 @@ -diff -up blender-2.56-beta-source/extern/SConscript.ext blender-2.56-beta-source/extern/SConscript ---- blender-2.56-beta-source/extern/SConscript.ext 2010-08-29 22:52:05.000000000 +0200 -+++ blender-2.56-beta-source/extern/SConscript 2011-01-19 19:33:54.739719000 +0100 -@@ -2,8 +2,6 @@ - - Import('env') - --SConscript(['glew/SConscript']) -- - if env['WITH_BF_BULLET']: - SConscript(['bullet2/src/SConscript']) - -diff -up blender-2.56-beta-source/intern/ghost/SConscript.ext blender-2.56-beta-source/intern/ghost/SConscript ---- blender-2.56-beta-source/intern/ghost/SConscript.ext 2010-11-01 23:26:56.000000000 +0100 -+++ blender-2.56-beta-source/intern/ghost/SConscript 2011-01-19 19:33:54.740719001 +0100 +diff -up blender/intern/ghost/SConscript.ext blender/intern/ghost/SConscript +--- blender/intern/ghost/SConscript.ext 2011-03-23 17:08:28.000000000 +0100 ++++ blender/intern/ghost/SConscript 2011-03-23 18:30:45.029937000 +0100 @@ -59,7 +59,7 @@ else: if env['BF_GHOST_DEBUG']: defs.append('BF_GHOST_DEBUG') -incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] -+incs = '. ../string #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] ++incs = '. ../string #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): incs = env['BF_WINTAB_INC'] + ' ' + incs -diff -up blender-2.56-beta-source/source/blender/blenfont/SConscript.ext blender-2.56-beta-source/source/blender/blenfont/SConscript ---- blender-2.56-beta-source/source/blender/blenfont/SConscript.ext 2010-08-29 22:52:05.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/blenfont/SConscript 2011-01-19 19:33:54.741719001 +0100 -@@ -5,7 +5,6 @@ Import ('env') - sources = env.Glob('intern/*.c') - - incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../editors/include' --incs += ' #/extern/glew/include' - incs += ' ' + env['BF_FREETYPE_INC'] - incs += ' ' + env['BF_GETTEXT_INC'] - -diff -up blender-2.56-beta-source/source/blender/blenkernel/SConscript.ext blender-2.56-beta-source/source/blender/blenkernel/SConscript ---- blender-2.56-beta-source/source/blender/blenkernel/SConscript.ext 2010-12-21 01:21:42.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/blenkernel/SConscript 2011-01-19 19:33:54.741719001 +0100 -@@ -10,7 +10,7 @@ incs += ' ../imbuf ../ikplugin ../avi #/ - incs += ' #/intern/iksolver/extern ../blenloader' - incs += ' #/extern/bullet2/src' - incs += ' #/intern/opennl/extern #/intern/bsp/extern' --incs += ' ../gpu #/extern/glew/include' -+incs += ' ../gpu' - incs += ' #/intern/smoke/extern' - incs += ' #/intern/audaspace/intern' - -diff -up blender-2.56-beta-source/source/blender/editors/animation/SConscript.ext blender-2.56-beta-source/source/blender/editors/animation/SConscript ---- blender-2.56-beta-source/source/blender/editors/animation/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/animation/SConscript 2011-01-19 19:33:54.742719000 +0100 -@@ -4,6 +4,6 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - - env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] ) -diff -up blender-2.56-beta-source/source/blender/editors/armature/SConscript.ext blender-2.56-beta-source/source/blender/editors/armature/SConscript ---- blender-2.56-beta-source/source/blender/editors/armature/SConscript.ext 2010-06-22 17:12:00.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/armature/SConscript 2011-01-19 19:33:54.742719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../gpu ../../makesrna #/intern/opennl/extern' - - if env['OURPLATFORM'] == 'linux2': -diff -up blender-2.56-beta-source/source/blender/editors/curve/SConscript.ext blender-2.56-beta-source/source/blender/editors/curve/SConscript ---- blender-2.56-beta-source/source/blender/editors/curve/SConscript.ext 2009-11-22 07:22:53.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/curve/SConscript 2011-01-19 19:33:54.743719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../gpu' - incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' - -diff -up blender-2.56-beta-source/source/blender/editors/gpencil/SConscript.ext blender-2.56-beta-source/source/blender/editors/gpencil/SConscript ---- blender-2.56-beta-source/source/blender/editors/gpencil/SConscript.ext 2009-11-22 07:22:53.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/gpencil/SConscript 2011-01-19 19:33:54.743719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc ' - incs += ' ../../gpu' - incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' - -diff -up blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h.ext blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h ---- blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h.ext 2010-03-06 14:43:47.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h 2011-01-19 19:33:54.744719001 +0100 -@@ -31,7 +31,7 @@ +diff -up blender/source/blender/editors/include/BIF_gl.h.ext blender/source/blender/editors/include/BIF_gl.h +--- blender/source/blender/editors/include/BIF_gl.h.ext 2011-03-23 18:31:29.545937006 +0100 ++++ blender/source/blender/editors/include/BIF_gl.h 2011-03-23 18:31:54.026936914 +0100 +@@ -35,7 +35,7 @@ #ifndef BIF_GL_H #define BIF_GL_H @@ -104,501 +22,135 @@ diff -up blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h.ext bl /* * these should be phased out. cpack should be replaced in -diff -up blender-2.56-beta-source/source/blender/editors/interface/SConscript.ext blender-2.56-beta-source/source/blender/editors/interface/SConscript ---- blender-2.56-beta-source/source/blender/editors/interface/SConscript.ext 2010-10-31 05:11:39.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/interface/SConscript 2011-01-19 19:33:54.744719001 +0100 -@@ -8,7 +8,6 @@ for source in env.Glob('*_api.c'): - - incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf' - incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu' --incs += ' #/extern/glew/include' - incs += ' ../../python/' # python button eval - - defs = [] -diff -up blender-2.56-beta-source/source/blender/editors/mesh/SConscript.ext blender-2.56-beta-source/source/blender/editors/mesh/SConscript ---- blender-2.56-beta-source/source/blender/editors/mesh/SConscript.ext 2009-11-22 07:22:53.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/mesh/SConscript 2011-01-19 19:33:54.745719001 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../gpu' - incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' - -diff -up blender-2.56-beta-source/source/blender/editors/metaball/SConscript.ext blender-2.56-beta-source/source/blender/editors/metaball/SConscript ---- blender-2.56-beta-source/source/blender/editors/metaball/SConscript.ext 2009-11-22 07:22:53.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/metaball/SConscript 2011-01-19 19:33:54.746719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../gpu' - incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' - -diff -up blender-2.56-beta-source/source/blender/editors/physics/SConscript.ext blender-2.56-beta-source/source/blender/editors/physics/SConscript ---- blender-2.56-beta-source/source/blender/editors/physics/SConscript.ext 2009-12-17 18:05:28.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/physics/SConscript 2011-01-19 19:33:54.746719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../gpu' - incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' - -diff -up blender-2.56-beta-source/source/blender/editors/render/SConscript.ext blender-2.56-beta-source/source/blender/editors/render/SConscript ---- blender-2.56-beta-source/source/blender/editors/render/SConscript.ext 2010-02-22 11:36:53.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/render/SConscript 2011-01-19 19:33:54.747719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../gpu' - incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' - incs += ' ../../blenloader' -diff -up blender-2.56-beta-source/source/blender/editors/screen/SConscript.ext blender-2.56-beta-source/source/blender/editors/screen/SConscript ---- blender-2.56-beta-source/source/blender/editors/screen/SConscript.ext 2010-08-29 23:38:59.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/screen/SConscript 2011-01-19 19:33:54.747719000 +0100 -@@ -6,7 +6,7 @@ sources = env.Glob('*.c') - incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' - incs += ' ../../blenloader ../../windowmanager ../../makesrna ../../gpu' - incs += ' ../../render/extern/include' --incs += ' #/intern/guardedalloc #/extern/glew/include' -+incs += ' #/intern/guardedalloc' - - defs = '' - -diff -up blender-2.56-beta-source/source/blender/editors/sculpt_paint/SConscript.ext blender-2.56-beta-source/source/blender/editors/sculpt_paint/SConscript ---- blender-2.56-beta-source/source/blender/editors/sculpt_paint/SConscript.ext 2010-08-29 23:38:59.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/sculpt_paint/SConscript 2011-01-19 19:33:54.748719001 +0100 -@@ -6,7 +6,7 @@ sources = env.Glob('*.c') - defs = [] - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../render/extern/include' - incs += ' ../../gpu ../../makesrna' - -diff -up blender-2.56-beta-source/source/blender/editors/space_action/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_action/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_action/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_action/SConscript 2011-01-19 19:33:54.748719001 +0100 -@@ -4,6 +4,6 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc ' - - env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core'], priority=[80] ) -diff -up blender-2.56-beta-source/source/blender/editors/space_api/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_api/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_api/SConscript.ext 2010-06-06 01:27:49.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_api/SConscript 2011-01-19 19:33:54.749719001 +0100 -@@ -5,7 +5,7 @@ sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna' - incs += ' ../../windowmanager ../../python ../../makesrna' --incs += ' #/intern/guardedalloc #/extern/glew/include' -+incs += ' #/intern/guardedalloc ' - - defs = '' - -diff -up blender-2.56-beta-source/source/blender/editors/space_buttons/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_buttons/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_buttons/SConscript.ext 2010-06-06 01:27:49.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_buttons/SConscript 2011-01-19 19:33:54.750719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc ' - incs += ' ../../makesrna ../../render/extern/include' - - defs = [] -diff -up blender-2.56-beta-source/source/blender/editors/space_console/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_console/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_console/SConscript.ext 2010-10-31 05:11:39.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/space_console/SConscript 2011-01-19 19:33:54.750719000 +0100 -@@ -6,7 +6,6 @@ defs = [] +diff -up blender/source/blender/editors/space_console/SConscript.ext blender/source/blender/editors/space_console/SConscript +--- blender/source/blender/editors/space_console/SConscript.ext 2011-03-23 17:09:32.000000000 +0100 ++++ blender/source/blender/editors/space_console/SConscript 2011-03-23 18:30:45.030937000 +0100 +@@ -6,7 +6,7 @@ defs = [] incs = [ '../include', - '#extern/glew/include', ++ '', '#/intern/guardedalloc', '../../makesdna', '../../makesrna', -diff -up blender-2.56-beta-source/source/blender/editors/space_file/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_file/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_file/SConscript.ext 2010-08-29 22:52:05.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_file/SConscript 2011-01-19 19:33:54.751719000 +0100 -@@ -6,7 +6,7 @@ sources = env.Glob('*.c') - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' - incs += ' ../../blenloader ../../makesrna ../../blenfont' - incs += ' ../../render/extern/include' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - - defs = [] - -diff -up blender-2.56-beta-source/source/blender/editors/space_graph/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_graph/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_graph/SConscript.ext 2010-08-16 22:05:59.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_graph/SConscript 2011-01-19 19:33:54.753719001 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' #/intern/audaspace/intern' - - env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), [], libtype=['core'], priority=[50] ) -diff -up blender-2.56-beta-source/source/blender/editors/space_image/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_image/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_image/SConscript.ext 2010-12-02 05:23:56.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/space_image/SConscript 2011-01-19 19:33:54.754719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../render/extern/include ../../makesrna' - - defs = [] -diff -up blender-2.56-beta-source/source/blender/editors/space_info/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_info/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_info/SConscript.ext 2010-06-04 22:56:56.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_info/SConscript 2011-01-19 19:33:54.754719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - - defs = [] - -diff -up blender-2.56-beta-source/source/blender/editors/space_logic/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_logic/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_logic/SConscript.ext 2010-10-31 04:20:33.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/space_logic/SConscript 2011-01-19 19:33:54.755719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../makesrna ../interface' - - defs = [] -diff -up blender-2.56-beta-source/source/blender/editors/space_nla/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_nla/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_nla/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_nla/SConscript 2011-01-19 19:33:54.756719001 +0100 -@@ -4,6 +4,6 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - - env.BlenderLib ( 'bf_editors_space_nla', sources, Split(incs), [], libtype=['core'], priority=[85] ) -diff -up blender-2.56-beta-source/source/blender/editors/space_node/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_node/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_node/SConscript.ext 2010-08-29 22:52:05.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_node/SConscript 2011-01-19 19:33:54.756719001 +0100 +diff -up blender/source/blender/editors/space_node/SConscript.ext blender/source/blender/editors/space_node/SConscript +--- blender/source/blender/editors/space_node/SConscript.ext 2011-03-23 17:09:41.000000000 +0100 ++++ blender/source/blender/editors/space_node/SConscript 2011-03-23 18:30:45.030937000 +0100 @@ -5,7 +5,7 @@ sources = env.Glob('*.c') - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' - incs += ' ../../nodes ../../render/extern/include' + incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' + incs += ' ../../nodes ../../render/extern/include ../../blenloader' -incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' -+incs += ' ../../windowmanager #intern/guardedalloc' ++incs += ' ../../windowmanager #intern/guardedalloc ' defs = [] cf = [] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): -diff -up blender-2.56-beta-source/source/blender/editors/space_outliner/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_outliner/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_outliner/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_outliner/SConscript 2011-01-19 19:33:54.757719001 +0100 -@@ -5,6 +5,5 @@ sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' - incs += ' ../../windowmanager #/intern/guardedalloc ../../makesrna' --incs += ' #/extern/glew/include' - - env.BlenderLib ( 'bf_editors_space_outliner', sources, Split(incs), [], libtype=['core'], priority=[60] ) -diff -up blender-2.56-beta-source/source/blender/editors/space_script/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_script/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_script/SConscript.ext 2010-10-31 05:11:39.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/space_script/SConscript 2011-01-19 19:33:54.757719001 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../makesrna' - incs += ' ../../python' - -diff -up blender-2.56-beta-source/source/blender/editors/space_sequencer/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_sequencer/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_sequencer/SConscript.ext 2010-08-16 22:05:59.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_sequencer/SConscript 2011-01-19 19:33:54.758719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../makesrna' - incs += ' #/intern/audaspace/intern' - -diff -up blender-2.56-beta-source/source/blender/editors/space_sound/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_sound/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_sound/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_sound/SConscript 2011-01-19 19:33:54.758719000 +0100 -@@ -4,6 +4,6 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - - env.BlenderLib ( 'bf_editors_space_sound', sources, Split(incs), [], libtype=['core'], priority=[75] ) -diff -up blender-2.56-beta-source/source/blender/editors/space_text/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_text/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_text/SConscript.ext 2010-10-31 05:11:39.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/space_text/SConscript 2011-01-19 19:33:54.759719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - defs = [] - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../python ../../makesrna ../../blenfont' - - if env['WITH_BF_PYTHON']: -diff -up blender-2.56-beta-source/source/blender/editors/space_time/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_time/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_time/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_time/SConscript 2011-01-19 19:33:54.759719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc ' - incs += ' ../../makesrna' - - env.BlenderLib ( 'bf_editors_space_time', sources, Split(incs), [], libtype=['core'], priority=[65] ) -diff -up blender-2.56-beta-source/source/blender/editors/space_userpref/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_userpref/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_userpref/SConscript.ext 2010-06-04 22:56:56.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/space_userpref/SConscript 2011-01-19 19:33:54.760719001 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - - defs = [] - -diff -up blender-2.56-beta-source/source/blender/editors/space_view3d/SConscript.ext blender-2.56-beta-source/source/blender/editors/space_view3d/SConscript ---- blender-2.56-beta-source/source/blender/editors/space_view3d/SConscript.ext 2010-10-31 04:20:33.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/editors/space_view3d/SConscript 2011-01-19 19:33:54.761719001 +0100 -@@ -5,7 +5,7 @@ sources = env.Glob('*.c') - defs = [ 'GLEW_STATIC' ] - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../render/extern/include' - incs += ' ../../gpu ../../makesrna ../../blenfont' - incs += ' #/intern/smoke/extern' -diff -up blender-2.56-beta-source/source/blender/editors/transform/SConscript.ext blender-2.56-beta-source/source/blender/editors/transform/SConscript ---- blender-2.56-beta-source/source/blender/editors/transform/SConscript.ext 2010-09-03 05:30:20.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/transform/SConscript 2011-01-19 19:33:54.761719001 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../render/extern/include' - incs += ' ../../gpu ../../makesrna' - -diff -up blender-2.56-beta-source/source/blender/editors/util/SConscript.ext blender-2.56-beta-source/source/blender/editors/util/SConscript ---- blender-2.56-beta-source/source/blender/editors/util/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/util/SConscript 2011-01-19 19:33:54.762719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../makesrna' - - env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core'], priority=[130] ) -diff -up blender-2.56-beta-source/source/blender/editors/uvedit/SConscript.ext blender-2.56-beta-source/source/blender/editors/uvedit/SConscript ---- blender-2.56-beta-source/source/blender/editors/uvedit/SConscript.ext 2009-10-01 18:32:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/editors/uvedit/SConscript 2011-01-19 19:33:54.762719000 +0100 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' --incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -+incs += ' ../../windowmanager #/intern/guardedalloc' - incs += ' ../../makesrna #/intern/opennl/extern ../../gpu' - - env.BlenderLib ( 'bf_editors_uvedit', sources, Split(incs), [], libtype=['core'], priority=[45] ) -diff -up blender-2.56-beta-source/source/blender/gpu/SConscript.ext blender-2.56-beta-source/source/blender/gpu/SConscript ---- blender-2.56-beta-source/source/blender/gpu/SConscript.ext 2010-04-14 19:15:33.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/gpu/SConscript 2011-01-19 19:33:54.763719000 +0100 -@@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') - defs = [ 'GLEW_STATIC' ] - - incs = '../blenlib ../blenkernel ../makesdna ../include' --incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf .' -+incs += ' #intern/guardedalloc #intern/smoke/extern ../imbuf .' - - if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs += ' ' + env['BF_PTHREADS_INC'] -diff -up blender-2.56-beta-source/source/blender/nodes/SConscript.ext blender-2.56-beta-source/source/blender/nodes/SConscript ---- blender-2.56-beta-source/source/blender/nodes/SConscript.ext 2010-10-31 05:11:39.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/nodes/SConscript 2011-01-19 19:33:54.763719000 +0100 -@@ -12,7 +12,7 @@ incs += ' ../render/extern/include ../ma - incs += ' ../imbuf ../avi ' - incs += ' ../blenloader' - incs += ' ../blenkernel ../renderconverter ' --incs += ' ../gpu #/extern/glew/include ' -+incs += ' ../gpu ' - - incs += ' ' + env['BF_OPENGL_INC'] - incs += ' ' + env['BF_ZLIB_INC'] -diff -up blender-2.56-beta-source/source/blender/python/SConscript.ext blender-2.56-beta-source/source/blender/python/SConscript ---- blender-2.56-beta-source/source/blender/python/SConscript.ext 2010-08-29 22:52:05.000000000 +0200 -+++ blender-2.56-beta-source/source/blender/python/SConscript 2011-01-19 19:33:54.764719001 +0100 -@@ -5,7 +5,7 @@ sources = env.Glob('intern/*.c') +diff -up blender/source/blender/python/SConscript.ext blender/source/blender/python/SConscript +--- blender/source/blender/python/SConscript.ext 2011-03-23 17:09:19.000000000 +0100 ++++ blender/source/blender/python/SConscript 2011-03-23 18:30:45.031937000 +0100 +@@ -6,7 +6,7 @@ Import ('env') incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes' incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager' -incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include' -+incs += ' #intern/guardedalloc #intern/memutil' ++incs += ' #intern/guardedalloc #intern/memutil ' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] - defs = [] -diff -up blender-2.56-beta-source/source/blender/windowmanager/SConscript.ext blender-2.56-beta-source/source/blender/windowmanager/SConscript ---- blender-2.56-beta-source/source/blender/windowmanager/SConscript.ext 2010-10-31 05:11:39.000000000 +0100 -+++ blender-2.56-beta-source/source/blender/windowmanager/SConscript 2011-01-19 19:33:54.768719001 +0100 -@@ -12,7 +12,7 @@ incs += ' ../radiosity/extern/include .. - incs += ' ../makesrna ../gpu ../blenfont' - - incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' --incs += ' #/intern/elbeem #/extern/glew/include' -+incs += ' #/intern/elbeem' - - defs = [ 'GLEW_STATIC' ] - -diff -up blender-2.56-beta-source/source/creator/SConscript.ext blender-2.56-beta-source/source/creator/SConscript ---- blender-2.56-beta-source/source/creator/SConscript.ext 2010-10-31 05:11:39.000000000 +0100 -+++ blender-2.56-beta-source/source/creator/SConscript 2011-01-19 19:33:54.769719001 +0100 -@@ -8,7 +8,7 @@ incs = '#/intern/guardedalloc ../blender - incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf' - incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager' - incs += ' ../blender/makesdna ../blender/makesrna ../kernel/gen_messaging' --incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu' -+incs += ' ../kernel/gen_system ../blender/gpu' - incs += ' ' + env['BF_OPENGL_INC'] - - defs = [] -diff -up blender-2.56-beta-source/source/gameengine/BlenderRoutines/SConscript.ext blender-2.56-beta-source/source/gameengine/BlenderRoutines/SConscript ---- blender-2.56-beta-source/source/gameengine/BlenderRoutines/SConscript.ext 2010-11-18 12:42:05.000000000 +0100 -+++ blender-2.56-beta-source/source/gameengine/BlenderRoutines/SConscript 2011-01-19 19:33:54.770719000 +0100 + is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']) +diff -up blender/source/gameengine/BlenderRoutines/SConscript.ext blender/source/gameengine/BlenderRoutines/SConscript +--- blender/source/gameengine/BlenderRoutines/SConscript.ext 2011-03-23 17:09:03.000000000 +0100 ++++ blender/source/gameengine/BlenderRoutines/SConscript 2011-03-23 18:30:45.031937000 +0100 @@ -19,7 +19,7 @@ incs += ' #source/gameengine/SceneGraph incs += ' #source/gameengine/Physics/Bullet' incs += ' #source/gameengine/Network/LoopBackNetwork' incs += ' #source/blender/misc #source/blender/blenloader' -incs += ' #extern/glew/include #source/blender/gpu' -+incs += ' #source/blender/gpu' ++incs += ' #source/blender/gpu' incs += ' #source/blender/windowmanager' if env['WITH_BF_FFMPEG']: -diff -up blender-2.56-beta-source/source/gameengine/GamePlayer/common/SConscript.ext blender-2.56-beta-source/source/gameengine/GamePlayer/common/SConscript ---- blender-2.56-beta-source/source/gameengine/GamePlayer/common/SConscript.ext 2011-01-19 19:58:34.984718999 +0100 -+++ blender-2.56-beta-source/source/gameengine/GamePlayer/common/SConscript 2011-01-19 19:58:49.450719001 +0100 -@@ -42,8 +42,7 @@ incs = ['.', - '#source/gameengine/GamePlayer/ghost', +diff -up blender/source/gameengine/GamePlayer/common/SConscript.ext blender/source/gameengine/GamePlayer/common/SConscript +--- blender/source/gameengine/GamePlayer/common/SConscript.ext 2011-03-23 17:09:03.000000000 +0100 ++++ blender/source/gameengine/GamePlayer/common/SConscript 2011-03-23 18:30:45.032937000 +0100 +@@ -43,7 +43,7 @@ incs = ['.', '#source/blender/misc', '#source/blender/blenloader', -- '#source/blender/gpu', + '#source/blender/gpu', - '#extern/glew/include'] -+ '#source/blender/gpu'] ++ ''] defs = [ 'GLEW_STATIC' ] -diff -up blender-2.56-beta-source/source/gameengine/GamePlayer/ghost/SConscript.ext blender-2.56-beta-source/source/gameengine/GamePlayer/ghost/SConscript ---- blender-2.56-beta-source/source/gameengine/GamePlayer/ghost/SConscript.ext 2010-11-18 12:42:05.000000000 +0100 -+++ blender-2.56-beta-source/source/gameengine/GamePlayer/ghost/SConscript 2011-01-19 19:33:54.770719000 +0100 -@@ -38,8 +38,7 @@ incs = ['.', - '#source/gameengine/GamePlayer/common', +diff -up blender/source/gameengine/GamePlayer/ghost/SConscript.ext blender/source/gameengine/GamePlayer/ghost/SConscript +--- blender/source/gameengine/GamePlayer/ghost/SConscript.ext 2011-03-23 17:09:03.000000000 +0100 ++++ blender/source/gameengine/GamePlayer/ghost/SConscript 2011-03-23 18:30:45.032937000 +0100 +@@ -39,7 +39,7 @@ incs = ['.', '#source/blender/misc', '#source/blender/blenloader', -- '#source/blender/gpu', + '#source/blender/gpu', - '#extern/glew/include'] -+ '#source/blender/gpu'] ++ ''] defs = [ 'GLEW_STATIC' ] -diff -up blender-2.56-beta-source/source/gameengine/Ketsji/SConscript.ext blender-2.56-beta-source/source/gameengine/Ketsji/SConscript ---- blender-2.56-beta-source/source/gameengine/Ketsji/SConscript.ext 2010-12-16 11:25:41.000000000 +0100 -+++ blender-2.56-beta-source/source/gameengine/Ketsji/SConscript 2011-01-19 19:33:54.771719000 +0100 +diff -up blender/source/gameengine/Ketsji/SConscript.ext blender/source/gameengine/Ketsji/SConscript +--- blender/source/gameengine/Ketsji/SConscript.ext 2011-03-23 17:09:06.000000000 +0100 ++++ blender/source/gameengine/Ketsji/SConscript 2011-03-23 18:30:45.034937000 +0100 @@ -18,7 +18,7 @@ incs += ' #source/blender/makesdna #sour incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network' incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' incs += ' #source/gameengine/Physics/Dummy' -incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu' -+incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu' ++incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu' incs += ' ' + env['BF_BULLET_INC'] incs += ' ' + env['BF_OPENGL_INC'] -diff -up blender-2.56-beta-source/source/gameengine/Physics/Bullet/SConscript.ext blender-2.56-beta-source/source/gameengine/Physics/Bullet/SConscript ---- blender-2.56-beta-source/source/gameengine/Physics/Bullet/SConscript.ext 2010-11-18 12:42:05.000000000 +0100 -+++ blender-2.56-beta-source/source/gameengine/Physics/Bullet/SConscript 2011-01-19 19:33:54.771719000 +0100 -@@ -7,7 +7,6 @@ incs = '. ../common' +diff -up blender/source/gameengine/Physics/Bullet/SConscript.ext blender/source/gameengine/Physics/Bullet/SConscript +--- blender/source/gameengine/Physics/Bullet/SConscript.ext 2011-03-23 17:09:02.000000000 +0100 ++++ blender/source/gameengine/Physics/Bullet/SConscript 2011-03-23 18:30:45.034937000 +0100 +@@ -7,7 +7,7 @@ incs = '. ../common' incs += ' #source/kernel/gen_system' incs += ' #intern/string' incs += ' #intern/moto/include' -incs += ' #extern/glew/include' ++incs += ' ' incs += ' #source/gameengine/Rasterizer' incs += ' #source/gameengine/Ketsji' incs += ' #source/gameengine/Expressions' -diff -up blender-2.56-beta-source/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext blender-2.56-beta-source/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript ---- blender-2.56-beta-source/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext 2010-11-29 08:56:45.000000000 +0100 -+++ blender-2.56-beta-source/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2011-01-19 19:33:54.772719001 +0100 +diff -up blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +--- blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext 2011-03-23 17:09:07.000000000 +0100 ++++ blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2011-03-23 18:30:45.035937000 +0100 @@ -6,7 +6,7 @@ sources = env.Glob('*.cpp') defs = [ 'GLEW_STATIC' ] incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines ' -incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC'] -+incs += ' #source/blender/gpu ' + env['BF_OPENGL_INC'] ++incs += ' #source/blender/gpu ' + env['BF_OPENGL_INC'] incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel' incs += ' #intern/guardedalloc #source/blender/blenlib' -diff -up blender-2.56-beta-source/source/gameengine/Rasterizer/SConscript.ext blender-2.56-beta-source/source/gameengine/Rasterizer/SConscript ---- blender-2.56-beta-source/source/gameengine/Rasterizer/SConscript.ext 2010-11-18 12:42:05.000000000 +0100 -+++ blender-2.56-beta-source/source/gameengine/Rasterizer/SConscript 2011-01-19 19:33:54.772719001 +0100 +diff -up blender/source/gameengine/Rasterizer/SConscript.ext blender/source/gameengine/Rasterizer/SConscript +--- blender/source/gameengine/Rasterizer/SConscript.ext 2011-03-23 17:09:07.000000000 +0100 ++++ blender/source/gameengine/Rasterizer/SConscript 2011-03-23 18:30:45.035937000 +0100 @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('*.cpp') -incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna' -+incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna' ++incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna' defs = [ 'GLEW_STATIC' ] -diff -up blender-2.56-beta-source/source/gameengine/VideoTexture/SConscript.ext blender-2.56-beta-source/source/gameengine/VideoTexture/SConscript ---- blender-2.56-beta-source/source/gameengine/VideoTexture/SConscript.ext 2010-11-18 12:42:05.000000000 +0100 -+++ blender-2.56-beta-source/source/gameengine/VideoTexture/SConscript 2011-01-19 19:33:54.773719001 +0100 +diff -up blender/source/gameengine/VideoTexture/SConscript.ext blender/source/gameengine/VideoTexture/SConscript +--- blender/source/gameengine/VideoTexture/SConscript.ext 2011-03-23 17:09:05.000000000 +0100 ++++ blender/source/gameengine/VideoTexture/SConscript 2011-03-23 18:30:45.036937000 +0100 @@ -12,7 +12,7 @@ incs += ' #source/gameengine/BlenderRout incs += ' #source/blender/editors/include #source/blender/blenlib #source/blender/blenkernel' incs += ' #source/blender/makesdna #source/blender/imbuf #source/blender/python #source/blender/python/generic' incs += ' #source/blender/gpu #source/kernel/gen_system #intern/string #intern/moto/include' -incs += ' #intern/guardedalloc #extern/glew/include' -+incs += ' #intern/guardedalloc' ++incs += ' #intern/guardedalloc ' defs = [] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'): diff --git a/blender-2.56-gcc46.patch b/blender-2.56-gcc46.patch deleted file mode 100644 index 8cee1e9..0000000 --- a/blender-2.56-gcc46.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -Naur blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h ---- blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2009-09-14 11:45:32.000000000 -0300 -+++ blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2011-02-08 22:32:34.300937158 -0200 -@@ -177,6 +177,7 @@ - /* Material */ - struct Material : Element - { -+ Material (){} - btScalar m_kLST; // Linear stiffness coefficient [0,1] - btScalar m_kAST; // Area/Angular stiffness coefficient [0,1] - btScalar m_kVST; // Volume stiffness coefficient [0,1] -@@ -191,6 +192,7 @@ - /* Node */ - struct Node : Feature - { -+ Node (){} - btVector3 m_x; // Position - btVector3 m_q; // Previous step position - btVector3 m_v; // Velocity -@@ -204,6 +206,7 @@ - /* Link */ - struct Link : Feature - { -+ Link (){} - Node* m_n[2]; // Node pointers - btScalar m_rl; // Rest length - int m_bbending:1; // Bending link -@@ -215,6 +218,7 @@ - /* Face */ - struct Face : Feature - { -+ Face (){} - Node* m_n[3]; // Node pointers - btVector3 m_normal; // Normal - btScalar m_ra; // Rest area -@@ -255,6 +259,7 @@ - /* Note */ - struct Note : Element - { -+ Note (){} - const char* m_text; // Text - btVector3 m_offset; // Offset - int m_rank; // Rank -diff -Naur blender-2.56-beta-source/extern/Eigen2/Eigen/src/Core/util/Memory.h blender-2.56-beta-source-new/extern/Eigen2/Eigen/src/Core/util/Memory.h ---- blender-2.56-beta-source/extern/Eigen2/Eigen/src/Core/util/Memory.h 2009-10-20 07:50:24.000000000 -0200 -+++ blender-2.56-beta-source-new/extern/Eigen2/Eigen/src/Core/util/Memory.h 2011-02-08 16:06:14.142965371 -0200 -@@ -37,6 +37,8 @@ - #define EIGEN_FREEBSD_MALLOC_ALREADY_ALIGNED 0 - #endif - -+#include -+ - #if defined(__APPLE__) || defined(_WIN64) || EIGEN_FREEBSD_MALLOC_ALREADY_ALIGNED - #define EIGEN_MALLOC_ALREADY_ALIGNED 1 - #else -diff -Naur blender-2.56-beta-source/intern/memutil/MEM_Allocator.h blender-2.56-beta-source-new/intern/memutil/MEM_Allocator.h ---- blender-2.56-beta-source/intern/memutil/MEM_Allocator.h 2010-02-12 11:34:04.000000000 -0200 -+++ blender-2.56-beta-source-new/intern/memutil/MEM_Allocator.h 2011-02-08 15:40:37.846834599 -0200 -@@ -24,6 +24,7 @@ - #ifndef __MEM_Allocator_h_included__ - #define __MEM_Allocator_h_included__ 1 - -+#include - #include "guardedalloc/MEM_guardedalloc.h" - #include "guardedalloc/BLO_sys_types.h" - -diff -Naur blender-2.56-beta-source/source/blender/imbuf/intern/openexr/openexr_api.cpp blender-2.56-beta-source-new/source/blender/imbuf/intern/openexr/openexr_api.cpp ---- blender-2.56-beta-source/source/blender/imbuf/intern/openexr/openexr_api.cpp 2010-12-03 15:05:21.000000000 -0200 -+++ blender-2.56-beta-source-new/source/blender/imbuf/intern/openexr/openexr_api.cpp 2011-02-08 16:27:14.132080102 -0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - #include -diff -Naur blender-2.56-beta-source/source/gameengine/Converter/BL_ArmatureChannel.cpp blender-2.56-beta-source-new/source/gameengine/Converter/BL_ArmatureChannel.cpp ---- blender-2.56-beta-source/source/gameengine/Converter/BL_ArmatureChannel.cpp 2010-11-15 23:19:37.000000000 -0200 -+++ blender-2.56-beta-source-new/source/gameengine/Converter/BL_ArmatureChannel.cpp 2011-02-08 16:45:20.671268280 -0200 -@@ -32,6 +32,7 @@ - #include "BL_ArmatureConstraint.h" - #include "BLI_math.h" - #include "BLI_string.h" -+#include - - #ifdef WITH_PYTHON - -diff -Naur blender-2.56-beta-source/source/gameengine/Expressions/PyObjectPlus.h blender-2.56-beta-source-new/source/gameengine/Expressions/PyObjectPlus.h ---- blender-2.56-beta-source/source/gameengine/Expressions/PyObjectPlus.h 2010-10-31 02:11:39.000000000 -0200 -+++ blender-2.56-beta-source-new/source/gameengine/Expressions/PyObjectPlus.h 2011-02-08 16:46:22.135397092 -0200 -@@ -38,6 +38,7 @@ - #include "STR_String.h" - #include "MT_Vector3.h" - #include "SG_QList.h" -+#include - - /*------------------------------ - * Python defines -diff -Naur blender-2.56-beta-source/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp blender-2.56-beta-source-new/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp ---- blender-2.56-beta-source/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp 2010-04-18 07:28:37.000000000 -0300 -+++ blender-2.56-beta-source-new/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp 2011-02-08 19:39:51.796249897 -0200 -@@ -28,6 +28,7 @@ - */ - #include "DummyPhysicsEnvironment.h" - #include "PHY_IMotionState.h" -+#include - - DummyPhysicsEnvironment::DummyPhysicsEnvironment() - { diff --git a/blender-2.56-py32.patch b/blender-2.56-py32.patch deleted file mode 100644 index 4b2f506..0000000 --- a/blender-2.56-py32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp.py32 blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp ---- blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp.py32 2011-01-16 22:44:18.706809999 +0100 -+++ blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp 2011-01-16 22:44:54.668810004 +0100 -@@ -408,7 +408,7 @@ void SCA_PythonController::Trigger(SCA_L - */ - - excdict= PyDict_Copy(m_pythondictionary); -- resultobj = PyEval_EvalCode((PyCodeObject*)m_bytecode, excdict, excdict); -+ resultobj = PyEval_EvalCode((PyObject*)m_bytecode, excdict, excdict); - /* PyRun_SimpleString(m_scriptText.Ptr()); */ - break; - } diff --git a/blender.spec b/blender.spec index bcdf74c..c03e74a 100644 --- a/blender.spec +++ b/blender.spec @@ -1,21 +1,25 @@ %global blenderlib %{_datadir}/blender %global blenderarch %{_libdir}/blender %global __python %{__python3} +%global svn .svn35722 %global fontname blender Name: blender Version: 2.56 -Release: 7%{?dist} +Release: 8%{svn}%{?dist} Summary: 3D modeling, animation, rendering and post-production Group: Applications/Multimedia License: GPLv2 URL: http://www.blender.org -# This is a customized source package without bundled dependencies -# See blender-repack.sh -Source0: http://download.blender.org/source/blender-%{version}-beta.tar.gz + +# Source0: http://download.blender.org/source/blender-%{version}-beta.tar.gz +# Upstream tar ball was created von upstream svn repository +# using revision 35722 + +Source0: blender-2.56%{svn}.tar.bz2 Source5: blender.xml Source6: blender-wrapper @@ -23,12 +27,8 @@ Source7: blenderplayer-wraper Source8: blender-2.56.config Source100: blender-repack.sh -Patch1: blender-2.49-scons.patch -Patch2: blender-2.44-bid.patch -Patch3: blender-2.49b-uid.patch -Patch4: blender-2.56-ext.patch -Patch5: blender-2.56-py32.patch -Patch6: blender-2.56-gcc46.patch +Patch1: blender-2.44-bid.patch +Patch2: blender-2.56-ext.patch # Both patches are forwarded to upstream via email #Patch100: blender-2.46rc3-cve-2008-1103-1.patch @@ -103,13 +103,9 @@ You will need this package to play games which are based on the Blender Game Engine. %prep -%setup -q -n %{name}-%{version}-beta-source -# %patch1 -p1 -b .org -%patch2 -p1 -b .bid -# %patch3 -p1 -b .uid -%patch4 -p1 -b .ext -%patch5 -p1 -b .py32 -%patch6 -p1 -b .gcc46 +%setup -q -n %{name} +%patch1 -p1 -b .bid +%patch2 -p1 -b .ext # %patch100 -p1 -b .cve # %patch101 -p1 @@ -189,7 +185,7 @@ install -pm 755 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plu cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts -install -pm 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib} +# install -pm 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib} # install -pm 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib} # @@ -255,6 +251,9 @@ fi || : %{_bindir}/blenderplayer.bin %changelog +* Wed Mar 23 2011 Jochen Schmitt 2.56-8.svn35722%{?dist} +- Update to snapshot svn35722 + * Tue Feb 08 2011 Paulo Roma - 2.56-7 - Rebuilt without linking to libgettextlib (bugzilla #650471). - Applied gcc46 patch