upgpkg: xorg-server-git 21.1.99.1.r173.g7d2014e7d-1

3 files changed, 14 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 418af48093fd..b478d06053d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = xorg-server-git
-	pkgver = 21.0.99.1.r168.g34b870da8
+	pkgver = 21.1.99.1.r173.g7d2014e7d
 	pkgrel = 1
 	url = https://xorg.freedesktop.org
 	arch = x86_64
@@ -36,11 +36,12 @@ pkgbase = xorg-server-git
 	makedepends = systemd
 	makedepends = meson
 	makedepends = git
+	options = debug
 	source = git+https://gitlab.freedesktop.org/xorg/xserver.git
 	source = xvfb-run
 	source = xvfb-run.1
 	sha512sums = SKIP
-	sha512sums = 4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514
+	sha512sums = 87c79b4a928e74463f96f58d277558783eac9b8ea6ba00d6bbbb67ad84c4d65b3792d960ea2a70089ae18162e82ae572a49ad36df169c974cc99dbaa51f63eb2
 	sha512sums = de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22
 
 pkgname = xorg-server-git
@@ -59,10 +60,11 @@ pkgname = xorg-server-git
 	depends = libdrm
 	depends = libxshmfence
 	depends = libxcvt
-	provides = X-ABI-VIDEODRV_VERSION=25.2
+	provides = X-ABI-VIDEODRV_VERSION=25.3
 	provides = X-ABI-XINPUT_VERSION=24.4
 	provides = X-ABI-EXTENSION_VERSION=10.0
 	provides = x-server
+	provides = xorg-server
 	conflicts = xorg-server
 	conflicts = nvidia-utils<=331.20
 	conflicts = glamor-egl
diff --git a/PKGBUILD b/PKGBUILD
index 8adba231761b..2cee14e41379 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,29 +13,31 @@ pkgname=(
   'xorg-server-xvfb-git'
 )
 _pkgbase='xserver'
-pkgver=21.0.99.1.r168.g34b870da8
+pkgver=21.1.99.1.r173.g7d2014e7d
 pkgrel=1
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
 url="https://xorg.freedesktop.org"
+options=('debug')
 makedepends=('xorgproto-git' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
              'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv' 'libxcvt'
              'libxmu' 'libxrender' 'libxi' 'libxaw' 'libxtst' 'libxres'
              'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
              'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms'
              'libxshmfence' 'libunwind' 'systemd' 'meson' 'git')
-source=(git+https://gitlab.freedesktop.org/xorg/xserver.git
+_srcurl=git+https://gitlab.freedesktop.org/xorg/xserver.git
+source=($_srcurl
         xvfb-run # with updates from FC master
         xvfb-run.1)
 sha512sums=('SKIP'
-            '4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514'
+            '87c79b4a928e74463f96f58d277558783eac9b8ea6ba00d6bbbb67ad84c4d65b3792d960ea2a70089ae18162e82ae572a49ad36df169c974cc99dbaa51f63eb2'
             'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
-  
+
 pkgver() {
   cd "${_pkgbase}"
   # cutting off 'xorg.server.' prefix that presents in the git tag
-  git describe --long --tags| sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed "s/$(git describe --long --tags | cut -d- -f3)/$(grep -m 1 version meson.build | awk '{print $2}' | sed "s/'//g;s/,//g")/g" | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
@@ -104,7 +106,7 @@ package_xorg-server-git() {
   _pkgname='xorg-server'
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-  provides=('X-ABI-VIDEODRV_VERSION=25.2' 'X-ABI-XINPUT_VERSION=24.4' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
+  provides=('X-ABI-VIDEODRV_VERSION=25.3' 'X-ABI-XINPUT_VERSION=24.4' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server')
   conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server-git.install
diff --git a/xvfb-run b/xvfb-run
index 8e046f2aabf3..6bc62d094993 100644
--- a/xvfb-run
+++ b/xvfb-run
@@ -101,7 +101,7 @@ find_free_servernum() {
 
 # Parse the command line.
 ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
+       --long auto-servernum,auto-display,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
        --name "$PROGNAME" -- "$@")
 GETOPT_STATUS=$?