diff --git a/0001-Fix-build-against-wayland-1.20.patch b/0001-Fix-build-against-wayland-1.20.patch deleted file mode 100644 index def3141..0000000 --- a/0001-Fix-build-against-wayland-1.20.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 9db55db..f061074 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 16 12:27:09 UTC 2022 - Carsten Ziepke + +- Drop 0001-Fix-build-against-wayland-1.20.patch + Fixed upstream: https://github.com/libsdl-org/SDL/pull/5092 + ------------------------------------------------------------------- Tue Jan 11 19:47:23 UTC 2022 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index f76115f..55b00aa 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -33,7 +33,6 @@ Source3: %name.keyring Source4: baselibs.conf Patch1: sdl2-symvers.patch Patch2: sdl2-khronos.patch -Patch3: 0001-Fix-build-against-wayland-1.20.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: nasm @@ -108,7 +107,7 @@ library. %prep %autosetup -p1 -perl -i -pe 's{\r\n}{\n}g' *.txt +perl -i -pe 's{\r\n}{\n}g' *.txt README.md %build %global _lto_cflags %_lto_cflags -ffat-lto-objects