mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 13:43:22 +00:00
44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
From a31d1f1683ef2e9c063c3fa1db79d111cca99414 Mon Sep 17 00:00:00 2001
|
|
From: David Redondo <kde@david-redondo.de>
|
|
Date: Fri, 10 Dec 2021 16:22:34 +0100
|
|
Subject: [PATCH] Fix build against wayland 1.20
|
|
|
|
Fixes #5088
|
|
|
|
(cherry picked from commit e2ade2bfc46d915cd306c63c830b81d800b2575f)
|
|
---
|
|
src/video/wayland/SDL_waylanddyn.h | 2 ++
|
|
src/video/wayland/SDL_waylandsym.h | 4 ++++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
|
|
index 485a9c19f..37070e946 100644
|
|
--- a/src/video/wayland/SDL_waylanddyn.h
|
|
+++ b/src/video/wayland/SDL_waylanddyn.h
|
|
@@ -81,6 +81,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
|
|
#define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener)
|
|
#define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor)
|
|
#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
|
|
+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
|
|
+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
|
|
|
|
#define wl_seat_interface (*WAYLAND_wl_seat_interface)
|
|
#define wl_surface_interface (*WAYLAND_wl_surface_interface)
|
|
diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
|
|
index c4c189d3c..789f49e27 100644
|
|
--- a/src/video/wayland/SDL_waylandsym.h
|
|
+++ b/src/video/wayland/SDL_waylandsym.h
|
|
@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_prox
|
|
SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10)
|
|
SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...))
|
|
|
|
+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
|
|
+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...))
|
|
+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args))
|
|
+
|
|
SDL_WAYLAND_INTERFACE(wl_seat_interface)
|
|
SDL_WAYLAND_INTERFACE(wl_surface_interface)
|
|
SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
|
|
--
|
|
2.33.1
|