fix compilation (dynamic) against current wayland)

This commit is contained in:
Tom Callaway 2016-02-05 12:28:51 -05:00
parent 9a9b600b93
commit 4ef7be6dee
2 changed files with 17 additions and 2 deletions

View File

@ -0,0 +1,11 @@
diff -up SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h.fix SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h
--- SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h.fix 2016-02-05 12:18:29.514348406 -0500
+++ SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h 2016-02-05 12:18:45.898990489 -0500
@@ -79,6 +79,7 @@ void SDL_WAYLAND_UnloadSymbols(void);
#define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
#define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener)
#define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor)
+#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
#define wl_seat_interface (*WAYLAND_wl_seat_interface)
#define wl_surface_interface (*WAYLAND_wl_surface_interface)

View File

@ -1,6 +1,6 @@
Name: SDL2
Version: 2.0.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A cross-platform multimedia library
Group: System Environment/Libraries
URL: http://www.libsdl.org/
@ -8,7 +8,8 @@ License: zlib and MIT
Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
Source1: SDL_config.h
Patch0: multilib.patch
# https://bugzilla.libsdl.org/show_bug.cgi?id=3255
Patch1: SDL2-wayland-dyn-wl_proxy_marshal_constructor_versioned.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
BuildRequires: mesa-libGL-devel
@ -117,6 +118,9 @@ rm -f %{buildroot}%{_libdir}/*.a
%{_datadir}/aclocal/*
%changelog
* Fri Feb 5 2016 Tom Callaway <spot@fedoraproject.org> - 2.0.4-3
- fix compile against latest wayland
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild