upgpkg: libusb-git 1.0.24.r66.g1a906274-1

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff06b343aa43..da81af20f803 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libusb-git
 	pkgdesc = A cross-platform library to access USB devices
-	pkgver = 1.0.24.rc1.r0.g42ad1d1d
+	pkgver = 1.0.24.r66.g1a906274
 	pkgrel = 1
 	url = https://libusb.info/
 	arch = i686
@@ -17,4 +17,3 @@ pkgbase = libusb-git
 	sha256sums = SKIP
 
 pkgname = libusb-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 68896f4019ad..827c5b4bc32a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=libusb-git
-pkgver=1.0.24.rc1.r0.g42ad1d1d
+pkgver=1.0.24.r66.g1a906274
 pkgrel=1
 pkgdesc="A cross-platform library to access USB devices"
 arch=('i686' 'x86_64')
@@ -19,7 +19,10 @@ sha256sums=('SKIP')
 pkgver() {
   cd "libusb"
 
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  _tag=$(git tag -l --sort -v:refname | sed '/rc[0-9]*/d' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//'
 }
 
 build() {