[spring] 06/12: Update sdl-debian.patch for new release

[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 3f9ad5028ee5fe86c912dfc696318853ea18044b
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Jul 6 01:33:36 2015 +0200

    Update sdl-debian.patch for new release
---
 debian/patches/sdl-debian.patch | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/patches/sdl-debian.patch b/debian/patches/sdl-debian.patch
index 71ce6ca..d7db949 100644
--- a/debian/patches/sdl-debian.patch
+++ b/debian/patches/sdl-debian.patch
@@ -3,17 +3,31 @@ Date: Mon, 2 Jun 2014 20:06:30 +0200
 Subject: sdl debian
 
 ---
+ rts/aGui/CMakeLists.txt              | 2 ++
  rts/builds/dedicated/CMakeLists.txt  | 1 +
  rts/builds/headless/CMakeLists.txt   | 1 +
  rts/lib/headlessStubs/CMakeLists.txt | 2 ++
  tools/unitsync/CMakeLists.txt        | 1 +
- 4 files changed, 5 insertions(+)
+ 5 files changed, 7 insertions(+)
 
+diff --git a/rts/aGui/CMakeLists.txt b/rts/aGui/CMakeLists.txt
+index 0f4dec7..85a38cf 100644
+--- a/rts/aGui/CMakeLists.txt
++++ b/rts/aGui/CMakeLists.txt
+@@ -7,6 +7,8 @@ ELSE  (MINGW OR APPLE)
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
+ ENDIF (MINGW OR APPLE)
+ 
++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 35de881..4fb0d42 100644
+index 0cb2005..057f063 100644
 --- a/rts/builds/dedicated/CMakeLists.txt
 +++ b/rts/builds/dedicated/CMakeLists.txt
-@@ -58,6 +58,7 @@ ELSE  (MINGW OR APPLE)
+@@ -62,6 +62,7 @@ ELSE  (MINGW OR APPLE)
  	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
  ENDIF (MINGW OR APPLE)
  
@@ -22,10 +36,10 @@ index 35de881..4fb0d42 100644
  ### 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 bc6bd04..5d2e730 100644
+index 4bebd46..9ac13b1 100644
 --- a/rts/builds/headless/CMakeLists.txt
 +++ b/rts/builds/headless/CMakeLists.txt
-@@ -30,6 +30,7 @@ ELSE  (MINGW OR APPLE)
+@@ -31,6 +31,7 @@ ELSE  (MINGW OR APPLE)
  	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
  ENDIF (MINGW OR APPLE)
  
@@ -34,7 +48,7 @@ index bc6bd04..5d2e730 100644
  # 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..547ec68 100644
+index 63c44bb..e5e84d0 100644
 --- a/rts/lib/headlessStubs/CMakeLists.txt
 +++ b/rts/lib/headlessStubs/CMakeLists.txt
 @@ -19,6 +19,8 @@ ELSE  (WIN32)
@@ -47,7 +61,7 @@ index 63c44bb..547ec68 100644
  TARGET_LINK_LIBRARIES(headlessStubs ${Boost_THREAD_LIBRARY} ${Boost_CHRONO_LIBRARY_WITH_RT})
  SET_TARGET_PROPERTIES(headlessStubs PROPERTIES COMPILE_FLAGS "${PIC_FLAG}")
 diff --git a/tools/unitsync/CMakeLists.txt b/tools/unitsync/CMakeLists.txt
-index 7c01a7a..a969430 100644
+index c2f3b91..0380a71 100644
 --- a/tools/unitsync/CMakeLists.txt
 +++ b/tools/unitsync/CMakeLists.txt
 @@ -33,6 +33,7 @@ ELSE  (MINGW)

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