From 2827ec6b7b4ba45d3911258cd7a383eccd722c28 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 27 Jan 2023 16:26:36 +0100 Subject: [PATCH] xwayland: enable use of a xserver subproject Makes it easier to work on Xwayland and wlroots features in parallel. References: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1048 --- xwayland/meson.build | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xwayland/meson.build b/xwayland/meson.build index 08ad7a39..81cb018e 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -20,7 +20,19 @@ if not get_option('xwayland').disabled() msg += 'Required for Xwayland support.' endif -xwayland = dependency('xwayland', required: get_option('xwayland')) +xwayland = dependency( + 'xwayland', + required: get_option('xwayland'), + fallback: 'xserver', + default_options: [ + 'werror=false', + 'xorg=false', + 'xephyr=false', + 'xwayland=true', + 'xnest=false', + 'xvfb=false', + ], +) if not xwayland.found() subdir_done() endif