Skip to Content.
Sympa Menu

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

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 (9fa09f20933e90849028b5e7aab1502170111ab6)
  • Date: Sun, 19 Oct 2008 16:38:16 -0500

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

dev/null |binary
graphics/blender/BUILD | 32
+++----------------------------
graphics/blender/CONFIGURE | 4 ---
graphics/blender/DEPENDS | 28 +++++++++++++++------------
graphics/blender/DETAILS | 2 -
graphics/blender/HISTORY | 7 ++++++
graphics/blender/INSTALL | 5 ++--
graphics/blender/PRE_BUILD | 3 +-
graphics/blender/blender-2.47.tar.gz.sig | 0
graphics/blender/blender-2.48.tar.gz.sig |binary
10 files changed, 33 insertions(+), 48 deletions(-)

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

blender: => 2.48

diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index b945658..6d241dc 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -1,35 +1,11 @@
-if [[ $OPENAL == y ]]; then
- USE_OPENAL="WITH_BF_OPENAL=1"
-else
- USE_OPENAL="WITH_BF_OPENAL=0"
+if list_find "$OPTS" "WITH_BF_ODE=1"; then
+ sed -i "s:LIBDIR + '/ode':\'$INSTALL_ROOT/usr\':" config/linux2-config.py
fi &&

-if [[ $OPENEXR == y ]]; then
- USE_OPENEXR="WITH_BF_OPENEXR=1"
-else
- USE_OPENEXR="WITH_BF_OPENEXR=0"
-fi &&
-
-if [[ $ODE == y ]]; then
- sedit "s:LIBDIR + '/ode':\'$INSTALL_ROOT/usr\':" config/linux2-config.py &&
- USE_ODE="WITH_BF_ODE=1"
-else
- USE_ODE="WITH_BF_ODE=0"
-fi &&
-
-if [[ $FFMPEG == y ]]; then
- USE_FFMPEG="WITH_BF_FFMPEG=1"
-else
- USE_FFMPEG="WITH_BF_FFMPEG=0"
-fi &&
-
-scons $USE_OPENAL \
- $USE_OPENEXR \
- $USE_ODE \
- $USE_FFMPEG \
+scons BF_INSTALLDIR="$SOURCE_DIRECTORY/install" \
WITH_BF_INTERNATIONAL=1 \
WITH_BF_PLAYER=1 \
WITH_BF_GAMEENGINE=1 \
- BF_INSTALLDIR="$SOURCE_DIRECTORY/install" &&
+ $OPTS &&

make -C "$SOURCE_DIRECTORY/install/plugins"
diff --git a/graphics/blender/CONFIGURE b/graphics/blender/CONFIGURE
deleted file mode 100755
index ad434c6..0000000
--- a/graphics/blender/CONFIGURE
+++ /dev/null
@@ -1,4 +0,0 @@
-config_query OPENAL "Use blender audio ability (freealut with openal) ?" y &&
-config_query OPENEXR "Enable High Dynamic Range graphics (openexr)?" y &&
-config_query ODE "Enable Open Dynamics Engine support (ode) ?" y &&
-config_query FFMPEG "Use ffmpeg as a dependency?" y
diff --git a/graphics/blender/DEPENDS b/graphics/blender/DEPENDS
index f53bc8b..4b1c1b1 100755
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -5,21 +5,25 @@ depends GLUT &&
depends zlib &&
depends jpeg &&

-if [[ $OPENAL == y ]]; then
- depends freealut
-fi &&
+optional_depends openexr \
+ "WITH_BF_OPENEXR=1" \
+ "WITH_BF_OPENEXR=0" \
+ "for High Dynamic Range graphics (OpenEXR) support" &&

-if [[ $OPENEXR == y ]]; then
- depends openexr
-fi &&
+optional_depends ode \
+ "WITH_BF_ODE=1" \
+ "WITH_BF_ODE=0" \
+ "for Open Dynamics Engine (ODE) support" &&

-if [[ $ODE == y ]]; then
- depends ode
-fi &&
+optional_depends freealut \
+ "WITH_BF_OPENAL=1" \
+ "WITH_BF_OPENAL=0" \
+ "for blender audio ability (FreeALUT + OpenAL)" &&

-if [[ $FFMPEG == y ]]; then
- depends LIBAVCODEC
-fi &&
+optional_depends LIBAVCODEC \
+ "WITH_BF_FFMPEG=1" \
+ "WITH_BF_FFMPEG=0" \
+ "use ffmpeg as a dependency?" &&

optional_depends libpng "" "" "for PNG file support" &&
optional_depends yafray "" "" "for Yafray raytracing"
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index cae5533..d91e5ac 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -1,5 +1,5 @@
SPELL=blender
- VERSION=2.47
+ VERSION=2.48
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://download.blender.org/source/$SOURCE
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index cc6dee7..671f576 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,10 @@
+2008-10-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.48
+ * CONFIGURE: removed, the options goes to DEPENDS
+ * PRE_BUILD: cleaned up
+ * INSTALL: let's "minimize" the lines
+ * DEPENDS: use scons vars freely like in ardour2 spell
+
2008-08-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.47, cleaned up
* BUILD, INSTALL: cleaned up
diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
index b8bbf0a..a239af1 100755
--- a/graphics/blender/INSTALL
+++ b/graphics/blender/INSTALL
@@ -1,5 +1,5 @@
-install -vm 755 install/blender "$INSTALL_ROOT/usr/bin" &&
-install -vm 755 install/blenderplayer "$INSTALL_ROOT/usr/bin" &&
+install -vm 755 install/blender{,player} "$INSTALL_ROOT/usr/bin" &&
+
install -vm 644 "$SPELL_DIRECTORY/blender48x48.png" \
"$INSTALL_ROOT/usr/share/pixmaps" &&

@@ -11,6 +11,7 @@ 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" \
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
index 65b0036..d7d43a5 100755
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -1,8 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+
chmod 755 release/plugins/bmake &&

-# Set Python version to the installed version, not hardcoded one
+# 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" &&

diff --git a/graphics/blender/blender-2.47.tar.gz.sig
b/graphics/blender/blender-2.47.tar.gz.sig
deleted file mode 100644
index 7227ad2..0000000
Binary files a/graphics/blender/blender-2.47.tar.gz.sig and /dev/null differ
diff --git a/graphics/blender/blender-2.48.tar.gz.sig
b/graphics/blender/blender-2.48.tar.gz.sig
new file mode 100644
index 0000000..27ea2a9
Binary files /dev/null and b/graphics/blender/blender-2.48.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9fa09f20933e90849028b5e7aab1502170111ab6), Vlad Glagolev, 10/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page