iscan: update to 2.30.4

1 files changed, 35 insertions, 32 deletions

diff --git a/iscan/build/iscan.SlackBuild b/iscan/build/iscan.SlackBuild
index a8340404..ea0bbef6 100755
--- a/iscan/build/iscan.SlackBuild
+++ b/iscan/build/iscan.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2015  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,6 +33,8 @@
 # Changelog:   
 # 2.30.1-1:    29/Jun/2015 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 2.30.4-1:    16/sep/2019 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh iscan.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -41,9 +43,10 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=iscan
-VERSION=${VERSION:-2.30.1}
+VERSION=${VERSION:-2.30.4}
+MINVER=${MINVER:-2}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
 DOCS="COPYING INSTALL NEWS README non-free/AVASYSPL.en.txt"
@@ -65,40 +68,33 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL="https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${PRGNAM}_${VERSION}-1.tar.gz"
+SRCURL="http://support.epson.net/linux/src/scanner/${PRGNAM}/${PRGNAM}_${VERSION}-${MINVER}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
-# You can use your own private machine.conf file to overrule machine defaults:
-if [ -e $SRCDIR/machine.conf ]; then
-  . $SRCDIR/machine.conf
-elif [ -e /etc/slackbuild/machine.conf ]; then
-  . /etc/slackbuild/machine.conf
-else
-  # Automatically determine the architecture we're building on:
-  MARCH=$( uname -m )
-  if [ -z "$ARCH" ]; then
-    case "$MARCH" in
-      i?86)    export ARCH=i486 ;;
-      # Unless $ARCH is already set, use uname -m for all other archs:
-      *)       export ARCH=$MARCH ;;
-    esac
-  fi
-  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
-  case "$ARCH" in
-    i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-               SLKLDFLAGS=""; LIBDIRSUFFIX=""
-               ;;
-    x86_64)    SLKCFLAGS="-O2 -fPIC"
-               SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
-               ;;
-    *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
-               SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
-               ;;
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i586 ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
   esac
 fi
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+case "$ARCH" in
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
+             ;;
+esac
 
 TARGET=$ARCH-slackware-linux
 
@@ -158,9 +154,16 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 
-# Apply ArchLinux patch which allows linking against libpng15 and newer:
+# Apply ArchLinux patches:
+touch $OUTPUT/patch-${PRGNAM}.log
+# Allow linking against libpng15 and newer:
 cat $SRCDIR/patches/iscan_png15.patch | patch -p0 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Patch for ambiguous div in jpegstream.cc:
+cat $SRCDIR/patches/jpegstream.cc.patch | patch -p0 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Add fix for CXX ABI different than 1002:
+ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .