[arch-commits] Commit in xorg-xwayland/trunk (PKGBUILD)

[Andreas Radke]

    Date: Wednesday, March 17, 2021 @ 21:01:37
  Author: andyrtr
Revision: 410191

upgpkg: xorg-xwayland 21.1.0-1: upstream update 21.1.0

Modified:
  xorg-xwayland/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-17 20:37:48 UTC (rev 410190)
+++ PKGBUILD	2021-03-17 21:01:37 UTC (rev 410191)
@@ -1,11 +1,7 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
 pkgname=xorg-xwayland
-
-# https://gitlab.freedesktop.org/xorg/xserver/-/commits/xwayland-21.1
-_commit=f20dc97947d368d0750ea190f4b4df88d005166a # xwayland 21.1 branch = 21.1.0 RC2
-
-pkgver=21.0.99.902
+pkgver=21.1.0
 pkgrel=1
 arch=('x86_64')
 license=('custom')
@@ -14,8 +10,7 @@
 pkgdesc="run X clients under wayland"
 depends=('nettle' 'libepoxy' 'systemd-libs' 'libxfont2' 
          'pixman' 'xorg-server-common')
-makedepends=('meson' 'git' 
-             'xorgproto' 'xtrans' 'libxkbfile' 'dbus'
+makedepends=('meson' 'xorgproto' 'xtrans' 'libxkbfile' 'dbus'
              'xorg-font-util'
              'wayland' 'wayland-protocols'
              'libdrm' 'mesa-libgl'
@@ -22,20 +17,16 @@
              'systemd'
              'egl-wayland'
 )
-source=("git+https://gitlab.freedesktop.org/xorg/xserver#commit=${_commit}")
-sha256sums=('SKIP')
+source=(https://xorg.freedesktop.org/archive/individual/xserver/xwayland-$pkgver.tar.xz{,.sig})
+sha512sums=('5258bc97315856eee71c8daf6879356f38931ec307cf489818e6125aaa528725fdeb6b712decbcd17ce11a11c048575843dd709d7b5b76787bda4da32cceb35c'
+            'SKIP')
 provides=('xorg-server-xwayland')
 conflicts=('xorg-server-xwayland')
 replaces=('xorg-server-xwayland')
+validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # "Michel Daenzer <michel at daenzer.net>"
 
-pkgver() {
-  cd xserver
-#  git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
-  git describe --tags | sed 's/^xwayland.//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
 build() {
-  arch-meson xserver build \
+  arch-meson xwayland-$pkgver build \
     -D ipv6=true \
     -D xvfb=false \
     -D xdmcp=false \
@@ -59,6 +50,5 @@
   install -m644 -Dt "${pkgdir}"/usr/lib/pkgconfig build/hw/xwayland/xwayland.pc
 
   # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xwayland-$pkgver/COPYING
 }
-