Djam/SDL3
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/SDL3.git synced 2025-02-23 13:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New version 2.0.3

Browse source
This commit is contained in:
Andrey Bondrov 2014-06-08 21:22:29 +11:00
parent ad54632b79
commit 36c062a2a5
5 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
SDL2-2.0.1.tar.gz: e40051311b648e4e60ed1683f62a948d93a0a49f
SDL2-2.0.3.tar.gz: 21c45586a4e94d7622e371340edec5da40d06ecc

15
SDL2-2.0.0-cmake.patch
View file

@ -1,15 +0,0 @@
--- a/CMakeLists.txt 2013-08-12 06:57:53.000000000 +0400
+++ b/CMakeLists.txt 2013-09-12 15:08:44.000000000 +0400
@@ -143,9 +143,9 @@
set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
list(APPEND EXTRA_CFLAGS "$ENV{CFLAGS}")
endif("$ENV{CFLAGS}" STREQUAL "")
-if(NOT ("$ENV{CFLAGS}" STREQUAL "")) # Hackish, but does the trick on Win32
- list(APPEND EXTRA_LDFLAGS "$ENV{LDFLAGS}")
-endif(NOT ("$ENV{CFLAGS}" STREQUAL ""))
+#if(NOT ("$ENV{CFLAGS}" STREQUAL "")) # Hackish, but does the trick on Win32
+# list(APPEND EXTRA_LDFLAGS "$ENV{LDFLAGS}")
+#endif(NOT ("$ENV{CFLAGS}" STREQUAL ""))
# Those are used for pkg-config and friends, so that the SDL2.pc, sdl2-config,
# etc. are created correctly.

12
SDL2-2.0.1-cmake-joystick.patch
View file

@ -1,12 +0,0 @@
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)

13
SDL2-2.0.3-cmake.patch Normal file
View file

@ -0,0 +1,13 @@
diff -urN SDL2-2.0.3/CMakeLists.txt SDL2-2.0.3-patched/CMakeLists.txt
--- SDL2-2.0.3/CMakeLists.txt 2014-03-16 13:31:41.000000000 +1100
+++ SDL2-2.0.3-patched/CMakeLists.txt 2014-06-08 21:15:39.121190857 +1100
@@ -148,9 +148,6 @@
set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
list(APPEND EXTRA_CFLAGS "$ENV{CFLAGS}")
endif()
-if(NOT ("$ENV{CFLAGS}" STREQUAL "")) # Hackish, but does the trick on Win32
- list(APPEND EXTRA_LDFLAGS "$ENV{LDFLAGS}")
-endif()
if(MSVC)
option(FORCE_STATIC_VCRT "Force /MT for static VC runtimes" OFF)

9
SDL2.spec
View file

@ -1,3 +1,5 @@
# For some reasons we have libver here, it doesn't affect SONAME
%define libver 0.2.1
%define api 2.0
%define major 1
%define libname %mklibname %{name}_ %{api} %{major}
@ -5,14 +7,14 @@
Summary: Simple DirectMedia Layer
Name: SDL2
Version: 2.0.1
Version: 2.0.3
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
Patch0: SDL2-2.0.3-cmake.patch
#Patch1: SDL2-2.0.1-cmake-joystick.patch
BuildRequires: nas-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbus-1)
@ -48,6 +50,7 @@ linked with %{name}.
%files -n %{libname}
%doc README.txt README-SDL.txt CREDITS.txt COPYING.txt BUGS.txt WhatsNew.txt
%{_libdir}/libSDL2-%{api}.so.%{libver}
%{_libdir}/libSDL2-%{api}.so.%{major}*
#----------------------------------------------------------------------------