Update to Alien's ARM which allows XFCE to run on an ARM ChromeBook.

This large update brings Alien's ARM repository almost to the same level
of package versions in slackware-current. THese updates were needed to
make it possible to start a functional XFCE session on Samsung's ARM
ChromeBook (XE303C12).

1 files changed, 39 insertions, 39 deletions

diff --git a/source.local/l/libtiff/libtiff.SlackBuild b/source.local/l/libtiff/libtiff.SlackBuild
index a781711..a52805f 100755
--- a/source.local/l/libtiff/libtiff.SlackBuild
+++ b/source.local/l/libtiff/libtiff.SlackBuild
@@ -23,41 +23,41 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo tiff-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=libtiff
+SRCNAM=tiff
+VERSION=${VERSION:-3.9.6}
 BUILD=1
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "i486" ]; then
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
+  elif [ "$ARCH" = "s390" ]; then
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -67,14 +67,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-libtiff
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $PKG
 cd $TMP
-rm -rf tiff-$VERSION
-tar xvf $CWD/tiff-$VERSION.tar.?z* || exit 1
-cd tiff-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION
 
 zcat $CWD/libtiff-CVE-2012-1173.patch.gz | patch -p1 --verbose || exit 1
 
@@ -90,8 +90,8 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --program-prefix="" \
-  --program-suffix="" \
+  --program-prefix= \
+  --program-suffix= \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
@@ -104,10 +104,10 @@ rm -r $PKG/usr/share
 )
 strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a
 chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libtiff*.so.*
-mkdir -p $PKG/usr/doc/libtiff-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   COPYRIGHT README RELEASE-DATE TODO VERSION \
-  $PKG/usr/doc/libtiff-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
@@ -128,5 +128,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/libtiff-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz