From 732c3cd772a77df0cdb6bc900cad0615f674ab1e Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Fri, 8 Jul 2011 08:10:14 -0300 Subject: graphics/blender: Updated for version 2.58. Signed-off-by: Niels Horn --- graphics/blender/blender-softwaregl-wrapper | 9 ----- graphics/blender/blender-wrapper | 9 ----- graphics/blender/blender.SlackBuild | 62 ++++++++++++----------------- graphics/blender/blender.desktop | 1 - graphics/blender/blender.info | 12 +++--- graphics/blender/blenderplayer-wrapper | 9 ----- graphics/blender/profile.d/blender.csh | 2 + graphics/blender/profile.d/blender.sh | 2 + 8 files changed, 36 insertions(+), 70 deletions(-) delete mode 100644 graphics/blender/blender-softwaregl-wrapper delete mode 100644 graphics/blender/blender-wrapper delete mode 100644 graphics/blender/blenderplayer-wrapper create mode 100644 graphics/blender/profile.d/blender.csh create mode 100644 graphics/blender/profile.d/blender.sh (limited to 'graphics') diff --git a/graphics/blender/blender-softwaregl-wrapper b/graphics/blender/blender-softwaregl-wrapper deleted file mode 100644 index 844bc5374b..0000000000 --- a/graphics/blender/blender-softwaregl-wrapper +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 deleted file mode 100644 index cdecbdbe68..0000000000 --- a/graphics/blender/blender-wrapper +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 "$@" diff --git a/graphics/blender/blender.SlackBuild b/graphics/blender/blender.SlackBuild index a5b4c6b84c..893757a67b 100644 --- a/graphics/blender/blender.SlackBuild +++ b/graphics/blender/blender.SlackBuild @@ -20,18 +20,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Thanks to Giorgio Peron for some build tips + PRGNAM=blender -VERSION=${VERSION:-2.49b} +VERSION=${VERSION:-2.58} 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} +SRCVERSION=$VERSION-linux-glibc27 + +# We'll remove the libGL* shared libaries that are shipped with blender (and +# instead use the ones that are shipped with Slackware's Xorg) +# If this is undesirable for you, pass LMTFA=yes to the script when building +LMTFA=${LMTFA:-no} case "$( uname -m )" in - i?86) ARCH=i386 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -45,7 +49,7 @@ set -e if [ "$ARCH" = "x86_64" ]; then break -elif [ "$ARCH" = "i386" ]; then +elif [ "$ARCH" = "i686" ]; then break else printf "\n\n$ARCH is not supported... \n" @@ -55,58 +59,44 @@ fi rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-linux-glibc236-py26-${ARCH}.tar.bz2 -cd $PRGNAM-$VERSION-linux-glibc236-py26-${ARCH} +rm -rf $PRGNAM-$SRCVERSION-${ARCH} +tar xvf $CWD/$PRGNAM-$SRCVERSION-${ARCH}.tar.bz2 +cd $PRGNAM-$SRCVERSION-${ARCH} chown -R root:root . # Move the docs to our standard location first mkdir -p $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 -mkdir -p $PKG/usr/share/blender -mv .blender $PKG/usr/share/blender/dot-blender -cat << EOF > $PKG/usr/share/blender/README.dot-blender -This contains a "skeleton directory" for what should be a default -\$HOME/.blender directory for every user. Don't delete it. -EOF +mv GPL-license.txt copyright.txt Python-license.txt readme.html \ + $PKG/usr/doc/$PRGNAM-$VERSION # Now move everything else mkdir -p $PKG/opt/blender mv * $PKG/opt/blender +# Add profile scripts to append to PATH +mkdir -p $PKG/etc/profile.d +cp $CWD/profile.d/* $PKG/etc/profile.d/ +chmod 0755 $PKG/etc/profile.d/* + # 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 +for size in 16x16 22x22 24x24 32x32 48x48 ; do mkdir -p $PKG/usr/share/icons/hicolor/$size/apps - cd $PKG/usr/share/icons/hicolor/$size/apps - ln -s /opt/blender/icons/$size/blender.png . + ln -s /opt/blender/icons/$size/blender.png \ + $PKG/usr/share/icons/hicolor/$size/apps/ done mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps -( cd $PKG/usr/share/icons/hicolor/scalable/apps - ln -s /opt/blender/icons/scalable/blender.svg . -) + ln -s /opt/blender/icons/scalable/blender.svg \ + $PKG/usr/share/icons/hicolor/scalable/apps/ # Add a desktop menu entry mkdir -p $PKG/usr/share/applications 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 -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 cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/graphics/blender/blender.desktop b/graphics/blender/blender.desktop index ec21c7bd26..45453fbb9b 100644 --- a/graphics/blender/blender.desktop +++ b/graphics/blender/blender.desktop @@ -8,4 +8,3 @@ TryExec=blender Exec=blender Name=Blender Comment=3D Content Renderer - diff --git a/graphics/blender/blender.info b/graphics/blender/blender.info index d6ba84aa21..44c7ff7c96 100644 --- a/graphics/blender/blender.info +++ b/graphics/blender/blender.info @@ -1,10 +1,10 @@ PRGNAM="blender" -VERSION="2.49b" +VERSION="2.58" HOMEPAGE="http://blender.org" -DOWNLOAD="http://download.blender.org/release/Blender2.49b/blender-2.49b-linux-glibc236-py26-i386.tar.bz2" -MD5SUM="f9157c5142fc0638ab2970033b7a91a0" -DOWNLOAD_x86_64="http://download.blender.org/release/Blender2.49b/blender-2.49b-linux-glibc236-py26-x86_64.tar.bz2" -MD5SUM_x86_64="58822737042a0bd220553ac78994722f" +DOWNLOAD="http://download.blender.org/release//Blender2.58/blender-2.58-linux-glibc27-i686.tar.bz2" +MD5SUM="13c9b4dcada0bfc5809782800b335a18" +DOWNLOAD_x86_64="http://download.blender.org/release//Blender2.58/blender-2.58-linux-glibc27-x86_64.tar.bz2" +MD5SUM_x86_64="4694d88b84723eaef23e71e7849b3c76" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="Erik Hanson" +APPROVED="Niels Horn" diff --git a/graphics/blender/blenderplayer-wrapper b/graphics/blender/blenderplayer-wrapper deleted file mode 100644 index f2f9467dd7..0000000000 --- a/graphics/blender/blenderplayer-wrapper +++ /dev/null @@ -1,9 +0,0 @@ -#!/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/blenderplayer "$@" diff --git a/graphics/blender/profile.d/blender.csh b/graphics/blender/profile.d/blender.csh new file mode 100644 index 0000000000..15850e2a8f --- /dev/null +++ b/graphics/blender/profile.d/blender.csh @@ -0,0 +1,2 @@ +#!/bin/csh +setenv PATH ${PATH}:/opt/blender diff --git a/graphics/blender/profile.d/blender.sh b/graphics/blender/profile.d/blender.sh new file mode 100644 index 0000000000..b036e02dcf --- /dev/null +++ b/graphics/blender/profile.d/blender.sh @@ -0,0 +1,2 @@ +#!/bin/sh +export PATH="${PATH}:/opt/blender" -- cgit v1.2.3