system/scangearmp2: Update for version 4.10.1 and bug fix.

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

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

4 files changed, 23 insertions, 25 deletions

diff --git a/system/scangearmp2/doinst.sh b/system/scangearmp2/doinst.sh
new file mode 100644
index 000000000000..29048cbbada6
--- /dev/null
+++ b/system/scangearmp2/doinst.sh
@@ -0,0 +1,5 @@
+# reload udev rules
+if [ -x /sbin/udevadm ]; then
+	/sbin/udevadm control --reload-rules 2> /dev/null
+	/sbin/udevadm trigger --action=add --subsystem-match=usb 2> /dev/null
+fi
diff --git a/system/scangearmp2/scangearmp2.SlackBuild b/system/scangearmp2/scangearmp2.SlackBuild
index 699510b239ea..7536b37e1507 100644
--- a/system/scangearmp2/scangearmp2.SlackBuild
+++ b/system/scangearmp2/scangearmp2.SlackBuild
@@ -25,13 +25,13 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=scangearmp2
-VERSION=${VERSION:-3.90.1}
+VERSION=${VERSION:-4.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=$PRGNAM-source
-SRCVERSION=3.90-1
+SRCVERSION=4.10-1
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -56,18 +56,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="32"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="32"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin64"
-  BITS="amd64"
+  BITS="64"
 else
   echo "Package for $(uname -m) architecture is not available."
   exit 1
@@ -94,21 +91,16 @@ find -L . \
 
 cd $PRGNAM
 
-./autogen.sh --prefix=/usr LDFLAGS="$LDFLAGS"
+./autogen.sh --prefix=/usr --enable-libpath=/usr/lib${LIBDIRSUFFIX} LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin${BITS}"
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
 # Follow debian/rules
-if [ "$ARCH" = "x86_64" ]; then
-   mv $PKG/usr/lib $PKG/usr/lib64
-   install -s -m 755 ../com/libs_bin64/*.so $PKG/usr/lib64/
-   install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib64/bjlib/
-elif [ "$ARCH" = "i586" ]; then
-   install -s -m 755 ../com/libs_bin32/*.so $PKG/usr/lib/
-   install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib/bjlib/
-elif [ "$ARCH" = "i686" ]; then
-   install -s -m 755 ../com/libs_bin32/*.so $PKG/usr/lib/
-   install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib/bjlib/
+install -s -m 755 ../com/libs_bin${BITS}/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/
+install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib${LIBDIRSUFFIX}/bjlib/
+
+if [ -x /sbin/ldconfig ]; then
+  /sbin/ldconfig $PKG/usr/lib${LIBDIRSUFFIX}
 fi
 
 mkdir -p $PKG/lib/udev/rules.d
@@ -122,6 +114,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/scangearmp2/scangearmp2.info b/system/scangearmp2/scangearmp2.info
index 977724b7ed9e..76004598dc34 100644
--- a/system/scangearmp2/scangearmp2.info
+++ b/system/scangearmp2/scangearmp2.info
@@ -1,8 +1,8 @@
 PRGNAM="scangearmp2"
-VERSION="3.90.1"
-HOMEPAGE="https://asia.canon/en/support/0101048701/1"
-DOWNLOAD="http://gdlp01.c-wss.com/gds/7/0100010487/01/scangearmp2-source-3.90-1.tar.gz"
-MD5SUM="6c22dd63e8ed0e8badd5f012f773497d"
+VERSION="4.10.1"
+HOMEPAGE="https://asia.canon/en/support/0101092401"
+DOWNLOAD="https://gdlp01.c-wss.com/gds/4/0100010924/01/scangearmp2-source-4.10-1.tar.gz"
+MD5SUM="1ebb6f2b3f160652db5ce50e7898049d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/scangearmp2/slack-desc b/system/scangearmp2/slack-desc
index 714f021816b0..7003cc9156f9 100644
--- a/system/scangearmp2/slack-desc
+++ b/system/scangearmp2/slack-desc
@@ -16,4 +16,4 @@ scangearmp2: Support MG7500 series, MG6600 series, MG5600 series, MG2900 series,
 scangearmp2: MB2000 series, MB2300 series, MB5000 series, MB5300 series, E460
 scangearmp2: series, MX490 series, E480 series.
 scangearmp2:
-scangearmp2: Homepage: https://asia.canon/en/support/0101048701/1
+scangearmp2: Homepage: https://asia.canon/en/support/0101092401