system/cnijfilter2: Updated for version 6.20.1.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 28 insertions, 33 deletions

diff --git a/system/cnijfilter2/cnijfilter2.SlackBuild b/system/cnijfilter2/cnijfilter2.SlackBuild
index 3f573cc37d..6b29cf1e8c 100644
--- a/system/cnijfilter2/cnijfilter2.SlackBuild
+++ b/system/cnijfilter2/cnijfilter2.SlackBuild
@@ -25,19 +25,31 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cnijfilter2
-VERSION=${VERSION:-6.10.1}
+VERSION=${VERSION:-6.20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=$PRGNAM-source
-SRCVERSION=6.10-1
+SRCVERSION=6.20-1
 
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
+  case "$MARCH" in
+    i?86) export ARCH=i586 
+          export SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+          export LIBDIRSUFFIX=""
+          BITS="i686";;
+    x86_64) export ARCH=x86_64
+            export SLKCFLAGS="-O2 -fPIC"
+            export LIBDIRSUFFIX="64"
+            BITS="x86_64" ;;
+    aarch64) export ARCH=aarch64
+             export SLKCFLAGS="-O2 -fPIC"
+             export LIBDIRSUFFIX="64"
+             BITS="aarch64" ;;
+    *) echo "Package for $MARCH architecture is not available."
+       exit 1 ;;
   esac
 fi
 
@@ -53,23 +65,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BITS="32"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BITS="32"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
 set -e
 
 rm -rf $PKG
@@ -93,7 +88,7 @@ patch -p1 < $CWD/gcc10.patch
 
 for dir in cmdtocanonij2 cmdtocanonij3 ; do
   pushd $dir
-  ./autogen.sh --prefix=/usr --datadir=/usr/share LDFLAGS="-L../../com/libs_bin${BITS}"
+  ./autogen.sh --prefix=/usr --datadir=/usr/share LDFLAGS="-L../../com/libs_bin_${BITS}"
   make
   popd
 done
@@ -105,7 +100,7 @@ popd
 
 pushd lgmon3
   ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib${LIBDIRSUFFIX}/bjlib2 --enable-progpath=/usr/bin \
-    --datadir=/usr/share LDFLAGS="-L../../com/libs_bin${BITS}"
+    --datadir=/usr/share LDFLAGS="-L../../com/libs_bin_${BITS}"
   make
 popd
 
@@ -133,7 +128,7 @@ if [ "$ARCH" = "x86_64" ]; then
 fi
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/bjlib2
 install -c -o lp -g lp -m 644 com/ini/cnnet.ini $PKG/usr/lib${LIBDIRSUFFIX}/bjlib2/
-install -c -m 755 com/libs_bin${BITS}/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/
+install -c -m 755 com/libs_bin_${BITS}/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/
 
 # Run ldconfig in the build script so that /usr/lib{64}/libcn*.so
 # are tracked by doinst.sh
diff --git a/system/cnijfilter2/cnijfilter2.info b/system/cnijfilter2/cnijfilter2.info
index 15dabc9821..0802bda213 100644
--- a/system/cnijfilter2/cnijfilter2.info
+++ b/system/cnijfilter2/cnijfilter2.info
@@ -1,8 +1,8 @@
 PRGNAM="cnijfilter2"
-VERSION="6.10.1"
-HOMEPAGE="https://asia.canon/en/support/0101092101"
-DOWNLOAD="https://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz"
-MD5SUM="207715a8b1fd0f727670a87ac46ce46d"
+VERSION="6.20.1"
+HOMEPAGE="https://asia.canon/en/support/0101105701"
+DOWNLOAD="https://gdlp01.c-wss.com/gds/7/0100011057/01/cnijfilter2-source-6.20-1.tar.gz"
+MD5SUM="b191a33b924d5a9afe8027b9688cb62a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cnijfilter2/gcc10.patch b/system/cnijfilter2/gcc10.patch
index 0616f6a870..449a9777f1 100644
--- a/system/cnijfilter2/gcc10.patch
+++ b/system/cnijfilter2/gcc10.patch
@@ -1,5 +1,5 @@
---- cnijfilter2-source-6.10-1.orig/lgmon3/src/cnijlgmon3.c	2020-06-18 14:22:58.000000000 +1200
-+++ cnijfilter2-source-6.10-1/lgmon3/src/cnijlgmon3.c	2021-09-06 10:42:18.796063817 +1200
+--- cnijfilter2-source-6.20-1.orig/lgmon3/src/cnijlgmon3.c	2021-02-20 22:08:56.000000000 +1300
++++ cnijfilter2-source-6.20-1/lgmon3/src/cnijlgmon3.c	2021-11-05 23:35:18.626436603 +1300
 @@ -55,7 +55,7 @@
  int (*GET_STATUS)(char *, int, int *, int * , char *);
  int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *);
diff --git a/system/cnijfilter2/slack-desc b/system/cnijfilter2/slack-desc
index 7b191845ca..46fa593ab4 100644
--- a/system/cnijfilter2/slack-desc
+++ b/system/cnijfilter2/slack-desc
@@ -16,4 +16,4 @@ cnijfilter2: series, MG2900 series, MB2000 series, MB2300, iB4000 series,
 cnijfilter2: MB5000 series, MB5300 series, iP110 series, E450 series, MX490
 cnijfilter2: series, E480 series.
 cnijfilter2:
-cnijfilter2: Homepage: https://asia.canon/en/support/0101092101
+cnijfilter2: Homepage: https://asia.canon/en/support/0101105701