From ffa5fd776d16b7b64fe62f54c1c62e6e56d284e8 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu, 8 Jul 2021 08:50:46 +0200
Subject: [PATCH] ci: Build Xserver from git
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is to get support for the “-terminate delay” option in Xwayland
with libXfixes 6.0.

libXfixes 6.0 provides the new ClientDisconnectMode that clients can
use to declare themselves as to-be-terminated.

This can be used to let Xwayland terminate itself automatically when no
other (“non-terminatable”) X11 client is left.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1794>
---
 .gitlab-ci.yml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a242ee2fd..024a245fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
 .mutter.fedora:35@common:
   variables:
     FDO_DISTRIBUTION_VERSION: 35
-    BASE_TAG: '2022-01-25'
+    BASE_TAG: '2022-01-26.0'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
       clang
@@ -30,6 +30,7 @@ variables:
       uncrustify
       xorg-x11-server-Xvfb
       mesa-dri-drivers
+      xorg-x11-proto-devel
 
     FDO_DISTRIBUTION_EXEC: |
       dnf install -y 'dnf-command(builddep)' &&
@@ -40,6 +41,26 @@ variables:
       dnf builddep -y libinput --setopt=install_weak_deps=False &&
       dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
 
+      # For Xwayland
+      dnf builddep -y xorg-x11-server-Xwayland --setopt=install_weak_deps=False &&
+      dnf install -y 'pkgconfig(fontutil)' &&
+      dnf install -y 'pkgconfig(libxcvt)' &&
+
+      ./.gitlab-ci/install-meson-project.sh \
+        -Dxwayland=true \
+        -Dxwayland_eglstream=true \
+        -D{xorg,xnest,xvfb}=false \
+        -Dvendor_name="Mutter CI" \
+        -D{xdmcp,udev,udev_kms}=false \
+        -Dxcsecurity=true \
+        -Dglamor=true \
+        -D{dri1,dri2}=false \
+        -Ddri3=true \
+        https://gitlab.freedesktop.org/xorg/xserver.git \
+        xwayland-22.1 \
+        . \
+        xwayland-22.0.99.901 &&
+
       ./.gitlab-ci/install-meson-project.sh \
         https://gitlab.gnome.org/GNOME/gjs.git \
         master . 5a1237aeb81feddd016fb9f71e77d5ee872bccd0 &&