]> git.mdlowis.com Git - proto/labwc.git/commitdiff
meson.build: require xwayland version 21.1.9 for xwayland support
authorConsolatis <35009135+Consolatis@users.noreply.github.com>
Sat, 28 Jun 2025 15:34:53 +0000 (17:34 +0200)
committerJohan Malm <johanmalm@users.noreply.github.com>
Sat, 28 Jun 2025 19:33:57 +0000 (20:33 +0100)
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.

meson.build

index 67e378d21d05d18cd03810b98e58382246e8d557..c20eb6e7aabce3723e18c2b96a27f249c3500d3c 100644 (file)
@@ -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)