[mutter/wip/hadess/fedora-no-wayland] wayland: Fix wayland session not starting on some systems
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/hadess/fedora-no-wayland] wayland: Fix wayland session not starting on some systems
- Date: Tue, 3 Mar 2020 14:29:25 +0000 (UTC)
commit 5ae999822ad7dded5c3c194a273b498ac19c18cf
Author: Bastien Nocera <hadess hadess net>
Date: Tue Mar 3 15:26:06 2020 +0100
wayland: Fix wayland session not starting on some systems
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.
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]