[spring] 09/29: Refresh sdl-debian.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository spring.

commit 7fa3e580200ac491aac05e04f54c2d1adda0d4d1
Author: Markus Koschany <apo at debian.org>
Date:   Tue Oct 3 15:47:31 2017 +0200

    Refresh sdl-debian.patch
---
 debian/patches/glShaderSource.patch |  2 +-
 debian/patches/sdl-debian.patch     | 62 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/debian/patches/glShaderSource.patch b/debian/patches/glShaderSource.patch
index fbb4d49..cc67df2 100644
--- a/debian/patches/glShaderSource.patch
+++ b/debian/patches/glShaderSource.patch
@@ -11,7 +11,7 @@ Forwarded: http://springrts.com/mantis/view.php?id=4208
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rts/lib/headlessStubs/glstub.c b/rts/lib/headlessStubs/glstub.c
-index 0de7682..a86bb90 100644
+index 158e072..490f350 100644
 --- a/rts/lib/headlessStubs/glstub.c
 +++ b/rts/lib/headlessStubs/glstub.c
 @@ -122,7 +122,7 @@ GLAPI void APIENTRY glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *l
diff --git a/debian/patches/sdl-debian.patch b/debian/patches/sdl-debian.patch
new file mode 100644
index 0000000..44fb6df
--- /dev/null
+++ b/debian/patches/sdl-debian.patch
@@ -0,0 +1,62 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 3 Oct 2017 15:47:04 +0200
+Subject: sdl debian
+
+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 334d36d..fffc8a0 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})
+ include_directories(${CMAKE_SOURCE_DIR}/rts/lib/slimsig/include)
+ # This list was created using this *nix shell command:
+diff --git a/rts/builds/dedicated/CMakeLists.txt b/rts/builds/dedicated/CMakeLists.txt
+index 80e9e4b..11a3bd3 100644
+--- a/rts/builds/dedicated/CMakeLists.txt
++++ b/rts/builds/dedicated/CMakeLists.txt
+@@ -63,6 +63,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 829c5e1..438c458 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 930ca2b..c92a578 100644
+--- a/rts/lib/headlessStubs/CMakeLists.txt
++++ b/rts/lib/headlessStubs/CMakeLists.txt
+@@ -18,6 +18,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})
+ SET_TARGET_PROPERTIES(headlessStubs PROPERTIES COMPILE_FLAGS "${PIC_FLAG}")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 49e1b77..a1b836b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 glShaderSource.patch
 reproducible.patch
+sdl-debian.patch

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