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

[Andreas Radke]

    Date: Thursday, December 10, 2020 @ 12:08:35
  Author: andyrtr
Revision: 403235

upgpkg: xorg-server 1.20.10-2: drop xorg-server-xwayland from stable tree package; we build now xorg-xwayland standalone from git master - FS#68916

Modified:
  xorg-server/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-10 12:08:19 UTC (rev 403234)
+++ PKGBUILD	2020-12-10 12:08:35 UTC (rev 403235)
@@ -3,12 +3,12 @@
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
-         'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
+         'xorg-server-common' 'xorg-server-devel')
 
 _commit=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10
 
 pkgver=1.20.10
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -18,7 +18,7 @@
              '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' 'wayland-protocols' 'egl-wayland' 'meson' 'git')
+             'libxshmfence' 'libunwind' 'systemd' 'meson' 'git')
 source=(#https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         "git+https://gitlab.freedesktop.org/xorg/xserver#commit=${_commit}" #?signed"
         xserver-autobind-hotplug.patch
@@ -75,8 +75,8 @@
     -D xcsecurity=true \
     -D xorg=true \
     -D xephyr=true \
-    -D xwayland=true \
-    -D xwayland_eglstream=true \
+    -D xwayland=false \
+    -D xwayland_eglstream=false \
     -D glamor=true \
     -D udev=true \
     -D systemd_logind=true \
@@ -188,18 +188,6 @@
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
 }
 
-package_xorg-server-xwayland() {
-  pkgdesc="run X clients under wayland"
-  depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common
-           nettle libtirpc)
-
-  _install fakeinstall/usr/bin/Xwayland
-
-  # license
-  #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
 package_xorg-server-devel() {
   pkgdesc="Development files for the X.Org X server"
   depends=('xorgproto' 'mesa' 'libpciaccess'