Change version scheme

2 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 537cba493a64..0a0d46f9b1ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libdri2-git
 	pkgdesc = Library for the DRI2 extension to the X Window System
-	pkgver = 11.4f1eef3
-	pkgrel = 2
+	pkgver = r11.4f1eef3
+	pkgrel = 1
 	url = https://github.com/robclark/libdri2
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 9bb04681e04b..f83e52cb9f97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=libdri2-git
 _gitname=libdri2
-pkgver=11.4f1eef3
-pkgrel=2
+pkgver=r11.4f1eef3
+pkgrel=1
 pkgdesc="Library for the DRI2 extension to the X Window System"
 arch=('any')
 url="https://github.com/robclark/libdri2"
@@ -18,7 +18,11 @@ md5sums=('SKIP')
 
 pkgver() {
   cd "${SRCDEST}/${_gitname}"
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+  (
+   set -o pipefail
+   git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 build() {