From dfacdb619b0b4c6897c1f1a0387fa7629ddd4d4c Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 15 Oct 2013 11:09:13 +0000
Subject: Update to 1.3.2

---
 xvidcore/build/xvidcore.SlackBuild | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'xvidcore')

diff --git a/xvidcore/build/xvidcore.SlackBuild b/xvidcore/build/xvidcore.SlackBuild
index 5f7750d1..c772a6b0 100755
--- a/xvidcore/build/xvidcore.SlackBuild
+++ b/xvidcore/build/xvidcore.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -40,6 +40,8 @@
 #             * Rebuilt for Slackware 13.1.
 # 1.3.1-1:    11/may/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 1.3.2-1:    15/ocy/2013 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh xvidcore.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -50,7 +52,7 @@
 # Set initial variables:
 
 PRGNAM=xvidcore
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -73,12 +75,15 @@ SRCURL="http://downloads.xvid.org/downloads/${PRGNAM}-${VERSION}.tar.gz"
 ##
 
 # 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
 
@@ -92,12 +97,25 @@ case "$ARCH" in
              #ARCHOPTS="--disable-assembly"
              ARCHOPTS=""
              ;;
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ARCHOPTS=""
+             ;;
+  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ARCHOPTS=""
+             ;;
   *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ARCHOPTS=""
              ;;
 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
@@ -170,7 +188,7 @@ cd build/generic
     --sysconfdir=/etc \
     --program-prefix= \
     --program-suffix= \
-    --build=$ARCH-slackware-linux \
+    --build=$TARGET \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
   make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-- 
cgit v1.2.3-65-gdbad