From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Sat, 28 Jun 2025 15:34:53 +0000 (+0200)
Subject: meson.build: require xwayland version 21.1.9 for xwayland support
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=7cc77f988524541dd004e6a6e68dc54370399582;p=proto%2Flabwc.git

meson.build: require xwayland version 21.1.9 for xwayland support

This and later xwayland releases ship fixes for drm leased devices
causing lags in Chromium and Electron based applications. We used
to work around the issue by simply not sending drm leases to xwayland
but we can now rely on the fixes being widely available.
See #553 for more information.
---

diff --git a/meson.build b/meson.build
index 67e378d2..c20eb6e7 100644
--- a/meson.build
+++ b/meson.build
@@ -95,10 +95,25 @@ sfdo_icon = dependency(
   required: have_libsfdo,
 )
 
+xwayland = dependency(
+  'xwayland',
+  version: '>=21.1.9',
+  required: get_option('xwayland'),
+)
+
 if get_option('xwayland').enabled() and not wlroots_has_xwayland
 	error('no wlroots Xwayland support')
 endif
-have_xwayland = xcb.found() and wlroots_has_xwayland
+if get_option('xwayland').disabled()
+	have_xwayland = false
+elif not xwayland.found()
+	warning('disabling xwayland, requires version >= 21.1.9')
+	have_xwayland = false
+elif xcb.found() and wlroots_has_xwayland
+	have_xwayland = true
+else
+	have_xwayland = false
+endif
 conf_data = configuration_data()
 conf_data.set10('HAVE_XWAYLAND', have_xwayland)