Update to 1.2.1

1 files changed, 34 insertions, 24 deletions

diff --git a/libva/build/libva.SlackBuild b/libva/build/libva.SlackBuild
index ab6da59a..4bb5cadf 100755
--- a/libva/build/libva.SlackBuild
+++ b/libva/build/libva.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -27,7 +27,7 @@
 # By:         Eric Hameleers <alien@slackware.com>
 # For:        libva
 # Descr:      Video Acceleration (VA) API library
-# URL:        http://www.splitted-desktop.com/~gbeauchesne/
+# URL:        http://www.freedesktop.org/wiki/Software/vaapi/
 # Needs:      
 # Changelog:  
 # 0.31.0-1:   22/May/2010 by Eric Hameleers <alien@slackware.com>
@@ -36,6 +36,8 @@
 #             * Update.
 # 0.32.0-1:   28/jun/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 1.2.1-1:    11/dec/2013 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh libva.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -46,13 +48,13 @@
 # Set initial variables:
 
 PRGNAM=libva
-VERSION=${VERSION:-"0.32.0"}
-EXTRAVER=${EXTRAVER:-"-1+sds2"}
+VERSION=${VERSION:-"1.2.1"}
+EXTRAVER=${EXTRAVER:-""}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
-DOCS="COPYING"
+DOCS="COPYING NEWS"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -62,20 +64,23 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}${EXTRAVER}.tar.gz"
-SRCURL="http://www.splitted-desktop.com/~gbeauchesne/${PRGNAM}/${PRGNAM}_${VERSION}${EXTRAVER}.tar.gz"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}${EXTRAVER}.tar.bz2"
+SRCURL="http://www.freedesktop.org/software/vaapi/releases/${PRGNAM}/${PRGNAM}-${VERSION}${EXTRAVER}.tar.bz2"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
 # 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
 
@@ -86,11 +91,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
@@ -113,10 +129,11 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
+  echo "Source '$(basename ${SOURCE})' not available yet..."
+  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
-    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-    echo "Source '$(basename ${SOURCE})' not available yet..."
     echo "Will download file to $(dirname $SOURCE)"
     wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
@@ -145,18 +162,10 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
-
-# Apply a wad of patches:
-for DPATCH in $(ls debian/patches/*.patch) ; do
-  cat $DPATCH |patch -p1 --verbose
-done 2>&1 | tee $OUTPUT/patch-${PRGNAM}_libva.log
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
-## Slackware uses a newer aclocal:
-autoreconf -vif
 
 LDFLAGS="$SLKLDFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -171,10 +180,11 @@ CFLAGS="$SLKCFLAGS" \
   --enable-static \
   --enable-shared \
   --enable-glx \
-  --enable-i965-driver \
+  --disable-wayland \
+  --with-drivers-path=/usr/lib${LIBDIRSUFFIX}/va/drivers \
   --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