From ef770e3361acffe3fc386b32daf14a919b0fd6b0 Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Mon, 4 Nov 2024 09:04:10 +0100
Subject: [PATCH] * update usbutils to 018-1

---
 usbutils/.SRCINFO        | 15 +++++++++------
 usbutils/.nvchecker.toml |  4 ++++
 usbutils/PKGBUILD        | 32 ++++++++++++++------------------
 3 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 usbutils/.nvchecker.toml

diff --git a/usbutils/.SRCINFO b/usbutils/.SRCINFO
index 9f76d6d9f5..e1704ca9c7 100644
--- a/usbutils/.SRCINFO
+++ b/usbutils/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = usbutils
 	pkgdesc = A collection of USB tools to query connected USB devices
-	pkgver = 017
-	pkgrel = 1.1
+	pkgver = 018
+	pkgrel = 1
 	url = https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
 	arch = x86_64
 	arch = powerpc64le
@@ -11,19 +11,22 @@ pkgbase = usbutils
 	license = GPL-2.0-only
 	license = GPL-2.0-or-later
 	license = GPL-3.0-only
+	license = LGPL-2.1-or-later
+	license = MIT
 	makedepends = libusb
+	makedepends = meson
 	makedepends = systemd
 	depends = glibc
 	depends = hwdata
 	optdepends = coreutils: for lsusb.py usage
 	optdepends = python: for lsusb.py usage
 	optdepends = sh: for usb-devices
-	source = https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-017.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-017.tar.sign
+	source = https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-018.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-018.tar.sign
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha512sums = eaebbc82eee4d940898f7a8de95ca49846c7c964e65c3d866b38735f8f3c8ccfed2b3a536bf2ef39a835a40a34c2273ac4d82b1012d0c693d4863cff14870d95
+	sha512sums = 4f76c7a328746e17892c31d69cbd9a560c4384877e18d80076cef344a25b71b33387d803c98a9c6867b357a61e1a8a1a630884afe32128c3b6393dc186f216c8
 	sha512sums = SKIP
-	b2sums = 868c646ed6d38a38b9bd3ab85ba3a5e9362a97e476aeed6576c1b175caaf4ee688cb2c33756f02c9bf0aef9e7d58657331fc1c3b3314d86145b3d4f37124537e
+	b2sums = 030f45afd5867ee38c8284a0741d1de63653a98746bfef42281390c5bdefbbb99c318d708e88ea2e28810d519d735da3103fe438befa889fc9b5ae9e21200992
 	b2sums = SKIP
 
 pkgname = usbutils
diff --git a/usbutils/.nvchecker.toml b/usbutils/.nvchecker.toml
new file mode 100644
index 0000000000..267002673f
--- /dev/null
+++ b/usbutils/.nvchecker.toml
@@ -0,0 +1,4 @@
+[usbutils]
+source = "git"
+git = "https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git"
+prefix = "v"
diff --git a/usbutils/PKGBUILD b/usbutils/PKGBUILD
index eed3ccb023..b5c4e7a39a 100644
--- a/usbutils/PKGBUILD
+++ b/usbutils/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
 
 pkgname=usbutils
-pkgver=017
-pkgrel=1.1
+pkgver=018
+pkgrel=1
 pkgdesc="A collection of USB tools to query connected USB devices"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
@@ -15,6 +15,8 @@ license=(
   GPL-2.0-only
   GPL-2.0-or-later
   GPL-3.0-only
+  LGPL-2.1-or-later
+  MIT
 )
 depends=(
   glibc
@@ -22,6 +24,7 @@ depends=(
 )
 makedepends=(
   libusb
+  meson
   systemd
 )
 optdepends=(
@@ -30,23 +33,15 @@ optdepends=(
   'sh: for usb-devices'
 )
 source=(https://www.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar{.xz,.sign})
-sha512sums=('eaebbc82eee4d940898f7a8de95ca49846c7c964e65c3d866b38735f8f3c8ccfed2b3a536bf2ef39a835a40a34c2273ac4d82b1012d0c693d4863cff14870d95'
+sha512sums=('4f76c7a328746e17892c31d69cbd9a560c4384877e18d80076cef344a25b71b33387d803c98a9c6867b357a61e1a8a1a630884afe32128c3b6393dc186f216c8'
             'SKIP')
-b2sums=('868c646ed6d38a38b9bd3ab85ba3a5e9362a97e476aeed6576c1b175caaf4ee688cb2c33756f02c9bf0aef9e7d58657331fc1c3b3314d86145b3d4f37124537e'
+b2sums=('030f45afd5867ee38c8284a0741d1de63653a98746bfef42281390c5bdefbbb99c318d708e88ea2e28810d519d735da3103fe438befa889fc9b5ae9e21200992'
         'SKIP')
 validpgpkeys=('647F28654894E3BD457199BE38DBBDC86092693E')  # Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
-prepare() {
-  cd $pkgname-$pkgver
-  autoreconf -fiv
-}
-
 build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --datadir=/usr/share/hwdata
-  make
+  arch-meson $pkgname-$pkgver build
+  meson compile -C build
 }
 
 package() {
@@ -55,8 +50,9 @@ package() {
     systemd-libs libudev.so
   )
 
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -vDm 755 usbreset -t "$pkgdir/usr/bin"
-  install -vDm 644 NEWS -t "$pkgdir/usr/share/doc/$pkgname/"
+  meson install -C build --destdir "$pkgdir"
+
+  install -vDm 755 build/usbreset -t "$pkgdir/usr/bin"
+  install -vDm 644 $pkgname-$pkgver/{NEWS,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
+  install -vDm 644 $pkgname-$pkgver/LICENSES/*.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
 }