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 <sebastian@sebastianwick.net>

diff --git a/libweston/input.c b/libweston/input.c
index 0e87a4bbc5e98d7466e665adadb6e382d318d23a..94e1470dc52b3d569bbb0a62bb51486f43a87565 100644 (file)
--- 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 75b221f6c6df8b95a9c1ebaa7379a489c9756a74..989151e5f4320bc3dee02fd3078e157ca9121a2a 100644 (file)
--- 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')