From 3ee28bc336f0318c756e97bb1532df37cdc0e0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 28 Jun 2022 16:26:00 +0200
Subject: [PATCH] ci: Fix Xwayland build config

Some of the options doesn't exist anymore, and warnings are now fatal.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2484>
---
 .gitlab-ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4663fadb4..07b5b37ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,14 +53,12 @@ variables:
       dnf install -y 'pkgconfig(libxcvt)' &&
 
       ./.gitlab-ci/install-meson-project.sh \
-        -Dxwayland=true \
         -Dxwayland_eglstream=true \
-        -D{xorg,xnest,xvfb}=false \
+        -Dxvfb=false \
         -Dvendor_name="Mutter CI" \
-        -D{xdmcp,udev,udev_kms}=false \
+        -Dxdmcp=false \
         -Dxcsecurity=true \
         -Dglamor=true \
-        -D{dri1,dri2}=false \
         -Ddri3=true \
         https://gitlab.freedesktop.org/xorg/xserver.git \
         xwayland-22.1.0 \