Update to 0.7

1 files changed, 28 insertions, 13 deletions

diff --git a/libvdpau/build/libvdpau.SlackBuild b/libvdpau/build/libvdpau.SlackBuild
index e83449ae..a37b38cc 100755
--- a/libvdpau/build/libvdpau.SlackBuild
+++ b/libvdpau/build/libvdpau.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2011, 2013  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -27,14 +27,16 @@
 # By:          Eric Hameleers <alien@slackware.com>
 # For:         libvdpau
 # Descr:       VDPAU wrapper library
-# URL:         http://people.freedesktop.org/~aplattner/
+# URL:         http://cgit.freedesktop.org/~aplattner/libvdpau
 # Needs:       
 # Changelog:   
-# 0.4.1-1:     28/Jun/2011 by Eric Hameleers <alien@slackware.com>
+# 0.4.1-1:     28/jun/2011 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 0.7-1:       11/dec/2013 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh libvdpau.SlackBuild' to build a Slackware package.
-# The package (.tgz) and .txt file as well as build logs are created in /tmp .
+# The package (.txz) and .txt file as well as build logs are created in /tmp .
 # Install it using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
@@ -42,7 +44,7 @@
 # Set initial variables:
 
 PRGNAM=libvdpau
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -65,12 +67,15 @@ SRCURL="http://people.freedesktop.org/~aplattner/vdpau/${PRGNAM}-${VERSION}.tar.
 ##
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    armv6hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
@@ -81,11 +86,22 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
   *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
 esac
 
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
+esac
+
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -156,10 +172,9 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --disable-documentation \
-  --disable-static \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
@@ -188,9 +203,9 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt