2 files changed, 27 insertions, 16 deletions
diff --git a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild
index 041e8854..544edbf7 100755
--- a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild
+++ b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2015, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2015, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libjpeg-turbo
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,6 +37,14 @@ if [ -z "$ARCH" ]; then
   export ARCH
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i386" ]; then
@@ -64,7 +73,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -73,7 +81,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -92,12 +100,15 @@ CFLAGS="$SLKCFLAGS" \
   --includedir=/usr/include \
   --mandir=/usr/man \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG docdir=/usr/doc/$PKGNAM-$VERSION || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Strip binaries:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/l/libjpeg-turbo/slack-desc b/source/l/libjpeg-turbo/slack-desc
index fa2cfc02..439925ca 100644
--- a/source/l/libjpeg-turbo/slack-desc
+++ b/source/l/libjpeg-turbo/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
 libjpeg-turbo: libjpeg-turbo (high-speed version of libjpeg)
 libjpeg-turbo:
-libjpeg-turbo: libjpeg-turbo is a high-speed version of libjpeg for x86 and
-libjpeg-turbo: x86-64 processors which uses SIMD instructions (MMX, SSE2, etc.)
-libjpeg-turbo: to accelerate baseline JPEG compression and decompression.
-libjpeg-turbo: libjpeg-turbo is generally 2-4x as fast as the unmodified
-libjpeg-turbo: version of libjpeg, all else being equal.
+libjpeg-turbo: libjpeg-turbo is a high-speed version of libjpeg for x86 and x86-64
+libjpeg-turbo: processors which uses SIMD instructions to accelerate baseline JPEG
+libjpeg-turbo: compression and decompression. libjpeg-turbo is generally 2-4x as
+libjpeg-turbo: fast as the unmodified version of libjpeg, all else being equal.
+libjpeg-turbo:
+libjpeg-turbo: Homepage: https://libjpeg-turbo.org
 libjpeg-turbo:
 libjpeg-turbo:
-libjpeg-turbo: libjpeg-turbo home: http://libjpeg-turbo.virtualgl.org
 libjpeg-turbo: