| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From b1ed3533433501ec52c8289a5b3a294e57e7f798 Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <martin.jansa@gmail.com> |
| 3 | Date: Thu, 26 May 2016 11:31:52 +0000 |
| 4 | Subject: [PATCH] src/video: make it compatible with wayland 1.10 |
| 5 | |
| 6 | | build/.libs/SDL_waylandevents.o: In function `wl_registry_bind': |
| 7 | | /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' |
| 8 | | /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' |
| 9 | | build/.libs/SDL_waylandkeyboard.o: In function `wl_registry_bind': |
| 10 | | /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' |
| 11 | | /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' |
| 12 | | build/.libs/SDL_waylandvideo.o: In function `wl_registry_bind': |
| 13 | | /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' |
| 14 | | collect2: error: ld returned 1 exit status |
| 15 | | make: *** [build/libSDL2.la] Error 1 |
| 16 | | ERROR: oe_runmake failed |
| 17 | |
| 18 | Upstream-Status: Pending |
| 19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 20 | |
| 21 | --- |
| 22 | src/video/wayland/SDL_waylanddyn.h | 1 + |
| 23 | src/video/wayland/SDL_waylandsym.h | 4 ++++ |
| 24 | src/video/webos/SDL_waylanddyn.h | 1 + |
| 25 | src/video/webos/SDL_waylandsym.h | 4 ++++ |
| 26 | 4 files changed, 10 insertions(+) |
| 27 | |
| 28 | diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h |
| 29 | index 8d9313a..c7b0157 100644 |
| 30 | --- a/src/video/wayland/SDL_waylanddyn.h |
| 31 | +++ b/src/video/wayland/SDL_waylanddyn.h |
| 32 | @@ -79,6 +79,7 @@ void SDL_WAYLAND_UnloadSymbols(void); |
| 33 | #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) |
| 34 | #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) |
| 35 | #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) |
| 36 | +#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) |
| 37 | |
| 38 | #define wl_seat_interface (*WAYLAND_wl_seat_interface) |
| 39 | #define wl_surface_interface (*WAYLAND_wl_surface_interface) |
| 40 | diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h |
| 41 | index c3b4fa5..b9a0d97 100644 |
| 42 | --- a/src/video/wayland/SDL_waylandsym.h |
| 43 | +++ b/src/video/wayland/SDL_waylandsym.h |
| 44 | @@ -55,6 +55,10 @@ SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *)) |
| 45 | SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4) |
| 46 | SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...)) |
| 47 | |
| 48 | +/* These functions are available in Wayland >= 1.10 */ |
| 49 | +SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) |
| 50 | +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, ...)) |
| 51 | + |
| 52 | SDL_WAYLAND_INTERFACE(wl_seat_interface) |
| 53 | SDL_WAYLAND_INTERFACE(wl_surface_interface) |
| 54 | SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) |
| 55 | -- |
| 56 | 1.9.1 |
| 57 | |