diff options
Diffstat (limited to 'system/scangearmp2')
| -rw-r--r-- | system/scangearmp2/libusb.patch | 11 | ||||
| -rw-r--r-- | system/scangearmp2/scangearmp2.SlackBuild | 26 | ||||
| -rw-r--r-- | system/scangearmp2/scangearmp2.desktop | 11 | ||||
| -rw-r--r-- | system/scangearmp2/scangearmp2.info | 8 | ||||
| -rw-r--r-- | system/scangearmp2/slack-desc | 2 |
5 files changed, 46 insertions, 12 deletions
diff --git a/system/scangearmp2/libusb.patch b/system/scangearmp2/libusb.patch new file mode 100644 index 0000000000..cc40f1ab01 --- /dev/null +++ b/system/scangearmp2/libusb.patch @@ -0,0 +1,11 @@ +--- scangearmp2.orig/src/canon_mfp_tools.c 2023-03-08 14:07:54.261226941 +1300 ++++ scangearmp2/src/canon_mfp_tools.c 2023-03-08 14:09:44.926237600 +1300 +@@ -394,7 +394,7 @@ + goto onErr; + } + /* search canon mfp */ +- numdev = libusb_get_device_list(NULL, &g_devlist); ++ numdev = libusb_get_device_list(g_context, &g_devlist); + if((int)numdev == 0) { + err = CN_USB_WRITE_ERROR; + goto onErr; diff --git a/system/scangearmp2/scangearmp2.SlackBuild b/system/scangearmp2/scangearmp2.SlackBuild index c0b3ec9272..41eaabf872 100644 --- a/system/scangearmp2/scangearmp2.SlackBuild +++ b/system/scangearmp2/scangearmp2.SlackBuild @@ -25,13 +25,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=scangearmp2 -VERSION=${VERSION:-4.30.1} +VERSION=${VERSION:-4.50.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=$PRGNAM-source -SRCVERSION=4.30-1 +SRCVERSION=4.50-1 if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -56,15 +56,19 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" - BITS="32" + BITS="i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" - BITS="32" + BITS="i686" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - BITS="64" + BITS="x86_64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + BITS="aarch64" else echo "Package for $(uname -m) architecture is not available." exit 1 @@ -91,12 +95,14 @@ find -L . \ cd $PRGNAM -./autogen.sh --prefix=/usr --enable-libpath=/usr/lib${LIBDIRSUFFIX} LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin${BITS}" +patch -p1 < $CWD/libusb.patch + +./autogen.sh --prefix=/usr --enable-libpath=/usr/lib${LIBDIRSUFFIX} LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin_${BITS}" make make install DESTDIR=$PKG # Follow debian/rules -install -s -m 755 ../com/libs_bin${BITS}/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/ +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 @@ -106,6 +112,12 @@ fi mkdir -p $PKG/lib/udev/rules.d install -m 644 etc/80-canon_mfp2.rules $PKG/lib/udev/rules.d +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/share/applications +cat $CWD/scangearmp2.desktop > $PKG/usr/share/applications/scangearmp2.desktop + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README ../doc/* \ diff --git a/system/scangearmp2/scangearmp2.desktop b/system/scangearmp2/scangearmp2.desktop new file mode 100644 index 0000000000..80154dfb7e --- /dev/null +++ b/system/scangearmp2/scangearmp2.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=3.90 +Encoding=UTF-8 +Name=ScanGearMP +Type=Application +Exec=scangearmp2 +Terminal=false +Icon=scanner.png +Comment=Canon Scanner +NoDisplay=false +Categories=Graphics;
\ No newline at end of file diff --git a/system/scangearmp2/scangearmp2.info b/system/scangearmp2/scangearmp2.info index c400daf1d5..afddb6530e 100644 --- a/system/scangearmp2/scangearmp2.info +++ b/system/scangearmp2/scangearmp2.info @@ -1,8 +1,8 @@ PRGNAM="scangearmp2" -VERSION="4.30.1" -HOMEPAGE="https://asia.canon/en/support/0101132201" -DOWNLOAD="https://gdlp01.c-wss.com/gds/2/0100011322/01/scangearmp2-source-4.30-1.tar.gz" -MD5SUM="fd9c172dbe87a749a6051c7a3833849a" +VERSION="4.50.1" +HOMEPAGE="https://asia.canon/en/support/0101164201" +DOWNLOAD="https://gdlp01.c-wss.com/gds/2/0100011642/01/scangearmp2-source-4.50-1.tar.gz" +MD5SUM="4bee2cb72e0a18e136248603394a017e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/scangearmp2/slack-desc b/system/scangearmp2/slack-desc index 26ef57f3c9..2750b8a83e 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/0101132201 +scangearmp2: Homepage: https://asia.canon/en/support/0101164201 |