2 files changed, 21 insertions, 12 deletions
diff --git a/libraries/libdvbpsi/libdvbpsi.SlackBuild b/libraries/libdvbpsi/libdvbpsi.SlackBuild
index 39585aa18edb..f203315149cd 100644
--- a/libraries/libdvbpsi/libdvbpsi.SlackBuild
+++ b/libraries/libdvbpsi/libdvbpsi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libdvbpsi
 
-# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2007,2008,2009,2010  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Note - the source tarball and extracted directory suffix a "5" to the name
-# That's reflected in the script (in case you're wondering)
-
 PRGNAM=libdvbpsi
-VERSION=0.1.6
-ARCH=${ARCH:-i486}
+VERSION=0.1.7
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# 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
@@ -45,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -52,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}5-$VERSION
-tar xvf $CWD/${PRGNAM}5-$VERSION.tar.bz2
-cd ${PRGNAM}5-$VERSION
+rm -rf ${PRGNAM}-$VERSION
+tar xvf $CWD/${PRGNAM}-$VERSION.tar.bz2
+cd ${PRGNAM}-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/libraries/libdvbpsi/libdvbpsi.info b/libraries/libdvbpsi/libdvbpsi.info
index cadbbd0a7dc3..88979d8765c8 100644
--- a/libraries/libdvbpsi/libdvbpsi.info
+++ b/libraries/libdvbpsi/libdvbpsi.info
@@ -1,8 +1,8 @@
 PRGNAM="libdvbpsi"
-VERSION="0.1.6"
+VERSION="0.1.7"
 HOMEPAGE="http://developers.videolan.org/libdvbpsi/"
-DOWNLOAD="http://download.videolan.org/pub/libdvbpsi/0.1.6/libdvbpsi5-0.1.6.tar.bz2"
-MD5SUM="bd2d9861be3311e1e03c91cd9345f542"
+DOWNLOAD="http://download.videolan.org/pub/libdvbpsi/0.1.7/libdvbpsi-0.1.7.tar.bz2"
+MD5SUM="af419575719e356b908b0c6946499052"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"