[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6ae37f4e4758009d6c6ed9975b83b5fc26333472)

Vlad Glagolev scm at sourcemage.org
Mon May 19 14:59:55 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 dev/null                                 |binary
 graphics/blender/BUILD                   |    9 ---
 graphics/blender/CONFLICTS               |    4 -
 graphics/blender/DETAILS                 |    5 --
 graphics/blender/HISTORY                 |    9 +++
 graphics/blender/INSTALL                 |   37 ++++++++--------
 graphics/blender/PRE_BUILD               |   18 +++----
 graphics/blender/blender-2.45.tar.gz.sig |    0 
 graphics/blender/blender-2.46.tar.gz.sig |binary
 graphics/blender/gcc43.patch             |   71 -------------------------------
 10 files changed, 40 insertions(+), 113 deletions(-)

New commits:
commit 6ae37f4e4758009d6c6ed9975b83b5fc26333472
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    blender: => 2.46, cleaned up; for those who wants to look at the scripts' renamage, here you are: http://lua.pastey.net/88048

diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index fe8fcc0..9778c23 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -33,11 +33,4 @@ scons \
 	WITH_BF_GAMEENGINE=1    \
 	BF_INSTALLDIR=$SOURCE_DIRECTORY/install &&
 
-# Do not build outside the default tree because of a bug in makesdna compiling 
-#        BF_BUILDDIR=$SOURCE_DIRECTORY/build
-
-install -d ${SOURCE_DIRECTORY}/install/linux2/plugins/include &&
-install -m 644 ${SOURCE_DIRECTORY}/source/blender/blenpluginapi/*.h \
-    ${SOURCE_DIRECTORY}/install/linux2/plugins/include        &&
-cp -a ${SOURCE_DIRECTORY}/release/plugins/* ${SOURCE_DIRECTORY}/install/linux2/plugins &&
-make -C ${SOURCE_DIRECTORY}/install/linux2/plugins
+make -C $SOURCE_DIRECTORY/install/plugins
diff --git a/graphics/blender/CONFLICTS b/graphics/blender/CONFLICTS
index cd2cbd1..f4557ec 100755
--- a/graphics/blender/CONFLICTS
+++ b/graphics/blender/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts  blender_cvs  &&
-conflicts  blender-bin
+conflicts blender_cvs &&
+conflicts blender-bin
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index bd66995..877bb4e 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -1,5 +1,5 @@
            SPELL=blender
-         VERSION=2.45
+         VERSION=2.46
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.blender.org/source/$SOURCE
@@ -9,10 +9,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=GPL
         KEYWORDS="graphics"
         WEB_SITE=http://www.blender.org/
-      PATCHLEVEL=1
          ENTERED=20021018
            SHORT="Opensource 3d modelling/animation tool"
 cat << EOF
 Blender is the open source software for 3D modeling, animation, rendering,
-post-production, interactive creation and playback. 
+post-production, interactive creation and playback.
 EOF
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index 27747f5..e12d8ee 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,11 @@
+2008-05-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.46
+	* PRE_BUILD: sed -i > sedit, gcc 4.3 patch is useless, SPELL > SCRIPT
+	* INSTALL: verbosity ftw! (we're not hiding installation from the users)
+	  removed useless spaces and brackets, fixed the paths
+	* BUILD: fixed the paths
+	* CONFLICTS: cleaned up
+
 2008-04-19 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Apply gcc43.patch
 	* gcc43.patch: Fix compilation issues with GCC 4.3.0
@@ -227,4 +235,3 @@
 
 2002-10-18 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* Created this spell
-
diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
index 07e0a24..d12ef39 100755
--- a/graphics/blender/INSTALL
+++ b/graphics/blender/INSTALL
@@ -1,21 +1,22 @@
-install -m 755 install/blender       ${INSTALL_ROOT}/usr/bin  &&
-install -m 755 install/blenderplayer ${INSTALL_ROOT}/usr/bin  &&
-install -m 644 ${SCRIPT_DIRECTORY}/blender48x48.png           \
-               ${INSTALL_ROOT}/usr/share/pixmaps              &&
+install -vm 755 install/blender $INSTALL_ROOT/usr/bin &&
+install -vm 755 install/blenderplayer $INSTALL_ROOT/usr/bin &&
+install -vm 644 $SCRIPT_DIRECTORY/blender48x48.png \
+                $INSTALL_ROOT/usr/share/pixmaps &&
 
-install -m 755 -d ${INSTALL_ROOT}/usr/share/blender           &&
-install -m 755 -d ${INSTALL_ROOT}/usr/lib/blender/plugins/sequence    &&
-install -m 755 -d ${INSTALL_ROOT}/usr/lib/blender/plugins/texture     &&
+install -vm 755 -d $INSTALL_ROOT/usr/share/blender &&
+install -vm 755 -d $INSTALL_ROOT/usr/lib/blender/plugins/sequence &&
+install -vm 755 -d $INSTALL_ROOT/usr/lib/blender/plugins/texture &&
 
-install -m 644 ${SOURCE_DIRECTORY}/install/linux2/plugins/sequence/*.so \
-    ${INSTALL_ROOT}/usr/lib/blender/plugins/sequence      &&
-install -m 644 ${SOURCE_DIRECTORY}/install/linux2/plugins/texture/*.so \
-    ${INSTALL_ROOT}/usr/lib/blender/plugins/texture       &&
-cp -a ${SOURCE_DIRECTORY}/release/scripts/bpydata \
-    ${INSTALL_ROOT}/usr/share/blender                     &&
-cp -a ${SOURCE_DIRECTORY}/release/scripts \
-    ${INSTALL_ROOT}/usr/share/blender                     &&
-install -m 644 ${SOURCE_DIRECTORY}/release/VERSION \
-    ${INSTALL_ROOT}/usr/share/blender                     &&
+install -vm 644 $SOURCE_DIRECTORY/install/plugins/sequence/*.so \
+                $INSTALL_ROOT/usr/lib/blender/plugins/sequence &&
+install -vm 644 $SOURCE_DIRECTORY/install/plugins/texture/*.so \
+                $INSTALL_ROOT/usr/lib/blender/plugins/texture &&
+cp -va $SOURCE_DIRECTORY/release/scripts/bpydata \
+       $INSTALL_ROOT/usr/share/blender &&
+cp -va $SOURCE_DIRECTORY/release/scripts \
+       $INSTALL_ROOT/usr/share/blender &&
 
-find ${INSTALL_ROOT}/usr/share/blender/scripts/ -name "*.py" -exec chmod -R 644 '{}' \;
+install -vm 644 $SOURCE_DIRECTORY/release/VERSION \
+                $INSTALL_ROOT/usr/share/blender &&
+
+find $INSTALL_ROOT/usr/share/blender/scripts -name "*.py" -exec chmod -R 644 '{}' \;
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
index 3f36351..76f00f8 100755
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -1,11 +1,9 @@
-default_pre_build  &&
-# Set Python version to the installed version, not hardcoded to 2.4
-# Bug #13418
-sedit  "s:2.4:$(installed_version python):"       \
-       $SOURCE_DIRECTORY/config/linux2-config.py  &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+chmod 755 release/plugins/bmake &&
 
-cd $SOURCE_DIRECTORY                                           &&
-chmod 755 release/plugins/bmake                                &&
-cp -r source/blender/blenpluginapi release/plugins/include     &&
-patch -p1 < ${SCRIPT_DIRECTORY}/blender-2.44-scriptsdir.patch  &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
+# Set Python version to the installed version, not hardcoded one
+sed -i "s:2.5:$(installed_version python | cut -d . -f 1,2):;s:-Wdeclaration-after-statement::" \
+       $SOURCE_DIRECTORY/config/linux2-config.py &&
+
+patch -p1 < $SPELL_DIRECTORY/blender-2.44-scriptsdir.patch
diff --git a/graphics/blender/blender-2.45.tar.gz.sig b/graphics/blender/blender-2.45.tar.gz.sig
deleted file mode 100644
index 17537fe..0000000
Binary files a/graphics/blender/blender-2.45.tar.gz.sig and /dev/null differ
diff --git a/graphics/blender/blender-2.46.tar.gz.sig b/graphics/blender/blender-2.46.tar.gz.sig
new file mode 100644
index 0000000..2afda3e
Binary files /dev/null and b/graphics/blender/blender-2.46.tar.gz.sig differ
diff --git a/graphics/blender/gcc43.patch b/graphics/blender/gcc43.patch
deleted file mode 100644
index a748b06..0000000
--- a/graphics/blender/gcc43.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp
---- blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp	2008-04-19 17:10:04.005647128 -0700
-+++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp	2008-04-19 17:22:52.032923670 -0700
-@@ -42,6 +42,8 @@
- #include <strings.h>
- #endif
- 
-+#include <cstdio>
-+
- 
- // For obscure full screen mode stuuf
- // lifted verbatim from blut.
-diff -Naur blender-2.45.orig/intern/string/STR_String.h blender-2.45/intern/string/STR_String.h
---- blender-2.45.orig/intern/string/STR_String.h	2008-04-19 17:10:03.994667450 -0700
-+++ blender-2.45/intern/string/STR_String.h	2008-04-19 17:13:23.254673104 -0700
-@@ -47,6 +47,9 @@
- 
- #include <vector>
- #include <limits.h>
-+#include <cstring>
-+#include <cstdlib>
-+
- using namespace std;
- 
- 
-diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_File.cpp blender-2.45/source/blender/yafray/intern/export_File.cpp
---- blender-2.45.orig/source/blender/yafray/intern/export_File.cpp	2008-04-19 17:10:03.940667287 -0700
-+++ blender-2.45/source/blender/yafray/intern/export_File.cpp	2008-04-19 17:35:45.875893589 -0700
-@@ -1,6 +1,7 @@
- #include "export_File.h"
- 
- #include <math.h>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp blender-2.45/source/blender/yafray/intern/export_Plugin.cpp
---- blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp	2008-04-19 17:10:03.940667287 -0700
-+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp	2008-04-19 17:33:48.316644087 -0700
-@@ -1,6 +1,8 @@
- #include "export_Plugin.h"
- 
- #include <math.h>
-+#include <cstring>
-+
- using namespace std;
- 
- 
-diff -Naur blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp blender-2.45/source/blender/yafray/intern/yafray_Render.cpp
---- blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp	2008-04-19 17:10:03.939669059 -0700
-+++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp	2008-04-19 17:37:16.293897581 -0700
-@@ -7,6 +7,7 @@
- #include "yafray_Render.h"
- 
- #include <math.h>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -Naur blender-2.45.orig/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
---- blender-2.45.orig/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp	2008-04-19 17:10:03.980669133 -0700
-+++ blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp	2008-04-19 17:42:29.390648003 -0700
-@@ -32,6 +32,8 @@
- 
- #include "GPC_KeyboardDevice.h"
- 
-+#include <cstdlib>
-+
- /** 
-  * NextFrame toggles currentTable with previousTable,
-  * and copies relevant event information from previous to current table



More information about the SM-Commit mailing list