[spring] 11/28: Rebase sdl-debian.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository spring.

commit 30b31f16bcdd35bca7f577715fce25505d577217
Author: Markus Koschany <apo at debian.org>
Date:   Sat Mar 5 13:51:05 2016 +0100

    Rebase sdl-debian.patch
---
 debian/patches/sdl-debian.patch | 64 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 65 insertions(+)

diff --git a/debian/patches/sdl-debian.patch b/debian/patches/sdl-debian.patch
new file mode 100644
index 0000000..c67b321
--- /dev/null
+++ b/debian/patches/sdl-debian.patch
@@ -0,0 +1,64 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 5 Mar 2016 13:50:19 +0100
+Subject: sdl debian
+
+Include Debian's SDL.h.
+
+Forwarded: not-needed
+---
+ rts/aGui/CMakeLists.txt              | 2 ++
+ rts/builds/dedicated/CMakeLists.txt  | 1 +
+ rts/builds/headless/CMakeLists.txt   | 1 +
+ rts/lib/headlessStubs/CMakeLists.txt | 2 ++
+ 4 files changed, 6 insertions(+)
+
+diff --git a/rts/aGui/CMakeLists.txt b/rts/aGui/CMakeLists.txt
+index 258ac52..eff31cf 100644
+--- a/rts/aGui/CMakeLists.txt
++++ b/rts/aGui/CMakeLists.txt
+@@ -7,6 +7,8 @@ ELSE  (MINGW OR APPLE OR MSVC)
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
+ ENDIF (MINGW OR APPLE OR MSVC)
+ 
++INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
++
+ include_directories(${GLEW_INCLUDE_DIR})
+ # This list was created using this *nix shell command:
+ # > find . -name "*.cpp"" | sort
+diff --git a/rts/builds/dedicated/CMakeLists.txt b/rts/builds/dedicated/CMakeLists.txt
+index abd72b4..cfde11e 100644
+--- a/rts/builds/dedicated/CMakeLists.txt
++++ b/rts/builds/dedicated/CMakeLists.txt
+@@ -62,6 +62,7 @@ ELSE  (MINGW OR APPLE)
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
+ ENDIF (MINGW OR APPLE)
+ 
++INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
+ 
+ ### Assemble the incude dirs
+ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
+diff --git a/rts/builds/headless/CMakeLists.txt b/rts/builds/headless/CMakeLists.txt
+index c296543..a409293 100644
+--- a/rts/builds/headless/CMakeLists.txt
++++ b/rts/builds/headless/CMakeLists.txt
+@@ -31,6 +31,7 @@ ELSE  ()
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
+ ENDIF ()
+ 
++INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
+ 
+ # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL (yes really!)
+ LIST(APPEND engineHeadlessLibraries headlessStubs)
+diff --git a/rts/lib/headlessStubs/CMakeLists.txt b/rts/lib/headlessStubs/CMakeLists.txt
+index 63c44bb..e5e84d0 100644
+--- a/rts/lib/headlessStubs/CMakeLists.txt
++++ b/rts/lib/headlessStubs/CMakeLists.txt
+@@ -19,6 +19,8 @@ ELSE  (WIN32)
+ 	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include/SDL2)
+ ENDIF (WIN32)
+ 
++INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
++
+ ADD_LIBRARY(headlessStubs STATIC EXCLUDE_FROM_ALL ${headlessStubsSources})
+ TARGET_LINK_LIBRARIES(headlessStubs ${Boost_THREAD_LIBRARY} ${Boost_CHRONO_LIBRARY_WITH_RT})
+ SET_TARGET_PROPERTIES(headlessStubs PROPERTIES COMPILE_FLAGS "${PIC_FLAG}")
diff --git a/debian/patches/series b/debian/patches/series
index 74a1402..dfb098a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 glShaderSource.patch
+sdl-debian.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git