diff --git a/blender-2.56-ext.patch b/blender-2.56-ext.patch deleted file mode 100644 index e8cb213..0000000 --- a/blender-2.56-ext.patch +++ /dev/null @@ -1,604 +0,0 @@ -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 -@@ -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'] - 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 @@ - #ifndef BIF_GL_H - #define BIF_GL_H - --#include "../../../../extern/glew/include/GL/glew.h" -+#include - - /* - * 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 = [] - - 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 -@@ -5,7 +5,7 @@ sources = env.Glob('*.c') - - incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' - incs += ' ../../nodes ../../render/extern/include' --incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' -+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') - - 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/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 -@@ -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/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', - '#source/blender/misc', - '#source/blender/blenloader', -- '#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', - '#source/blender/misc', - '#source/blender/blenloader', -- '#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 -@@ -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 += ' ' + 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' - incs += ' #source/kernel/gen_system' - incs += ' #intern/string' - incs += ' #intern/moto/include' --incs += ' #extern/glew/include' - 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 -@@ -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/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 -@@ -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' - - 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 -@@ -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' - - defs = [] - if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'): 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-2.56.config b/blender-2.56.config deleted file mode 100644 index 582011e..0000000 --- a/blender-2.56.config +++ /dev/null @@ -1,162 +0,0 @@ -import os -env = os.environ -rpmopt = env["RPM_OPT_FLAGS"].split(' ') - -LCGDIR = 'lib/linux2' -BF_PYTHON = '/usr' -BF_PYTHON_VERSION = '@PYVER@' -BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}mu' -BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}mu' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' -BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] - -WITH_BF_OPENAL = 'true' -BF_OPENAL = '/usr' -BF_OPENAL_INC = '${BF_OPENAL}/include' -BF_OPENAL_LIB = 'openal' - -WITH_BF_SDL = 'true' -BF_SDL = '/usr' #$(shell sdl-config --prefix) -BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) -BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer - -WITH_BF_FMOD = 'false' -BF_FMOD = LCGDIR + '/fmod' - -WITH_BF_OPENEXR = 'true' -BF_OPENEXR = '/usr' -BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' -BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' - -WITH_BF_JPEG = 'true' -BF_JPEG = '/usr' -BF_JPEG_INC = '${BF_JPEG}/include/openjpeg' -BF_JPEG_LIB = ['openjpeg', 'jpeg'] - -WITH_BF_PNG = 'true' -BF_PNG = '/usr' -BF_PNG_INC = '${BF_PNG}/include' -BF_PNG_LIB = 'png' - -BF_TIFF = '/usr' -BF_TIFF_INC = '${BF_TIFF}/include' - -WITH_BF_ZLIB = 'true' -BF_ZLIB = '/usr' -BF_ZLIB_INC = '${BF_ZLIB}/include' -BF_ZLIB_LIB = 'z' - -WITH_BF_INTERNATIONAL = 'true' - -BF_GETTEXT = '/usr' -BF_GETTEXT_INC = '${BF_GETTEXT}/include' -BF_GETTEXT_LIB = 'qhull' -BF_GETTEXT_LIBPATH = '@LIB@' - -WITH_BF_FTGL = 'true' -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - -WITH_BF_GAMEENGINE='true' - -WITH_BF_ODE = 'true' -BF_ODE = '/usr' -BF_ODE_INC = '${BF_ODE}/include/ode' -BF_ODE_LIB = 'ode' - -WITH_BF_BULLET = 'true' -BF_BULLET = '#extern/bullet2/src/' -BF_BULLET_INC = '${BF_BULLET} ${BF_BULLET}/BulletDynamics ${BF_BULLET}/Bullet' -BF_BULLET_LIB = 'extern_bullet' - -BF_SOLID = '#extern/solid' -BF_SOLID_INC = '${BF_SOLID}' -BF_SOLID_LIB = 'extern_solid' - -WITH_BF_OPENJPEG = 'true' - -#WITH_BF_NSPR = 'true' -#BF_NSPR = $(LCGDIR)/nspr -#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr -#BF_NSPR_LIB = - -# Uncomment the following line to use Mozilla inplace of netscape -#CPPFLAGS += -DMOZ_NOT_NET -# Location of MOZILLA/Netscape header files... -#BF_MOZILLA = $(LCGDIR)/mozilla -#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl -#BF_MOZILLA_LIB = -# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB -# if this is not set. -# -# Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = 'true' - -# enable freetype2 support for text objects -BF_FREETYPE = '/usr' -BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' -BF_FREETYPE_LIB = 'freetype' - -WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME -BF_QUICKTIME = '/usr/local' -BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' - -# enable ffmpeg support -WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG -BF_FFMPEG = '/usr' -BF_FFMPEG_INC = '${BF_FFMPEG}/include/ffmpeg ${BF_FFMPEG}/include' -BF_FFMPEG_LIBPATH='@LIB@' -BF_FFMPEG_LIB = 'avformat avcodec avutil swscale avdevice' - -# Mesa Libs should go here if your using them as well.... -WITH_BF_STATICOPENGL = 'false' -BF_OPENGL = '/usr' -BF_OPENGL_INC = '${BF_OPENGL}/include' -BF_OPENGL_LIB = 'GLEW GL GLU X11 Xi' -BF_OPENGL_LIBPATH = '@LIB@' -BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a' - -## -CC = 'gcc' -CXX = 'g++' -##ifeq ($CPU),alpha) -## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee - -# CFLAGS += '${RPM_OPT_FLAGS}' -CFLAGS += rpmopt - -# CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] -CCFLAGS = rpmopt - -CPPFLAGS = ['-DXP_UNIX'] -# CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] -REL_CFLAGS = ['-O2'] -REL_CCFLAGS = ['-O2'] -##BF_DEPEND = 'true' -## -##AR = ar -##ARFLAGS = ruv -##ARFLAGSQUIET = ru -## -C_WARN = ['-Wall', '-Wno-char-subscripts'] - -CC_WARN = '-Wall' - -##FIX_STUBS_WARNINGS = -Wno-unused - -LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] -##LOPTS = --dynamic -##DYNLDFLAGS = -shared $(LDFLAGS) - -BF_PROFILE_FLAGS = ['-pg','-g'] -BF_PROFILE = 'false' - -BF_DEBUG = 'false' -BF_DEBUG_FLAGS = '' - -BF_BUILDDIR = 'build/linux2' -BF_INSTALLDIR='install/linux2' - -#Link against pthread -PLATFORM_LINKFLAGS = ['-pthread'] diff --git a/blender.spec b/blender.spec index bcdf74c..40af253 100644 --- a/blender.spec +++ b/blender.spec @@ -1,12 +1,11 @@ %global blenderlib %{_datadir}/blender %global blenderarch %{_libdir}/blender -%global __python %{__python3} %global fontname blender Name: blender -Version: 2.56 -Release: 7%{?dist} +Version: 2.49b +Release: 14%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -15,20 +14,17 @@ 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: blender-%{version}-repack.tar.bz2 Source5: blender.xml Source6: blender-wrapper Source7: blenderplayer-wraper -Source8: blender-2.56.config +Source8: blender-2.49.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 # Both patches are forwarded to upstream via email #Patch100: blender-2.46rc3-cve-2008-1103-1.patch @@ -48,7 +44,7 @@ BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: freealut-devel BuildRequires: openssl-devel -BuildRequires: python3-devel +BuildRequires: python-devel BuildRequires: scons BuildRequires: SDL-devel BuildRequires: zlib-devel @@ -61,7 +57,6 @@ BuildRequires: freetype-devel BuildRequires: OpenEXR-devel BuildRequires: glew-devel -BuildRequires: libsamplerate-devel BuildRequires: fftw-devel BuildRequires: ftgl-devel BuildRequires: ode-devel @@ -93,6 +88,8 @@ animation, rendering and post-production to interactive creation and playback. Professionals and novices can easily and inexpensively publish stand-alone, secure, multi-platform content to the web, CD-ROMs, and other media. + + %package -n blenderplayer Summary: Standalone blender player Group: Applications/Multimedia @@ -102,21 +99,20 @@ This package contains a stand alone release of the blender player. 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 +%setup -q +%patch1 -p1 -b .org %patch2 -p1 -b .bid -# %patch3 -p1 -b .uid -%patch4 -p1 -b .ext -%patch5 -p1 -b .py32 -%patch6 -p1 -b .gcc46 +%patch3 -p1 -b .uid -# %patch100 -p1 -b .cve +%patch100 -p1 -b .cve # %patch101 -p1 # No executable or shared library outside the gettext package is # supposed to link against libgettextlib or libgettextsrc. -sed -i -e"s,gettextlib,,g" build_files/scons/config/linux2-config.py +sed -i -e"s,gettextlib,,g" config/linux2-config.py # binreloc is not a part of fedora rm -rf extern/ffmpeg @@ -132,7 +128,7 @@ rm -rf extern/qhull rm -rf extern/make rm -rf extern/verse -PYVER=$(%{__python3} -c "import sys ; print(sys.version[:3])") +PYVER=$(%{__python} -c "import sys ; print sys.version[:3]") sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \ <%{SOURCE8} >user-config.py @@ -141,12 +137,11 @@ sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \ # supposed to link against libgettextlib or libgettextsrc. sed -i -e"s,gettextlib,,g" user-config.py +iconv -f iso-8859-1 -t utf-8 doc/bf-members.txt -o doc/bf-members.txt.utf8 +mv doc/bf-members.txt.utf8 doc/bf-members.txt + %build -scons blenderplayer \ -%ifnarch %{ix86} x86_64 - WITH_BF_RAYOPTIMIZATION=False \ -%endif - BF_QUIET=0 +scons %{?_smp_mflags} blenderplayer BF_QUIET=0 install -d release/plugins/include install -m 644 source/blender/blenpluginapi/*.h release/plugins/include @@ -183,14 +178,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/textu install -pm 755 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/sequence install -pm 755 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/texture -# find bin/.blender/locale -name '.svn' -exec rm -f {} ';' +find bin/.blender/locale -name '.svn' -exec rm -f {} ';' -# cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir} +cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir} cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts install -pm 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib} -# install -pm 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib} +install -pm 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib} # # Create link to DejaVu-Sans @@ -213,9 +208,11 @@ desktop-file-install --vendor fedora \ release/freedesktop/blender.desktop #Fix perm -#chmod +x ${RPM_BUILD_ROOT}%{blenderlib}/scripts/bpymodules/blend2renderinfo.py +chmod +x ${RPM_BUILD_ROOT}%{blenderlib}/scripts/bpymodules/blend2renderinfo.py + +%find_lang %{name} + -# %find_lang %{name} %clean rm -rf ${RPM_BUILD_ROOT} @@ -228,6 +225,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi %{_bindir}/update-desktop-database %{_datadir}/applications || : + %postun %{_bindir}/update-mime-database %{_datadir}/mime %{_bindir}/update-desktop-database %{_datadir}/applications @@ -236,10 +234,10 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi || : -%files + +%files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING -# README doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt +%doc COPYING README doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt %{_bindir}/blender %{_bindir}/blender.bin %{_datadir}/applications/fedora-blender.desktop @@ -249,38 +247,25 @@ fi || : %{_datadir}/mime/packages/blender.xml %files -n blenderplayer -%defattr(-,root,root,-) %doc COPYING +%defattr(-,root,root,-) %{_bindir}/blenderplayer %{_bindir}/blenderplayer.bin %changelog -* Tue Feb 08 2011 Paulo Roma - 2.56-7 -- Rebuilt without linking to libgettextlib (bugzilla #650471). -- Applied gcc46 patch - -* Mon Feb 07 2011 Fedora Release Engineering - 2.56-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Wed Apr 6 2011 Jochen Schmitt 2.49b-14 +- Revert to the blender-2.49b branch -* Wed Jan 19 2011 Jochen Schmitt 2.56-5 -- Remove ref to #extern/glew/include from all scons files +* Mon Apr 4 2011 Jochen Schmitt 2.49b-13 +- Largefile support on 32-bit again (#685022) -* Wed Jan 19 2011 Jochen Schmitt 2.56-4 -- Readd blenderplayer subpackage - -* Wed Jan 19 2011 Jochen Schmitt 2.56-3 -- Fix RPM_OPT_FLAGS honour issue - -* Wed Jan 19 2011 Dan Horák 2.56-2 -- use SSE optimization only on x86 platforms - -* Wed Jan 12 2011 Rex Dieter 2.49b-11 -- rebuild (openjpeg) +* Mon Feb 07 2011 Paulo Roma - 2.49b-11 +- Rebuilt without linking to libgettextlib (bugzilla #650471). -* Tue Jul 27 2010 David Malcolm 2.49b-10 +* Tue Jul 27 2010 David Malcolm - 2.49b-10 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild -* Mon Jun 21 2010 Nicolas Chauvet 2.49b-9 +* Mon Jun 21 2010 Nicolas Chauvet - 2.49b-9 - Rebuild for gettext * Wed May 26 2010 Jochen Schmitt 2.49b-8 @@ -317,16 +302,16 @@ fi || : * Mon Aug 3 2009 Jochen Schmitt 2.49a-4 - Rebuild for python-2.6.2 -* Fri Jul 24 2009 Fedora Release Engineering 2.49a-3 +* Fri Jul 24 2009 Fedora Release Engineering - 2.49a-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Mon Jul 6 2009 kwizart < kwizart at gmail.com > 2.49a-2 +* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 2.49a-2 - Fix perm on blend2renderinfo.py - raised by #506957 -* Fri Jun 19 2009 kwizart < kwizart at gmail.com > 2.49a-1 +* Fri Jun 19 2009 kwizart < kwizart at gmail.com > - 2.49a-1 - Update to 2.49a -* Fri Jun 19 2009 kwizart < kwizart at gmail.com > 2.49-6 +* Fri Jun 19 2009 kwizart < kwizart at gmail.com > - 2.49-6 - Update blender-wrapper script. - Repackage the sources archive. - Remove deprecated import/export-3ds-0.7.py diff --git a/sources b/sources index b48040e..bd97074 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d853bbd7bf17f3390addbc2c7455cd3 blender-2.56-beta.tar.gz +8537ec34afbd72ea517843efdc4b0cae blender-2.49b-repack.tar.bz2