configure.ac

@@ -2293,7 +2293,7 @@ AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 
 dnl Xwayland DDX
 
-XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.18"
+XWAYLANDMODULES="wayland-client >= 1.5.0 wayland-protocols >= 1.18"
 if test "x$XF86VIDMODE" = xyes; then
 	XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO"
 fi

hw/xwayland/xwayland.c

@@ -267,10 +267,7 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv)
         LoadExtensionList(xwayland_extensions,
                           ARRAY_SIZE(xwayland_extensions), FALSE);
 
-    /* Cast away warning from missing printf annotation for
-     * wl_log_func_t.  Wayland 1.5 will have the annotation, so we can
-     * remove the cast and require that when it's released. */
-    wl_log_set_handler_client((void *) xwl_log_handler);
+    wl_log_set_handler_client(xwl_log_handler);
 
     if (AddScreen(xwl_screen_init, argc, argv) == -1) {
         FatalError("Couldn't add screen\n");

include/meson.build

@@ -339,7 +339,7 @@ xkb_data.set_quoted('XKB_DFLT_MODEL', get_option('xkb_default_model'))
 xkb_data.set_quoted('XKB_DFLT_LAYOUT', get_option('xkb_default_layout'))
 xkb_data.set_quoted('XKB_DFLT_VARIANT', get_option('xkb_default_variant'))
 xkb_data.set_quoted('XKB_DFLT_OPTIONS', get_option('xkb_default_options'))
-xkb_data.set_quoted('XKM_OUTPUT_DIR', xkb_output_dir)
+xkb_data.set_quoted('XKM_OUTPUT_DIR', xkb_output_dir + '/')
 
 configure_file(output : 'xkb-config.h',
                configuration : xkb_data)

meson.build

@@ -61,7 +61,7 @@ add_global_arguments(common_wflags, language : ['c', 'objc'])
 libdrm_req = '>= 2.4.89'
 libselinux_req = '>= 2.0.86'
 xext_req = '>= 1.0.99.4'
-wayland_req = '>= 1.3.0'
+wayland_req = '>= 1.5.0'
 wayland_protocols_req = '>= 1.18'
 gbm_req = '>= 10.2'
 xf86dgaproto_req = '>= 2.0.99.1'