1 From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001
2 From: David Redondo <kde@david-redondo.de>
3 Date: Fri, 10 Dec 2021 16:22:34 +0100
4 Subject: [PATCH] Fix build against wayland 1.20
5
6 Fixes #5088
7 ---
8 src/video/wayland/SDL_waylanddyn.h | 2 ++
9 src/video/wayland/SDL_waylandsym.h | 4 ++++
10 2 files changed, 6 insertions(+)
11
12 diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
13 index 13b0884d076..2268555604a 100644
14 --- a/src/video/wayland/SDL_waylanddyn.h
15 +++ b/src/video/wayland/SDL_waylanddyn.h
16 @@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
17 #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
18 #define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag)
19 #define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag)
20 +#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
21 +#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
22
23 #define wl_seat_interface (*WAYLAND_wl_seat_interface)
24 #define wl_surface_interface (*WAYLAND_wl_surface_interface)
25 diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
26 index d6e6a761d39..32e47d26e2d 100644
27 --- a/src/video/wayland/SDL_waylandsym.h
28 +++ b/src/video/wayland/SDL_waylandsym.h
29 @@ -84,6 +84,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18)
30 SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *))
31 SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *))
32
33 +SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
34 +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, ...))
35 +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))
36 +
37 SDL_WAYLAND_INTERFACE(wl_seat_interface)
38 SDL_WAYLAND_INTERFACE(wl_surface_interface)
39 SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
|
