From fcc6ff74d48998b5f8d6b913b6d2ec11a7532861 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Fri, 1 Nov 2019 02:09:28 +0100 Subject: [PATCH] input: bump wl_seat version to 6 New in version 6 are touch shape, touch orientation and axis source wheel tilt. Weston doesn't support any of them yet but simply not sending the new events and new enum value is sufficient to claim to support this version. Also bump the Wayland requirement to 1.17 to ensure both version 6 and 7 definitions are in the XML. The reason for bumping to v6 without implementing the new features is that we must support v7 to make use of struct ro_anonymous_file introduced in the previous commit. Signed-off-by: Sebastian Wick --- libweston/input.c | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libweston/input.c b/libweston/input.c index 0e87a4bb..94e1470d 100644 --- a/libweston/input.c +++ b/libweston/input.c @@ -3441,7 +3441,7 @@ weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec, wl_signal_init(&seat->destroy_signal); wl_signal_init(&seat->updated_caps_signal); - seat->global = wl_global_create(ec->wl_display, &wl_seat_interface, 5, + seat->global = wl_global_create(ec->wl_display, &wl_seat_interface, 6, seat, bind_seat); seat->compositor = ec; diff --git a/meson.build b/meson.build index 75b221f6..989151e5 100644 --- a/meson.build +++ b/meson.build @@ -132,8 +132,8 @@ if dep_xkbcommon.version().version_compare('>= 0.5.0') config_h.set('HAVE_XKBCOMMON_COMPOSE', '1') endif -dep_wayland_server = dependency('wayland-server', version: '>= 1.12.0') -dep_wayland_client = dependency('wayland-client', version: '>= 1.12.0') +dep_wayland_server = dependency('wayland-server', version: '>= 1.17.0') +dep_wayland_client = dependency('wayland-client', version: '>= 1.17.0') dep_pixman = dependency('pixman-1', version: '>= 0.25.2') dep_libinput = dependency('libinput', version: '>= 0.8.0') dep_libevdev = dependency('libevdev')