diff options
| author | Bastien Nocera <hadess@hadess.net> | 2020-03-03 15:26:06 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2020-03-03 15:30:47 +0100 |
| commit | 669d2975873cbda5880a12491b56d57cfd85e6a4 (patch) | |
| tree | ba0b7870116afbebe1d5f8e51dc343a98a3b7779 | |
| parent | 3c554753919224f392a22c642dc0ba51b1787b54 (diff) | |
| download | mutter-wip/hadess/fedora-no-wayland.tar.gz | |
wayland: Fix wayland session not starting on some systemswip/hadess/fedora-no-wayland
Fedora's mutter is built with --auto-features=enabled which enables
-initfd support. But the current meson code doesn't check whether
-initfd is available in Xwayland, leading to the wayland session not
starting up.
Check for -initfd's availability before enabling it.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1103
| -rw-r--r-- | meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 96f53ddc4..777086801 100644 --- a/meson.build +++ b/meson.build @@ -396,11 +396,14 @@ if have_wayland # For Xwayland -initfd usage use_initfd = get_option('xwayland_initfd') + xwayland_options = run_command(xwayland_path, '-help') if use_initfd.auto() - xwayland_options = run_command(xwayland_path, '-help') have_xwayland_initfd = xwayland_options.stderr().contains('-initfd') else have_xwayland_initfd = use_initfd.enabled() + if have_xwayland_initfd and not xwayland_options.stderr().contains('-initfd') + error('XWayland -initfd support requested but not available') + endif endif if (have_xwayland_initfd) |