[arch-commits] Commit in xorg-xwayland/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Andreas Radke]

    Date: Wednesday, March 17, 2021 @ 21:01:45
  Author: andyrtr
Revision: 410192

archrelease: copy trunk to extra-x86_64

Added:
  xorg-xwayland/repos/extra-x86_64/PKGBUILD
    (from rev 410191, xorg-xwayland/trunk/PKGBUILD)
Deleted:
  xorg-xwayland/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  118 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 54 insertions(+), 64 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-17 21:01:37 UTC (rev 410191)
+++ PKGBUILD	2021-03-17 21:01:45 UTC (rev 410192)
@@ -1,64 +0,0 @@
-# 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
-pkgrel=1
-arch=('x86_64')
-license=('custom')
-groups=('xorg')
-url="https://xorg.freedesktop.org"
-pkgdesc="run X clients under wayland"
-depends=('nettle' 'libepoxy' 'systemd-libs' 'libxfont2' 
-         'pixman' 'xorg-server-common')
-makedepends=('meson' 'git' 
-             'xorgproto' 'xtrans' 'libxkbfile' 'dbus'
-             'xorg-font-util'
-             'wayland' 'wayland-protocols'
-             'libdrm' 'mesa-libgl'
-             'systemd'
-             'egl-wayland'
-)
-source=("git+https://gitlab.freedesktop.org/xorg/xserver#commit=${_commit}")
-sha256sums=('SKIP')
-provides=('xorg-server-xwayland')
-conflicts=('xorg-server-xwayland')
-replaces=('xorg-server-xwayland')
-
-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 \
-    -D ipv6=true \
-    -D xvfb=false \
-    -D xdmcp=false \
-    -D xcsecurity=true \
-    -D dri3=true \
-    -D xwayland_eglstream=true \
-    -D glamor=true \
-    -D xkb_dir=/usr/share/X11/xkb \
-    -D xkb_output_dir=/var/lib/xkb
-
-  # Print config
-  meson configure build
-  ninja -C build
-}
-
-package() {
-
-  # bin + manpage + .pc file
-  install -m755 -Dt "${pkgdir}"/usr/bin build/hw/xwayland/Xwayland
-  install -m644 -Dt "${pkgdir}"/usr/share/man/man1 build/hw/xwayland/Xwayland.1
-  install -m644 -Dt "${pkgdir}"/usr/lib/pkgconfig build/hw/xwayland/xwayland.pc
-
-  # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-

Copied: xorg-xwayland/repos/extra-x86_64/PKGBUILD (from rev 410191, xorg-xwayland/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-17 21:01:45 UTC (rev 410192)
@@ -0,0 +1,54 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+
+pkgname=xorg-xwayland
+pkgver=21.1.0
+pkgrel=1
+arch=('x86_64')
+license=('custom')
+groups=('xorg')
+url="https://xorg.freedesktop.org"
+pkgdesc="run X clients under wayland"
+depends=('nettle' 'libepoxy' 'systemd-libs' 'libxfont2' 
+         'pixman' 'xorg-server-common')
+makedepends=('meson' 'xorgproto' 'xtrans' 'libxkbfile' 'dbus'
+             'xorg-font-util'
+             'wayland' 'wayland-protocols'
+             'libdrm' 'mesa-libgl'
+             'systemd'
+             'egl-wayland'
+)
+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>"
+
+build() {
+  arch-meson xwayland-$pkgver build \
+    -D ipv6=true \
+    -D xvfb=false \
+    -D xdmcp=false \
+    -D xcsecurity=true \
+    -D dri3=true \
+    -D xwayland_eglstream=true \
+    -D glamor=true \
+    -D xkb_dir=/usr/share/X11/xkb \
+    -D xkb_output_dir=/var/lib/xkb
+
+  # Print config
+  meson configure build
+  ninja -C build
+}
+
+package() {
+
+  # bin + manpage + .pc file
+  install -m755 -Dt "${pkgdir}"/usr/bin build/hw/xwayland/Xwayland
+  install -m644 -Dt "${pkgdir}"/usr/share/man/man1 build/hw/xwayland/Xwayland.1
+  install -m644 -Dt "${pkgdir}"/usr/lib/pkgconfig build/hw/xwayland/xwayland.pc
+
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xwayland-$pkgver/COPYING
+}