diff --git a/libSDL2-2.0.4-libwayland-1.9.93.patch b/libSDL2-2.0.4-libwayland-1.9.93.patch new file mode 100644 index 0000000..f86512a --- /dev/null +++ b/libSDL2-2.0.4-libwayland-1.9.93.patch @@ -0,0 +1,10 @@ +--- SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h.orig 2016-02-14 19:33:26.111144732 +0100 ++++ SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h 2016-02-14 19:38:06.529071715 +0100 +@@ -79,6 +79,7 @@ + #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) diff --git a/libSDL2.spec b/libSDL2.spec index c64e4fd..618fa4d 100644 --- a/libSDL2.spec +++ b/libSDL2.spec @@ -1,5 +1,5 @@ Name: libSDL2 -Version: 2.0.3 +Version: 2.0.4 Release: 2mamba Summary: A library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware Group: System/Libraries @@ -8,12 +8,18 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://libsdl.org/ Source: http://libsdl.org/release/SDL2-%{version}.tar.gz +Patch0: libSDL2-2.0.4-libwayland-1.9.93.patch License: zlib/libpng ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libGL-devel BuildRequires: libts-devel ## AUTOBUILDREQ-END +%ifarch x86_64 +Provides: libSDL2-2.0.so.1()(64bit) +%else +Provides: libSDL2-2.0.so.1 +%endif BuildRequires: cmake BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -33,15 +39,24 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -n SDL2-%{version} +%patch0 -p1 %build -%cmake -d build +%cmake -d build \ +\ +%ifarch arm + -DVIDEO_RPI=off +%endif + %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build +# legacy workaround +ln -s libSDL2-2.0.so.0 %{buildroot}%{_libdir}/libSDL2-2.0.so.1 + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -66,9 +81,15 @@ This package contains libraries and header files for developing applications tha %{_libdir}/libSDL2main.a %{_libdir}/pkgconfig/sdl2.pc %{_datadir}/aclocal/sdl2.m4 -%doc README-android.txt README-cmake.txt README-directfb.txt README-gesture.txt README-hg.txt README-ios.txt README-macosx.txt README-pandora.txt README-platforms.txt README-porting.txt README-psp.txt README-raspberrypi.txt README-SDL.txt README-touch.txt README.txt README-wince.txt +#%doc README-android.txt README-cmake.txt README-directfb.txt README-gesture.txt README-hg.txt README-ios.txt README-macosx.txt README-pandora.txt README-platforms.txt README-porting.txt README-psp.txt README-raspberrypi.txt README-SDL.txt README-touch.txt README.txt README-wince.txt %changelog +* Sun Feb 14 2016 Silvan Calarco 2.0.4-2mamba +- provide libSDL2-2.0.so.1 for legacy with previous version + +* Fri Jan 29 2016 Automatic Build System 2.0.4-1mamba +- automatic update by autodist + * Sat Jul 12 2014 Silvan Calarco 2.0.3-2mamba - rebuilt to fix wrong duplicated SDL2 added