chase: move to stable tablet protocol and require w-p >= 1.35

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4645

diff --git a/meson.build b/meson.build
index 3ec6eeb18e6818dd39b22dede9d0f825880b3a2a..267b91b3e4686b827bbc72139d5c0bb69b519caf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -57,7 +57,7 @@ wlroots = dependency(
 wlroots_has_xwayland = wlroots.get_variable('have_xwayland') == 'true'
 
 wayland_server = dependency('wayland-server', version: '>=1.19.0')
-wayland_protos = dependency('wayland-protocols')
+wayland_protos = dependency('wayland-protocols', version: '>=1.35')
 xkbcommon = dependency('xkbcommon')
 xcb = dependency('xcb', required: get_option('xwayland'))
 xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))

diff --git a/protocols/meson.build b/protocols/meson.build
index b0c2f5ab0e596f5fc83622e4066a49756e4ba827..0ee40bf42ea48f223ef493774461523e01f8cf69 100644 (file)
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -16,7 +16,7 @@ wayland_scanner_server = generator(
 server_protocols = [
        wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
        wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
-       wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml',
+       wl_protocol_dir / 'stable/tablet/tablet-v2.xml',
        wl_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml',
        wl_protocol_dir / 'staging/drm-lease/drm-lease-v1.xml',
        wl_protocol_dir / 'staging/xwayland-shell/xwayland-shell-v1.xml',

diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index 5ac4b36f39cc3f037f7b1d65e9be119ec7748bcd..ac960c5893f879232362108652ac437bf1443342 100644 (file)
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 4b4f76cc13574544216b59b3a9902b468b82108b
+revision = fe429b2463f279a6274bb6f42a3e23525a3c97aa
 
 [provide]
 dependency_names = wlroots-0.18