Author: ghibo
Date: Sat Feb 17 15:32:52 2007
New Revision: 122138
Added:
packages/cooker/blender/current/SOURCES/blender-2.43-varuninitial.patch
Removed:
packages/cooker/blender/current/SOURCES/blender-2.41-varuninitial.patch
packages/cooker/blender/current/SOURCES/blender-2.43-wavefront-obj-overrun.patch
Modified:
packages/cooker/blender/current/SPECS/blender.spec
Log:
- Enabled smp for building.
- Rebuilt Patch7.
- Removed Patch12, merged upstream.
Added: packages/cooker/blender/current/SOURCES/blender-2.43-varuninitial.patch
==============================================================================
--- (empty file)
+++ packages/cooker/blender/current/SOURCES/blender-2.43-varuninitial.patch
Sat Feb 17 15:32:52 2007
@@ -0,0 +1,11 @@
+--- blender-2.43/source/blender/blenkernel/intern/DerivedMesh.c.varinit
2007-02-03 15:46:30.000000000 +0100
++++ blender-2.43/source/blender/blenkernel/intern/DerivedMesh.c
2007-02-17 15:20:49.000000000 +0100
+@@ -2436,7 +2436,7 @@
+ void writeBobjgz(char *filename, struct Object *ob, int useGlobalCoords, int
append, float time)
+ {
+ char debugStrBuffer[256];
+- int wri,i,j,totvert,totface;
++ int wri=0,i,j,totvert,totface;
+ float wrf;
+ gzFile gzf;
+ DerivedMesh *dm;
Modified: packages/cooker/blender/current/SPECS/blender.spec
==============================================================================
--- packages/cooker/blender/current/SPECS/blender.spec (original)
+++ packages/cooker/blender/current/SPECS/blender.spec Sat Feb 17 15:32:52 2007
@@ -1,4 +1,5 @@
%define testver 243
+%define relver 243
%define name blender
%define truename blender
@@ -10,6 +11,16 @@
%{?_with_fullopt: %{expand: %%global build_fullopt 1}}
%{?_without_fullopt: %{expand: %%global build_fullopt 0}}
+%define use_smp 1
+%{?_with_smp: %global use_smp 1}
+%{?_without_smp: %global use_smp 0}
+
+%if %{use_smp}
+%define scons_smp --debug=time -j %(expr $(getconf _NPROCESSORS_ONLN) + 2)
+%else
+%define scons_smp ""
+%endif
+
Name: %{name}
Version: 2.43
Release: %mkrel 1
@@ -29,12 +40,11 @@
Patch2: blender-2.43-lib64.patch
Patch3: blender-2.42-forceyafrayplug.patch
Patch5: blender-2.41-libtiff.patch
-Patch7: blender-2.41-varuninitial.patch
+Patch7: blender-2.43-varuninitial.patch
Patch8: blender-2.41-yafray-64.patch
Patch9: blender-2.42-yafray-ncpus.patch
Patch10: blender-2.42-O3opt.patch
Patch11: blender-2.42a-morethreads.patch
-Patch12: blender-2.43-wavefront-obj-overrun.patch
Patch13: blender-2.43-python25.patch
Patch14: blender-2.43-alut.patch
Patch15: blender-2.43-64bit_politically_correct.patch
@@ -97,12 +107,11 @@
%endif
%patch3 -p1 -b .yafray
%patch5 -p1 -b .libtiff
-#%patch7 -p1 -b .varun
+%patch7 -p1 -b .varun
%patch8 -p1 -b .yafray64
%patch9 -p1 -b .ncpus
%patch10 -p1 -b .O3opt
#%patch11 -p1 -b .morethreads
-#%patch12 -p1 -b .wavobj
%if %{mdkversion} >= 200710
%patch13 -p1 -b .python
%endif
@@ -172,13 +181,13 @@
cp -p user-config.py user-config.py.std
cp -p user-config.py.sse user-config.py
scons -c %scons_debug BF_QUIET=0
-scons %scons_debug BF_QUIET=0
+scons %scons_debug %scons_smp BF_QUIET=0
cp -p builddir/bin/blender blender.sse
cp -p user-config.py.std user-config.py
scons -c %scons_debug BF_QUIET=0
%endif
-scons %scons_debug BF_QUIET=0
+scons %scons_debug %scons_smp BF_QUIET=0
# Build plugins
pushd release/plugins
@@ -237,7 +246,7 @@
install -p -m 644 ./installdir/.blender/.Blanguages
%{buildroot}%{_libdir}/%{name}
install -p -m 644 ./installdir/.blender/.bfont.ttf
%{buildroot}%{_libdir}/%{name}
install -p -m 644 release/VERSION %{buildroot}%{_libdir}/%{name}
-install -p -m 644 ./installdir/release_242.txt %{buildroot}%{_libdir}/%{name}
+install -p -m 644 ./installdir/release_%{relver}.txt
%{buildroot}%{_libdir}/%{name}
install -p -m 644 ./installdir/copyright.txt %{buildroot}%{_libdir}/%{name}
install -p -m 644 ./installdir/BlenderQuickStart.pdf
%{buildroot}%{_libdir}/%{name}
install -p -m 644 ./installdir/blender.html %{buildroot}%{_libdir}/%{name}
@@ -375,7 +384,7 @@
%{_libdir}/%{name}/BlenderQuickStart.pdf
%{_libdir}/%{name}/blender.html
%{_libdir}/%{name}/copyright.txt
-%{_libdir}/%{name}/release_242.txt
+%{_libdir}/%{name}/release_%{relver}.txt
%{_libdir}/%{name}/scripts/*
%{_libdir}/%{name}/plugins/sequence
%{_libdir}/%{name}/plugins/texture
