summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/usbutils/APKBUILD14
-rw-r--r--user/usbutils/hwdata.patch28
2 files changed, 20 insertions, 22 deletions
diff --git a/user/usbutils/APKBUILD b/user/usbutils/APKBUILD
index f174c0265..69a6b1618 100644
--- a/user/usbutils/APKBUILD
+++ b/user/usbutils/APKBUILD
@@ -1,20 +1,20 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=usbutils
-pkgver=010
-pkgrel=1
+pkgver=012
+pkgrel=0
pkgdesc="USB utilities"
url="http://linux-usb.sourceforge.net/"
arch="all"
license="GPL-2.0+ AND GPL-2.0-only"
subpackages="$pkgname-doc"
depends="hwids-udev"
-makedepends="eudev-dev libusb-dev"
+makedepends="autoconf automake eudev-dev libusb-dev"
source="https://mirrors.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz
hwdata.patch
"
build() {
- cd "$builddir"
+ ./autogen.sh
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,14 +24,12 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3 usbutils-010.tar.xz
-8e2839ec483797f6f97c0258f8fda0b3a56858787a69fe04ce7c0e8a98fd0f4d6640c68df9294d0e9bc36c57f7c6a44d74882176477ea3ffe44716d5bbb35a82 hwdata.patch"
+sha512sums="e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66 usbutils-012.tar.xz
+73cd69a7d80e2d48f303d11cadc7c68f64857ff3f8fc0625b179c0fa320553a4691050e24790bcd98cbb8b7b3733f875b45a6d1ae47aae2eeeefe0ca5e7c7c7e hwdata.patch"
diff --git a/user/usbutils/hwdata.patch b/user/usbutils/hwdata.patch
index f7c081fd8..fdeb9d17d 100644
--- a/user/usbutils/hwdata.patch
+++ b/user/usbutils/hwdata.patch
@@ -1,20 +1,20 @@
---- a/lsusb.py.in
-+++ b/lsusb.py.in
-@@ -96,7 +96,7 @@
- return True
+--- usbutils-012/lsusb.py.in.old 2019-05-07 14:35:51.000000000 +0000
++++ usbutils-012/lsusb.py.in 2019-06-20 05:12:17.940002816 +0000
+@@ -67,7 +67,7 @@
+ return type('MyEnum', (), enums)
def parse_usb_ids():
- "Parse /usr/share/usb.ids and fill usbvendors, usbproducts, usbclasses"
+ "Parse /usr/share/hwdata/usb.ids and fill usbvendors, usbproducts, usbclasses"
- id = 0
- sid = 0
- mode = 0
-@@ -520,7 +520,7 @@
- print(" -c use colors")
- print(" -e display endpoint info")
- print(" -w display warning if usb.ids is not sorted correctly")
-- print(" -f FILE override filename for /usr/share/usb.ids")
-+ print(" -f FILE override filename for /usr/share/hwdata/usb.ids")
+ vid = 0
+ did = 0
+ modes = myenum('Vendor', 'Class', 'Misc')
+@@ -463,7 +463,7 @@
+ print(" -C, --no-color disable colors")
+ print(" -e, --endpoints display endpoint info")
+ print(" -f FILE, --usbids-path FILE")
+- print(" override filename for /usr/share/usb.ids")
++ print(" override filename for /usr/share/hwdata/usb.ids")
+ print()
print("Use lsusb.py -ciu to get a nice overview of your USB devices.")
- return 2