graphics/blender: Updated for version 2.49a

1 files changed, 31 insertions, 27 deletions

diff --git a/graphics/blender/blender.SlackBuild b/graphics/blender/blender.SlackBuild
index fca5515552..b794074f29 100644
--- a/graphics/blender/blender.SlackBuild
+++ b/graphics/blender/blender.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008  Robby Workman  Northport, AL, USA
+# Copyright 2008,2009  Robby Workman  Northport, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,16 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=blender
-VERSION=${VERSION:-2.48a}
-ARCH=i386
+VERSION=${VERSION:-2.49a}
+ARCH=${ARCH:-i386}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Leave me alone?  If left as yes, then we'll leave the libGL* shared libaries
+# that are shipped with blender; otherwise, we'll remove them and depend on
+# the ones that are shipped with Slackware
+LMTFA=${LMTFA:-yes}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -33,19 +38,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
+if [ "$ARCH" != "x86_64" ]; then
+  ARCH=i386
+fi
+  
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-linux-glibc236-py25-i386.tar.bz2 
-cd $PRGNAM-$VERSION-linux-glibc236-py25-i386
+tar xvf $CWD/$PRGNAM-$VERSION-linux-glibc236-py26-${ARCH}.tar.bz2 
+cd $PRGNAM-$VERSION-linux-glibc236-py26-${ARCH}
 chown -R root:root .
 
 # Move the docs to our standard location first
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv BlenderQuickStart.pdf GPL-license.txt Python-license.txt blender.html \
-  copyright.txt release_247.txt release_248.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+mv \
+  BlenderQuickStart.pdf *license.txt blender.html copyright.txt release*.txt \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 
 # The ".blender" directory shipped here is used by default, but then, it
 # shouldn't be writable by anyone but root, so we'll do something else
@@ -57,40 +66,35 @@ This contains a "skeleton directory" for what should be a default
 EOF
 
 # Now move everything else
-mkdir -p $PKG/opt/blender-$VERSION
-mv * $PKG/opt/blender-$VERSION
+mkdir -p $PKG/opt/blender
+mv * $PKG/opt/blender
+
+# Leave me alone?
+if [ "$LMTFA" != "yes" ]; then
+  rm -f $PKG/opt/blender/lib/libGL*
+fi
 
 # Put symlinks to icons in the standard places
 for size in 16x16 22x22 32x32 ; do
   mkdir -p $PKG/usr/share/icons/hicolor/$size/apps
   cd $PKG/usr/share/icons/hicolor/$size/apps
-  ln -s /opt/blender-$VERSION/icons/$size/blender.png .
+  ln -s /opt/blender/icons/$size/blender.png .
 done
 mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
 ( cd $PKG/usr/share/icons/hicolor/scalable/apps
-  ln -s /opt/blender-$VERSION/icons/scalable/blender.svg .
+  ln -s /opt/blender/icons/scalable/blender.svg .
 )
 
 # Add a desktop menu entry
 mkdir -p $PKG/usr/share/applications
-cat << EOF > $PKG/usr/share/applications/blender.desktop
-[Desktop Entry]
-Version=1.0
-Terminal=false
-Icon=blender
-Type=Application
-Categories=GTK;AudioVideo;Audio;Video;
-TryExec=blender
-Exec=blender
-Name=Blender
-Comment=3D Content Renderer
-EOF
+cat $CWD/blender.desktop > $PKG/usr/share/applications/blender.desktop
 
 # Finally, let's create wrapper scripts to handle setting up 
 # users with the default $HOME/.blender directory if needed
 mkdir $PKG/usr/bin
-sed s/_VERSION_/$VERSION/ $CWD/blender-wrapper > $PKG/usr/bin/blender
-sed s/_VERSION_/$VERSION/ $CWD/blenderplayer-wrapper > $PKG/usr/bin/blenderplayer
+cat $CWD/blender-wrapper > $PKG/usr/bin/blender
+cat $CWD/blenderplayer-wrapper > $PKG/usr/bin/blenderplayer
+cat $CWD/blender-softwaregl-wrapper > $PKG/usr/bin/blender-softwaregl
 chmod 0755 $PKG/usr/bin/*
 
 mkdir -p $PKG/install
@@ -98,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}