Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (abc62caa5d7e587bf7515cbc1d71603ce9cce21d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (abc62caa5d7e587bf7515cbc1d71603ce9cce21d)
  • Date: Sat, 23 Aug 2008 18:18:57 -0500

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

dev/null |binary
graphics/blender/BUILD | 19 +++++++---------
graphics/blender/DETAILS | 6 ++---
graphics/blender/FINAL | 3 --
graphics/blender/HISTORY | 4 +++
graphics/blender/INSTALL | 36
+++++++++++++++----------------
graphics/blender/PRE_BUILD | 6 ++---
graphics/blender/blender-2.46.tar.gz.sig | 0
graphics/blender/blender-2.47.tar.gz.sig |binary
9 files changed, 38 insertions(+), 36 deletions(-)

New commits:
commit abc62caa5d7e587bf7515cbc1d71603ce9cce21d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

blender: => 2.47

diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index 9778c23..b945658 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -23,14 +23,13 @@ else
USE_FFMPEG="WITH_BF_FFMPEG=0"
fi &&

-scons \
- $USE_OPENAL \
- $USE_OPENEXR \
- $USE_ODE \
- $USE_FFMPEG \
- WITH_BF_INTERNATIONAL=1 \
- WITH_BF_PLAYER=1 \
- WITH_BF_GAMEENGINE=1 \
- BF_INSTALLDIR=$SOURCE_DIRECTORY/install &&
+scons $USE_OPENAL \
+ $USE_OPENEXR \
+ $USE_ODE \
+ $USE_FFMPEG \
+ WITH_BF_INTERNATIONAL=1 \
+ WITH_BF_PLAYER=1 \
+ WITH_BF_GAMEENGINE=1 \
+ BF_INSTALLDIR="$SOURCE_DIRECTORY/install" &&

-make -C $SOURCE_DIRECTORY/install/plugins
+make -C "$SOURCE_DIRECTORY/install/plugins"
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index 877bb4e..cae5533 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -1,7 +1,7 @@
SPELL=blender
- VERSION=2.46
+ VERSION=2.47
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://download.blender.org/source/$SOURCE
SOURCE_URL[1]=http://mirror.cs.umn.edu/blender.org/source/$SOURCE
SOURCE_URL[2]=http://public.planetmirror.com/pub/blender/source/$SOURCE
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="graphics"
WEB_SITE=http://www.blender.org/
ENTERED=20021018
- SHORT="Opensource 3d modelling/animation tool"
+ 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.
diff --git a/graphics/blender/FINAL b/graphics/blender/FINAL
index 411f634..bbee0e3 100755
--- a/graphics/blender/FINAL
+++ b/graphics/blender/FINAL
@@ -1,5 +1,4 @@
# scons leaves mess behind ...
# Ignoring result on purpose ( no && )
-rm -rf "$BUILD_DIRECTORY/build"
-rm -rf "$BUILD_DIRECTORY/lib"
+rm -rf "$BUILD_DIRECTORY/{build,lib}"
true
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index e12d8ee..cc6dee7 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,7 @@
+2008-08-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.47, cleaned up
+ * BUILD, INSTALL: cleaned up
+
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
diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
index d12ef39..b8bbf0a 100755
--- a/graphics/blender/INSTALL
+++ b/graphics/blender/INSTALL
@@ -1,22 +1,22 @@
-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 -vm 755 install/blender "$INSTALL_ROOT/usr/bin" &&
+install -vm 755 install/blenderplayer "$INSTALL_ROOT/usr/bin" &&
+install -vm 644 "$SPELL_DIRECTORY/blender48x48.png" \
+ "$INSTALL_ROOT/usr/share/pixmaps" &&

-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 -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 -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 &&
+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" &&

-install -vm 644 $SOURCE_DIRECTORY/release/VERSION \
- $INSTALL_ROOT/usr/share/blender &&
+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
'{}' \;
+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 76f00f8..65b0036 100755
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -1,9 +1,9 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
chmod 755 release/plugins/bmake &&

# 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 &&
+ "$SOURCE_DIRECTORY/config/linux2-config.py" &&

-patch -p1 < $SPELL_DIRECTORY/blender-2.44-scriptsdir.patch
+patch -p1 < "$SPELL_DIRECTORY/blender-2.44-scriptsdir.patch"
diff --git a/graphics/blender/blender-2.46.tar.gz.sig
b/graphics/blender/blender-2.46.tar.gz.sig
deleted file mode 100644
index 2afda3e..0000000
Binary files a/graphics/blender/blender-2.46.tar.gz.sig and /dev/null differ
diff --git a/graphics/blender/blender-2.47.tar.gz.sig
b/graphics/blender/blender-2.47.tar.gz.sig
new file mode 100644
index 0000000..7227ad2
Binary files /dev/null and b/graphics/blender/blender-2.47.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (abc62caa5d7e587bf7515cbc1d71603ce9cce21d), Vlad Glagolev, 08/23/2008

Archive powered by MHonArc 2.6.24.

Top of Page