From bca5155ce6cce4c6d2ce9afd591c3cc4657b9d885f98095b89509bfa7afedf61 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 17 Dec 2021 10:46:44 +0000 Subject: [PATCH] - Add 0001-Fix-build-against-wayland-1.20.patch OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=114 --- 0001-Fix-build-against-wayland-1.20.patch | 42 +++++++++++++++++++++++ SDL2.changes | 5 +++ SDL2.spec | 4 ++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-build-against-wayland-1.20.patch diff --git a/0001-Fix-build-against-wayland-1.20.patch b/0001-Fix-build-against-wayland-1.20.patch new file mode 100644 index 0000000..def3141 --- /dev/null +++ b/0001-Fix-build-against-wayland-1.20.patch @@ -0,0 +1,42 @@ +From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001 +From: David Redondo +Date: Fri, 10 Dec 2021 16:22:34 +0100 +Subject: [PATCH] Fix build against wayland 1.20 + +Fixes #5088 +--- + 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 13b0884d0..226855560 100644 +--- a/src/video/wayland/SDL_waylanddyn.h ++++ b/src/video/wayland/SDL_waylanddyn.h +@@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void); + #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) + #define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag) + #define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag) ++#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 d6e6a761d..32e47d26e 100644 +--- a/src/video/wayland/SDL_waylandsym.h ++++ b/src/video/wayland/SDL_waylandsym.h +@@ -84,6 +84,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18) + SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *)) + SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *)) + ++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.34.1 + diff --git a/SDL2.changes b/SDL2.changes index 10e956c..e4572c0 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 17 10:40:12 UTC 2021 - Jan Engelhardt + +- Add 0001-Fix-build-against-wayland-1.20.patch + ------------------------------------------------------------------- Tue Nov 30 17:30:02 UTC 2021 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index fb298c2..be2e6d0 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -25,13 +25,15 @@ Summary: Simple DirectMedia Layer Library License: Zlib Group: Development/Libraries/X11 URL: http://libsdl.org/ +#Git-Clone: https://github.com/libsdl-org/SDL #DL-URL: http://libsdl.org/download-2.0.php Source: http://libsdl.org/release/%name-%version.tar.gz Source2: http://libsdl.org/release/%name-%version.tar.gz.sig Source3: %name.keyring Source4: baselibs.conf Patch1: sdl2-symvers.patch -Patch3: sdl2-khronos.patch +Patch2: sdl2-khronos.patch +Patch3: 0001-Fix-build-against-wayland-1.20.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: nasm