From 650657adb0bfbb50d0ec075c91d61e5373031f62 Mon Sep 17 00:00:00 2001 From: Joseph Mullally Date: Sun, 10 Jul 2016 18:17:26 +0100 Subject: [PATCH] fix Wayland dynamic symbol loading (bz1354155) --- ...dyn-wl_proxy_marshal_constructor_versioned.patch | 13 +++++++++++++ SDL2.spec | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/SDL2-wayland-dyn-wl_proxy_marshal_constructor_versioned.patch b/SDL2-wayland-dyn-wl_proxy_marshal_constructor_versioned.patch index 66794be..3f233ad 100644 --- a/SDL2-wayland-dyn-wl_proxy_marshal_constructor_versioned.patch +++ b/SDL2-wayland-dyn-wl_proxy_marshal_constructor_versioned.patch @@ -9,3 +9,16 @@ diff -up SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h.fix SDL2-2.0.4/src/video/ #define wl_seat_interface (*WAYLAND_wl_seat_interface) #define wl_surface_interface (*WAYLAND_wl_surface_interface) +diff -up SDL2-2.0.4/src/video/wayland/SDL_waylandsym.h.fix SDL2-2.0.4/src/video/wayland/SDL_waylandsym.h +--- SDL2-2.0.4/src/video/wayland/SDL_waylandsym.h.fix 2016-07-10 17:55:53.970424955 +0100 ++++ SDL2-2.0.4/src/video/wayland/SDL_waylandsym.h 2016-07-10 18:03:01.627109626 +0100 +@@ -55,6 +55,9 @@ SDL_WAYLAND_SYM(void, wl_list_insert_lis + SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4) + SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...)) + ++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_INTERFACE(wl_seat_interface) + SDL_WAYLAND_INTERFACE(wl_surface_interface) + SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) diff --git a/SDL2.spec b/SDL2.spec index 3b51978..316aefb 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -1,6 +1,6 @@ Name: SDL2 Version: 2.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A cross-platform multimedia library Group: System Environment/Libraries URL: http://www.libsdl.org/ @@ -130,6 +130,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/lib*.a %changelog +* Sun Jul 10 2016 Joseph Mullally - 2.0.4-5 +- fix Wayland dynamic symbol loading (bz1354155) + * Thu Feb 25 2016 Tom Callaway - 2.0.4-4 - enable static subpackage (bz1253930)