diff --git a/.abf.yml b/.abf.yml index 208e592..4e93737 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - SDL2-2.0.0.tar.gz: a907eb5203abad6649c1eae0120d96c0a1931350 + SDL2-2.0.1.tar.gz: e40051311b648e4e60ed1683f62a948d93a0a49f diff --git a/SDL2-2.0.1-cmake-joystick.patch b/SDL2-2.0.1-cmake-joystick.patch new file mode 100644 index 0000000..a891494 --- /dev/null +++ b/SDL2-2.0.1-cmake-joystick.patch @@ -0,0 +1,12 @@ +diff -urN SDL2-2.0.1/CMakeLists.txt SDL2-2.0.1-patched/CMakeLists.txt +--- SDL2-2.0.1/CMakeLists.txt 2013-10-24 15:05:29.000000000 +1100 ++++ SDL2-2.0.1-patched/CMakeLists.txt 2013-10-30 01:03:14.602543486 +1100 +@@ -551,7 +551,7 @@ + endif(NOT SDL_${_OPT}) + endforeach() + if(SDL_JOYSTICK) +- file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/*.c) ++ file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/*.c ${SDL2_SOURCE_DIR}/src/core/linux/SDL_udev.c) + set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES}) + endif(SDL_JOYSTICK) + if(SDL_HAPTIC) diff --git a/SDL2.spec b/SDL2.spec index c9815a3..24ff972 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -1,17 +1,18 @@ %define api 2.0 -%define major 0 +%define major 1 %define libname %mklibname %{name}_ %{api} %{major} %define devname %mklibname %{name} -d Summary: Simple DirectMedia Layer Name: SDL2 -Version: 2.0.0 -Release: 2 +Version: 2.0.1 +Release: 1 License: Zlib Group: System/Libraries Url: http://www.libsdl.org/ Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Patch0: SDL2-2.0.0-cmake.patch +Patch1: SDL2-2.0.1-cmake-joystick.patch BuildRequires: nas-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbus-1) @@ -77,16 +78,7 @@ applications which will use %{name}. %apply_patches %build -#configure2_5x \ -# --disable-static \ -# --disable-esd \ -# --disable-oss \ -# --enable-pulseaudio \ -# --enable-pulseaudio-shared \ -# --enable-alsa \ -# --enable-alsa-shared - -%cmake +%cmake -DRPATH:BOOL=OFF %make %install