bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Revert "GHOST/Wayland: reference the stable tablet-v2 API"

Browse Source 
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
This commit is contained in:
Bastien Montagne 2024-06-26 11:35:18 +02:00 committed by Gitea
parent 73db631440
commit c525e4db83
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/CMakeLists.txt
View File

@ -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(

2
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@ -65,7 +65,7 @@
#include <pointer-gestures-unstable-v1-client-protocol.h>
#include <primary-selection-unstable-v1-client-protocol.h>
#include <relative-pointer-unstable-v1-client-protocol.h>
#include <tablet-v2-client-protocol.h>
#include <tablet-unstable-v2-client-protocol.h>
#include <viewporter-client-protocol.h>
#include <xdg-activation-v1-client-protocol.h>
#include <xdg-output-unstable-v1-client-protocol.h>