Accurate package version

2 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25c0ac3b14d6..4362f9b04ce6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xorg-xwayland-git
 	pkgdesc = Run X clients under Wayland (git version)
-	pkgver = 21.1.1.r0.gd4cc2e2db
+	pkgver = 21.1.1.r134.g8274dd664
 	pkgrel = 1
 	url = https://xorg.freedesktop.org
 	arch = x86_64
@@ -39,4 +39,3 @@ pkgbase = xorg-xwayland-git
 	sha256sums = SKIP
 
 pkgname = xorg-xwayland-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 3745f14ce58e..2f9388eb422f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=xorg-xwayland-git
-pkgver=21.1.1.r0.gd4cc2e2db
+pkgver=21.1.1.r134.g8274dd664
 pkgrel=1
 arch=('x86_64')
 license=('custom')
@@ -28,9 +28,11 @@ replaces=('xorg-server-xwayland-git')
 
 pkgver() {
   cd xserver
-  { git checkout xwayland-21.1; } > /dev/null
-  git describe --long | sed 's/^xwayland.//;s/\([^-]*-g\)/r\1/;s/-/./g'
-  { git checkout master; } > /dev/null
+  local branch=xwayland-21.1
+  local head=$(git rev-parse --short HEAD)
+  local tag=$(git describe --abbrev=0 "$branch")
+  local revisions=$(git rev-list "${tag}..HEAD" --count)
+  printf "%s.r%d.g%s" "$(echo "$tag" | sed 's/^xwayland.//')" "$revisions" "$head"
 }
 
 build() {