From 1b7dca27eb44eac9cb0a8d1463d968872c76f4d5 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 18 Feb 2021 12:04:48 +0100 Subject: [PATCH] xwayland: remove wl_log_set_handler_client workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This bumps the minimum Wayland version to 1.5 (released in 2014). Signed-off-by: Simon Ser Reviewed-by: Michel Dänzer Reviewed-by: Olivier Fourdan Reviewed-by: Martin Peres --- configure.ac | 2 +- hw/xwayland/xwayland.c | 5 +---- meson.build | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 1cf1cca35..445a80b3c 100644 --- a/configure.ac +++ b/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 diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index b11e2020c..27fbdf28e 100644 --- a/hw/xwayland/xwayland.c +++ b/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"); diff --git a/meson.build b/meson.build index 6cba5bb5d..9a1f05a8a 100644 --- a/meson.build +++ b/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'