4 files changed, 44 insertions, 26 deletions
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
index 6897a61a4da2e..913da8eae9fec 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
@@ -2,15 +2,14 @@
 
 # Slackware build script for OpenSceneGraph
 
-# Written by Aleksandar B. Samardzic (<asamardzic@matf.bg.ac.yu>)
-
-set -e
+# Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
 PRGNAM=OpenSceneGraph
-VERSION=2.2.0
+VERSION=${VERSION:-2.8.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -18,10 +17,17 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -29,21 +35,32 @@ rm -rf $PRGNAM-$VERSION
 unzip $CWD/$PRGNAM-$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+cmake \
+  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DCMAKE_INSTALL_PREFIX=/usr
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-cmake -DCMAKE_INSTALL_PREFIX=/usr .
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS.txt ChangeLog LICENSE.txt NEWS.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS.txt ChangeLog LICENSE.txt NEWS.txt README.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.info b/libraries/OpenSceneGraph/OpenSceneGraph.info
index ebca35d1460cb..25ab0b61bba25 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.info
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenSceneGraph"
-VERSION="2.2.0"
+VERSION="2.8.0"
 HOMEPAGE="http://www.openscenegraph.org/"
-DOWNLOAD="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-2.2.0.zip"
-MD5SUM="5782f082e57a6d6874d81c88dfb480c6"
-MAINTAINER="Aleksandar B. Samardzic"
-EMAIL="asamardzic@matf.bg.ac.yu"
-APPROVED="rworkman"
+DOWNLOAD=" http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-2.8/source/OpenSceneGraph-2.8.0.zip"
+MD5SUM="c4c20b97274346701f6d57eab3e78bcd"
+MAINTAINER="Aleksandar Samardzic"
+EMAIL="asamardzic@gmail.com"
+APPROVED="dsomero"
diff --git a/libraries/OpenSceneGraph/README b/libraries/OpenSceneGraph/README
index 58c982f7fea94..6b779386ea697 100644
--- a/libraries/OpenSceneGraph/README
+++ b/libraries/OpenSceneGraph/README
@@ -1,7 +1,8 @@
-The OpenSceneGraph is an OpenSource cross platform graphics toolkit for
-the development of high performance graphics applications such as flight
-simulators, games, virtual reality and scientific visualization.  Based
-around the concept of a SceneGraph, it provides an object oriented
-framework on top of OpenGL freeing the developer from implementing and
-optimizing low level graphics calls, and provides many additional
-utilities for rapid development of graphics applications.
+The OpenSceneGraph is an open source cross platform graphics toolkit
+for the development of high performance graphics applications such as
+flight simulators, games, virtual reality and scientific
+visualization.  Based around the concept of a scene graph, it provides
+an object oriented framework on top of OpenGL freeing the developer
+from implementing and optimizing low level graphics calls, and
+provides many additional utilities for rapid development of graphics
+applications.
diff --git a/libraries/OpenSceneGraph/slack-desc b/libraries/OpenSceneGraph/slack-desc
index 09a65af3abe5c..ee5e9f58f7cd6 100644
--- a/libraries/OpenSceneGraph/slack-desc
+++ b/libraries/OpenSceneGraph/slack-desc
@@ -8,8 +8,8 @@
               |-----handy-ruler------------------------------------------------------|
 OpenSceneGraph: OpenSceneGraph (3D graphics toolkit)
 OpenSceneGraph:
-OpenSceneGraph: The OpenSceneGraph is an open source high performance 3D
-OpenSceneGraph: graphics toolkit, used by application developers in
+OpenSceneGraph: The OpenSceneGraph is an open source high performance
+OpenSceneGraph: 3D graphics toolkit, used by application developers in
 OpenSceneGraph: fields such as visual simulation, games, virtual
 OpenSceneGraph: reality, scientific visualization and modelling.
 OpenSceneGraph: