rpms/blender/devel blender-2.47-scons.patch, 1.1, 1.2 blender.spec, 1.93, 1.94

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30678

Modified Files:
	blender-2.47-scons.patch blender.spec 
Log Message:
Pass cflags the same way as before

blender-2.47-scons.patch:

Index: blender-2.47-scons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blender/devel/blender-2.47-scons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blender-2.47-scons.patch	15 Oct 2008 15:05:53 -0000	1.1
+++ blender-2.47-scons.patch	27 Dec 2008 09:04:40 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up blender-2.47/extern/SConscript.org blender-2.47/extern/SConscript
---- blender-2.47/extern/SConscript.org	2008-10-14 22:13:44.000000000 +0200
-+++ blender-2.47/extern/SConscript	2008-10-14 22:13:57.000000000 +0200
+diff -up blender-2.48a/extern/SConscript.org blender-2.48a/extern/SConscript
+--- blender-2.48a/extern/SConscript.org	2008-10-22 18:38:21.000000000 +0200
++++ blender-2.48a/extern/SConscript	2008-12-27 10:01:18.000000000 +0100
 @@ -2,8 +2,6 @@
  
  Import('env')
@@ -10,10 +10,19 @@
  if env['WITH_BF_GAMEENGINE']:
      SConscript(['qhull/SConscript',
              'solid/SConscript'])
-diff -up blender-2.47/SConstruct.org blender-2.47/SConstruct
---- blender-2.47/SConstruct.org	2008-05-01 16:22:21.000000000 +0200
-+++ blender-2.47/SConstruct	2008-10-14 22:13:27.000000000 +0200
-@@ -216,7 +216,7 @@ if env['OURPLATFORM'] == 'linux2' :
+diff -up blender-2.48a/SConstruct.org blender-2.48a/SConstruct
+--- blender-2.48a/SConstruct.org	2008-10-22 18:38:43.000000000 +0200
++++ blender-2.48a/SConstruct	2008-12-27 10:02:54.000000000 +0100
+@@ -172,6 +172,8 @@ opts.Update(env)
+ if not env['BF_FANCY']:
+     B.bc.disable()
+ 
++env['CCFLAGS'] = env['CCFLAGS'].split()
++
+ # disable elbeem (fluidsim) compilation?
+ if env['BF_NO_ELBEEM'] == 1:
+     env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
+@@ -217,7 +219,7 @@ if env['OURPLATFORM'] == 'linux2' :
  
          def CheckFreeAlut(context,env):
              context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )


Index: blender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blender/devel/blender.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- blender.spec	27 Dec 2008 08:38:33 -0000	1.93
+++ blender.spec	27 Dec 2008 09:04:40 -0000	1.94
@@ -86,7 +86,7 @@
 	 <%{SOURCE7} >user-config.py
 
 %build
-scons %{?_smp_mflags} blenderplayer BF_QUIET=0 {CFLAGS,CXXFLAGS}='%{optflags}'
+scons %{?_smp_mflags} blenderplayer BF_QUIET=0 CCFLAGS='%{optflags}'
 
 install -d release/plugins/include
 install -m 644 source/blender/blenpluginapi/*.h release/plugins/include