diff options
author | Paul van der Linden | 2022-03-26 08:47:07 +0100 |
---|---|---|
committer | Paul van der Linden | 2022-03-26 08:47:07 +0100 |
commit | 7093a8e833bad89068b5d2e79c24453f563ee0a7 (patch) | |
tree | 890fd73e2a47a186be431f3561efaa4a5f557f85 | |
parent | cc4d84a9f5d1e1038e68379be0b4d4c228e5e9e6 (diff) | |
download | aur-7093a8e833bad89068b5d2e79c24453f563ee0a7.tar.gz |
update to 4.30 & fix libusb issue
-rw-r--r-- | PKGBUILD | 26 | ||||
-rw-r--r-- | libusb.patch | 11 |
2 files changed, 20 insertions, 17 deletions
@@ -2,7 +2,7 @@ # Contributor: Andrew Titmuss <andrew@coffeetocode.me> pkgname=scangearmp2 -pkgver=4.10 +pkgver=4.30 pkgrel=1 pkgdesc="Canon ScanGear MP v2 scanner driver." arch=('i686' 'x86_64') @@ -12,14 +12,16 @@ depends=('gtk2' 'libusb') provides=('scangearmp2') -source=("http://gdlp01.c-wss.com/gds/4/0100010924/01/scangearmp2-source-4.10-1.tar.gz" \ - scangearmp2.desktop) -sha256sums=('3d208c5bf8bd04b9285f8857ed3272a3371de63df54c31a82cc04158a1b841a4' - 'd9b449d6c78c92f296acef85209b30c7d80b8bac692f135d071730ef0051d64b') +source=("https://gdlp01.c-wss.com/gds/2/0100011322/01/scangearmp2-source-4.30-1.tar.gz" \ + scangearmp2.desktop libusb.patch) +sha256sums=('ae337238379541d8f99f09bf24e82d291b8141e5a7758d46c0002a9becb828b8' + 'd9b449d6c78c92f296acef85209b30c7d80b8bac692f135d071730ef0051d64b' + 'ea64d40b4537a79a400a217a90b8fcdf9589e93df9710bb6a353bce54149879e') [[ "$CARCH" == "x86_64" ]] && _arch="64" || _arch="32" prepare() { + patch -p1 < ../libusb.patch cd "$pkgname-source-$pkgver-$pkgrel" } @@ -52,17 +54,7 @@ package() { install -m644 "com/ini/canon_mfp2_net.ini" "$pkgdir/usr/lib/bjlib" - install -sm755 "com/libs_bin$_arch/libcncpmslld2.so.3.0.0" "$pkgdir/usr/lib" - ln -s "/usr/lib/libcncpmslld2.so.3.0.0" "$pkgdir/usr/lib/libcncpmslld2.so" - - install -sm755 "com/libs_bin$_arch/libcncpnet2.so.1.2.4" "$pkgdir/usr/lib" - ln -s "/usr/lib/libcncpnet2.so.1.2.4" "$pkgdir/usr/lib/libcncpnet2.so" - - install -sm755 "com/libs_bin$_arch/libcncpnet20.so.1.0.0" "$pkgdir/usr/lib" - ln -s "/usr/lib/libcncpnet20.so.1.0.0" "$pkgdir/usr/lib/libcncpnet20.so" - - install -sm755 "com/libs_bin$_arch/libcncpnet30.so.1.0.0" "$pkgdir/usr/lib" - ln -s "/usr/lib/libcncpnet30.so.1.0.0" "$pkgdir/usr/lib/libcncpnet30.so" + install -sm755 com/libs_bin$_arch/*.so.* "$pkgdir/usr/lib" mkdir -p "$pkgdir/usr/share/licenses/$pkgname" @@ -72,7 +64,7 @@ package() { install -m644 "doc/LICENSE-scangearmp-${pkgver}SC.txt" "$pkgdir/usr/share/licenses/$pkgname" mkdir -p "$pkgdir/etc/udev/rules.d" - install -m644 "scangearmp2/etc/80-canon_mfp2.rules" "$pkgdir/etc/udev/rules.d" + install -m644 scangearmp2/etc/*.rules "$pkgdir/etc/udev/rules.d" pushd "scangearmp2" make DESTDIR="$pkgdir/" install diff --git a/libusb.patch b/libusb.patch new file mode 100644 index 000000000000..7f68e04050e8 --- /dev/null +++ b/libusb.patch @@ -0,0 +1,11 @@ +--- src/scangearmp2-source-4.30-1/scangearmp2/src/canon_mfp_tools.c 2022-03-06 11:32:22.511185016 +0100 ++++ patched-src/scangearmp2-source-4.30-1/scangearmp2/src/canon_mfp_tools.c 2022-03-06 11:31:53.910909156 +0100 +@@ -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; |