Updated to 1.1.0

1 files changed, 47 insertions, 14 deletions

diff --git a/libvpx/build/libvpx.SlackBuild b/libvpx/build/libvpx.SlackBuild
index ba7c4908..63db5080 100755
--- a/libvpx/build/libvpx.SlackBuild
+++ b/libvpx/build/libvpx.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
@@ -32,6 +32,8 @@
 # Changelog:   
 # 0.9.6-1:     11/May/2011 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 1.1.0-1:     15/oct/2013 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh libvpx.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -42,7 +44,7 @@
 # Set initial variables:
 
 PRGNAM=libvpx
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -65,12 +67,15 @@ SRCURL="http://webm.googlecode.com/files/${PRGNAM}-v${VERSION}.tar.bz2"
 ##
 
 # 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,18 +86,46 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  *)         SLKCFLAGS="-O2"
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
+  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
+             ;;
 esac
 
-if [ "$ARCH" = "i486" -o "" = "i686" ]; then
-  ARCHOPTS="--target=x86-linux-gcc"
-elif [ "$ARCH" = "x86_64" ]; then
-  ARCHOPTS="--target=${ARCH}-linux-gcc --enable-pic"
-else
-  ARCHOPTS="--target=${ARCH}-linux-gcc"
-fi
+case "$ARCH" in
+  i?86)
+    ARCHOPTS="--target=x86-linux-gcc"
+    ;;
+  x86_64)
+    ARCHOPTS="--target=${ARCH}-linux-gcc --enable-pic"
+    ;;
+  armv7hl)
+    ARCHOPTS="--target=armv7-linux-gcc --enable-pic"
+    cat $SRCDIR/libvpx_fix-armhf-link.patch | patch -p1 --verbose
+    export AS=as
+    export AR=ar
+    export CROSS="${TARGET}-"
+    ;;
+  arm*)
+    ARCHOPTS="--target=armv5te-linux-gcc --enable-pic"
+    export AS=as
+    export AR=ar
+    export CROSS="${TARGET}-"
+    ;;
+  *)
+    ARCHOPTS="--target=${ARCH}-linux-gcc"
+    ;;
+esac
+
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
+esac
 
 # Exit the script on errors:
 set -e