From 77c071fe7cc5a941e57ed3098877805a9858c15f Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Thu, 13 May 2010 00:27:43 +0200 Subject: graphics/blender: Updated for version 2.49a --- graphics/blender/blender-softwaregl-wrapper | 9 +++++ graphics/blender/blender-wrapper | 9 ++--- graphics/blender/blender.SlackBuild | 58 +++++++++++++++-------------- graphics/blender/blender.desktop | 11 ++++++ graphics/blender/blender.info | 8 ++-- graphics/blender/blenderplayer-wrapper | 9 ++--- graphics/blender/doinst.sh | 6 +++ graphics/blender/slack-desc | 12 +++--- 8 files changed, 74 insertions(+), 48 deletions(-) create mode 100644 graphics/blender/blender-softwaregl-wrapper create mode 100644 graphics/blender/blender.desktop diff --git a/graphics/blender/blender-softwaregl-wrapper b/graphics/blender/blender-softwaregl-wrapper new file mode 100644 index 0000000000..b337a60cea --- /dev/null +++ b/graphics/blender/blender-softwaregl-wrapper @@ -0,0 +1,9 @@ +#!/bin/sh +# Wrapper to start blender +if [ ! -d $HOME/.blender ]; then + cp -a /usr/share/blender/dot-blender $HOME/.blender + sleep 1 +fi +cd /opt/blender +PYTHONHOME="$(python -c "import sys; print ':'.join(sys.path[1:])")" \ + /opt/blender/blender-softwaregl diff --git a/graphics/blender/blender-wrapper b/graphics/blender/blender-wrapper index e30ce6591c..6c39829440 100644 --- a/graphics/blender/blender-wrapper +++ b/graphics/blender/blender-wrapper @@ -1,12 +1,9 @@ #!/bin/sh - # Wrapper to start blender - if [ ! -d $HOME/.blender ]; then cp -a /usr/share/blender/dot-blender $HOME/.blender sleep 1 fi - -cd /opt/blender-_VERSION_ -/opt/blender-_VERSION_/blender - +cd /opt/blender +PYTHONHOME="$(python -c "import sys; print ':'.join(sys.path[1:])")" \ + /opt/blender/blender 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} diff --git a/graphics/blender/blender.desktop b/graphics/blender/blender.desktop new file mode 100644 index 0000000000..ec21c7bd26 --- /dev/null +++ b/graphics/blender/blender.desktop @@ -0,0 +1,11 @@ +[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 + diff --git a/graphics/blender/blender.info b/graphics/blender/blender.info index 229ac1c052..b1c6775819 100644 --- a/graphics/blender/blender.info +++ b/graphics/blender/blender.info @@ -1,8 +1,10 @@ PRGNAM="blender" -VERSION="2.48a" +VERSION="2.49a" HOMEPAGE="http://blender.org" -DOWNLOAD="http://download.blender.org/release/Blender2.48a/blender-2.48a-linux-glibc236-py25-i386.tar.bz2" -MD5SUM="c876ed8ead39a052466a4f1f90ee4e11" +DOWNLOAD="http://download.blender.org/release/Blender2.49a/blender-2.49a-linux-glibc236-py26-i386.tar.bz2" +MD5SUM="3a7db89022cc98fc0a644fc0c3b8854f" +DOWNLOAD_x86_64="http://download.blender.org/release/Blender2.49a/blender-2.49a-linux-glibc236-py26-x86_64.tar.bz2" +MD5SUM_x86_64="1039cc49e477e1fc9a15d4694442deb2" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" APPROVED="Erik Hanson" diff --git a/graphics/blender/blenderplayer-wrapper b/graphics/blender/blenderplayer-wrapper index f3ccab3ff2..aec8daa006 100644 --- a/graphics/blender/blenderplayer-wrapper +++ b/graphics/blender/blenderplayer-wrapper @@ -1,12 +1,9 @@ #!/bin/sh - # Wrapper to start blender - if [ ! -d $HOME/.blender ]; then cp -a /usr/share/blender/dot-blender $HOME/.blender sleep 1 fi - -cd /opt/blender-_VERSION_ -/opt/blender-_VERSION_/blenderplayer - +cd /opt/blender +PYTHONHOME="$(python -c "import sys; print ':'.join(sys.path[1:])")" \ + /opt/blender/blenderplayer diff --git a/graphics/blender/doinst.sh b/graphics/blender/doinst.sh index 4e8ba7071d..1f8ff67ded 100644 --- a/graphics/blender/doinst.sh +++ b/graphics/blender/doinst.sh @@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/graphics/blender/slack-desc b/graphics/blender/slack-desc index 88c1330db3..52083390aa 100644 --- a/graphics/blender/slack-desc +++ b/graphics/blender/slack-desc @@ -10,10 +10,10 @@ blender: Blender (3D Content Creation Suite) blender: blender: Blender is the free open source 3D content creation suite, available blender: for all major operating systems under the GNU General Public License. -blender: +blender: blender: Homepage: http://blender.org -blender: -blender: -blender: -blender: -blender: +blender: +blender: +blender: +blender: +blender: -- cgit v1.2.3