update pkgver and add git to makedeps

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce60fa5d254b..ffd0b8a6c7a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = monado-git
 	pkgdesc = The open source OpenXR runtime.
-	pkgver = r2216.d3ccbce7
+	pkgver = 21.0.0.r69.g1b692c63
 	pkgrel = 1
 	url = https://monado.dev
 	arch = i686
@@ -10,6 +10,7 @@ pkgbase = monado-git
 	makedepends = ninja
 	makedepends = shaderc
 	makedepends = meson
+	makedepends = git
 	depends = openxr
 	depends = openhmd
 	depends = vulkan-icd-loader
diff --git a/PKGBUILD b/PKGBUILD
index e4e95f622c43..64d579a47909 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
  
 pkgname="monado-git"
 _dirname="monado"
-pkgver=r2216.d3ccbce7
+pkgver=21.0.0.r69.g1b692c63
 pkgrel=1
 pkgdesc='The open source OpenXR runtime.'
 arch=('i686' 'x86_64')
 url='https://monado.dev'
 depends=('openxr' 'openhmd' 'vulkan-icd-loader' 'libgl' 'wayland')
-makedepends=('eigen' 'ninja' 'shaderc' 'meson')
+makedepends=('eigen' 'ninja' 'shaderc' 'meson' 'git')
 optdepends=('libuvc: optical tracking support'
             'opencv: optical tracking support'
             'xr-hardware: udev permissions for popular XR hardware')
@@ -25,7 +25,7 @@ md5sums=('SKIP')
 
 pkgver() {
   cd "$_dirname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 prepare() {