summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-05-23 03:54:37 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:46 -0500
commitfd8860552489a2c3e6c74f28e84c65ca753988b1 (patch)
tree22e1f38683ad53c4c1745e0aa4af95cd5d3ec8c5 /graphics
parent80132f8ea9f2542fac42ccc2d0afa831ca98d9fc (diff)
downloadslackbuilds-fd8860552489a2c3e6c74f28e84c65ca753988b1.tar.gz
slackbuilds-fd8860552489a2c3e6c74f28e84c65ca753988b1.tar.xz
graphics/blender: Miscellaneous cleanups
Diffstat (limited to 'graphics')
-rw-r--r--graphics/blender/blender-softwaregl-wrapper2
-rw-r--r--graphics/blender/blender-wrapper2
-rw-r--r--graphics/blender/blender.SlackBuild20
-rw-r--r--graphics/blender/blenderplayer-wrapper2
4 files changed, 20 insertions, 6 deletions
diff --git a/graphics/blender/blender-softwaregl-wrapper b/graphics/blender/blender-softwaregl-wrapper
index b337a60cea..844bc5374b 100644
--- a/graphics/blender/blender-softwaregl-wrapper
+++ b/graphics/blender/blender-softwaregl-wrapper
@@ -6,4 +6,4 @@ if [ ! -d $HOME/.blender ]; then
fi
cd /opt/blender
PYTHONHOME="$(python -c "import sys; print ':'.join(sys.path[1:])")" \
- /opt/blender/blender-softwaregl
+ /opt/blender/blender-softwaregl "$@"
diff --git a/graphics/blender/blender-wrapper b/graphics/blender/blender-wrapper
index 6c39829440..cdecbdbe68 100644
--- a/graphics/blender/blender-wrapper
+++ b/graphics/blender/blender-wrapper
@@ -6,4 +6,4 @@ if [ ! -d $HOME/.blender ]; then
fi
cd /opt/blender
PYTHONHOME="$(python -c "import sys; print ':'.join(sys.path[1:])")" \
- /opt/blender/blender
+ /opt/blender/blender "$@"
diff --git a/graphics/blender/blender.SlackBuild b/graphics/blender/blender.SlackBuild
index b794074f29..917519dfdc 100644
--- a/graphics/blender/blender.SlackBuild
+++ b/graphics/blender/blender.SlackBuild
@@ -22,7 +22,6 @@
PRGNAM=blender
VERSION=${VERSION:-2.49a}
-ARCH=${ARCH:-i386}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -31,6 +30,16 @@ TAG=${TAG:-_SBo}
# the ones that are shipped with Slackware
LMTFA=${LMTFA:-yes}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -38,8 +47,13 @@ OUTPUT=${OUTPUT:-/tmp}
set -e
-if [ "$ARCH" != "x86_64" ]; then
- ARCH=i386
+if [ "$ARCH" = "x86_64" ]; then
+ break
+elif [ "$ARCH" = "i386" ]; then
+ break
+else
+ printf "\n\n$ARCH is not supported... \n"
+ exit 1
fi
rm -rf $PKG
diff --git a/graphics/blender/blenderplayer-wrapper b/graphics/blender/blenderplayer-wrapper
index aec8daa006..f2f9467dd7 100644
--- a/graphics/blender/blenderplayer-wrapper
+++ b/graphics/blender/blenderplayer-wrapper
@@ -6,4 +6,4 @@ if [ ! -d $HOME/.blender ]; then
fi
cd /opt/blender
PYTHONHOME="$(python -c "import sys; print ':'.join(sys.path[1:])")" \
- /opt/blender/blenderplayer
+ /opt/blender/blenderplayer "$@"