From 42e4450083ed0458ebaf496531d92a59a7c0625b Mon Sep 17 00:00:00 2001 From: Karen Webb Date: Fri, 8 Nov 2024 16:28:31 +0000 Subject: [PATCH 1/2] Use stable version of tablet protocol --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d9523f..d6aa030 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,11 +49,11 @@ add_executable(wayland_example main.cpp MappedFd.cpp vk_mem_alloc.cpp volk.c wayland/cursor/theme/ThemeCursor.cpp wayland/cursor/theme/ThemeCursorManager.cpp ) ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml BASENAME xdg-shell) +ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/stable/tablet/tablet-v2.xml BASENAME tablet) # dependency of cursor-shape ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/stable/viewporter/viewporter.xml BASENAME viewporter) ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/staging/content-type/content-type-v1.xml BASENAME content-type) ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/staging/cursor-shape/cursor-shape-v1.xml BASENAME cursor-shape) ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/staging/fractional-scale/fractional-scale-v1.xml BASENAME fractional-scale) -ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/unstable/tablet/tablet-unstable-v2.xml BASENAME tablet) # dependency of cursor-shape ecm_add_wayland_client_protocol(wayland_example PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml BASENAME xdg-decoration) set_target_properties(wayland_example PROPERTIES CXX_STANDARD 23) target_compile_definitions(wayland_example PRIVATE GLM_FORCE_LEFT_HANDED VK_NO_PROTOTYPES VK_USE_PLATFORM_WAYLAND_KHR) From e26f7fd17b21fde5e21f61683804912375bfdf6e Mon Sep 17 00:00:00 2001 From: Karen Webb Date: Tue, 12 Nov 2024 09:16:41 +0000 Subject: [PATCH 2/2] Update Deps --- .github/workflows/cmake-single-platform.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-single-platform.yml b/.github/workflows/cmake-single-platform.yml index 62b34d7..c3a7a93 100644 --- a/.github/workflows/cmake-single-platform.yml +++ b/.github/workflows/cmake-single-platform.yml @@ -27,9 +27,13 @@ jobs: wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list https://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list - - name: Install Dependencies + - name: Update Packages run: | sudo apt-get update + sudo apt-get upgrade + + - name: Install Dependencies + run: | sudo apt-get install --no-install-recommends extra-cmake-modules glslc libglm-dev libwayland-dev libx11-dev libvulkan-dev libxkbcommon-dev vma volk vulkan-headers vulkan-utility-libraries-dev wayland-protocols - name: Configure CMake