From 7d33cd9877d2e4a35b6359ab113c01672ddfc56d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 26 Jun 2024 16:26:18 +1000 Subject: [PATCH] GHOST/Wayland: reference the stable tablet-v2 API The tablet API become stable in wayland-protocol 1.35 NOTE: this was reverted [0] because I missed adding the files to lib. The files have been included, so use the stable API. No functional changes expected. [0]: c525e4db83631838955e539caeaca305b9b4b4da --- intern/ghost/CMakeLists.txt | 2 +- intern/ghost/intern/GHOST_SystemWayland.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 6f5fdfe7b8b..15a3e318716 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -434,7 +434,7 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) ) # Tablet. generate_protocol_bindings( - "${WAYLAND_PROTOCOLS_DIR}/unstable/tablet/tablet-unstable-v2.xml" + "${WAYLAND_PROTOCOLS_DIR}/stable/tablet/tablet-v2.xml" ) # Primary-selection. generate_protocol_bindings( diff --git a/intern/ghost/intern/GHOST_SystemWayland.cc b/intern/ghost/intern/GHOST_SystemWayland.cc index 0ff0e40a1c5..ead347be251 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cc +++ b/intern/ghost/intern/GHOST_SystemWayland.cc @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include #include