[blender] Update to snapshot svn35722
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Mar 23 19:43:53 UTC 2011
commit 41245d32007471400635a3481ce94603db0df692
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Mar 23 20:43:43 2011 +0100
Update to snapshot svn35722
blender-2.49-scons.patch | 40 ----
blender-2.49b-cve.patch | 61 -----
blender-2.49b-uid.patch | 13 -
blender-2.56-ext.patch | 572 +++++-----------------------------------------
blender-2.56-gcc46.patch | 110 ---------
blender-2.56-py32.patch | 12 -
blender.spec | 35 ++--
7 files changed, 79 insertions(+), 764 deletions(-)
---
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.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 <Jochen herr-schmitt de> 2.56-8.svn35722%{?dist}
+- Update to snapshot svn35722
+
* Tue Feb 08 2011 Paulo Roma <roma at lcg.ufrj.br> - 2.56-7
- Rebuilt without linking to libgettextlib (bugzilla #650471).
- Applied gcc46 patch
More information about the scm-commits
mailing list