Fix pkgver()

2 files changed, 6 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efa2950b90be..1ea38e1626ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mitsuba2-git
 	pkgdesc = A Retargetable Forward and Inverse Renderer
-	pkgver = r2078.76445e90
-	pkgrel = 3
+	pkgver = 2.2.1.r25.g76445e90
+	pkgrel = 1
 	url = https://www.mitsuba-renderer.org/
 	arch = x86_64
 	license = custom
diff --git a/PKGBUILD b/PKGBUILD
index bdc3ab55dcce..90c0fdf633c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Alex Hirzel <alex at hirzel period us>
+
 pkgname=mitsuba2-git
-pkgver=r2078.76445e90
-pkgrel=3
+pkgver=2.2.1.r25.g76445e90
+pkgrel=1
 pkgdesc="A Retargetable Forward and Inverse Renderer"
 arch=('x86_64')
 url="https://www.mitsuba-renderer.org/"
@@ -33,8 +34,7 @@ md5sums=('e40fe4bf313d60b1eb7c3da60fb6d434'
          'SKIP')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	git -C "$srcdir/${pkgname%-git}" describe --long --tags --always | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
 build() {