xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-screen.c |    4 ++--
 meson_options.txt             |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cbe15842f5db0670c30630be18f9d41e3614b3d7
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Tue Dec 14 18:33:55 2021 +0100

    Fix spelling of Xwayland
    
    There were just 3 outliers, let's try to prevent them from spreading.

diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index b249dbb08..5c8b388f0 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -517,13 +517,13 @@ xwl_dispatch_events (struct xwl_screen *xwl_screen)
 pollout:
     ready = xwl_display_pollout(xwl_screen, 5);
     if (ready == -1 && errno != EINTR)
-        xwl_give_up("error polling on XWayland fd: %s\n", strerror(errno));
+        xwl_give_up("error polling on Xwayland fd: %s\n", strerror(errno));
 
     if (ready > 0)
         ret = wl_display_flush(xwl_screen->display);
 
     if (ret == -1 && errno != EAGAIN)
-        xwl_give_up("failed to write to XWayland fd: %s\n", strerror(errno));
+        xwl_give_up("failed to write to Xwayland fd: %s\n", strerror(errno));
 
     xwl_screen->wait_flush = (ready == 0 || ready == -1 || ret == -1);
 }
diff --git a/meson_options.txt b/meson_options.txt
index 93e13f9ef..b7719e092 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,7 +3,7 @@ option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
 option('xephyr', type: 'boolean', value: false,
        description: 'Enable Xephyr nested X server')
 option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
-       description: 'Enable XWayland X server')
+       description: 'Enable Xwayland X server')
 option('glamor', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
        description: 'Enable glamor (default yes for Xorg/Xwayland builds)')
 option('xwayland_eglstream', type: 'combo', choices: ['true', 'false', 'auto'],