From 918278e70c77824d25a61fa62f350f8f45787542 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Fri, 17 Jan 2025 10:00:40 -0800 Subject: [PATCH] compiler fixes Signed-off-by: Joel Winarske --- shell/wayland/display.cc | 4 ++++ shell/wayland/window.cc | 6 ++++++ third_party/waypp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/shell/wayland/display.cc b/shell/wayland/display.cc index b6031216..14d6eb2a 100644 --- a/shell/wayland/display.cc +++ b/shell/wayland/display.cc @@ -767,8 +767,12 @@ constexpr wl_touch_listener Display::touch_listener = { .motion = touch_handle_motion, .frame = touch_handle_frame, .cancel = touch_handle_cancel, +#if defined(WL_TOUCH_SHAPE_SINCE_VERSION) .shape = nullptr, +#endif +#if defined(WL_TOUCH_ORIENTATION_SINCE_VERSION) .orientation = nullptr, +#endif }; int Display::PollEvents() const { diff --git a/shell/wayland/window.cc b/shell/wayland/window.cc index 88917070..9893b8f2 100644 --- a/shell/wayland/window.cc +++ b/shell/wayland/window.cc @@ -194,6 +194,12 @@ void WaylandWindow::handle_base_surface_leave(void* /* data */, const struct wl_surface_listener WaylandWindow::m_base_surface_listener = { .enter = handle_base_surface_enter, .leave = handle_base_surface_leave, +#if WL_SURFACE_PREFERRED_BUFFER_SCALE_SINCE_VERSION + .preferred_buffer_scale = nullptr, +#endif +#if WL_SURFACE_PREFERRED_BUFFER_TRANSFORM_SINCE_VERSION + .preferred_buffer_transform = nullptr, +#endif }; #if ENABLE_XDG_CLIENT diff --git a/third_party/waypp b/third_party/waypp index 848753e1..bac5ef4e 160000 --- a/third_party/waypp +++ b/third_party/waypp @@ -1 +1 @@ -Subproject commit 848753e178ae2abff755f2d5fe65896ec6287c96 +Subproject commit bac5ef4ed2797cf50bd540147abf35a711c723b9