From c525e4db83631838955e539caeaca305b9b4b4da Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 26 Jun 2024 11:35:18 +0200 Subject: [PATCH] Revert "GHOST/Wayland: reference the stable tablet-v2 API" The currently available `wayland-protocol` libraries in lib-linux_x64 repo do not appear to be advertised 1.36 (or 1.35) versions, since the tablet protocol is not available among the stable ones. This reverts commit 2a85eaaf169c51cfb24d4564fa58b4c89ce6d773. Pull Request: https://projects.blender.org/blender/blender/pulls/123774 --- 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 c6b7e5cbbca..92e7cbf1617 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -442,7 +442,7 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) ) # Tablet. generate_protocol_bindings( - "${WAYLAND_PROTOCOLS_DIR}/stable/tablet/tablet-v2.xml" + "${WAYLAND_PROTOCOLS_DIR}/unstable/tablet/tablet-unstable-v2.xml" ) # Primary-selection. generate_protocol_bindings( diff --git a/intern/ghost/intern/GHOST_SystemWayland.cc b/intern/ghost/intern/GHOST_SystemWayland.cc index 2d58557a14b..6f0c26474bf 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