[spring/f19] - Version 94.1, major spring/springlobby upstream release. - Drop the E323AI UTC time patch. - Updat
Gilboa Davara
gilboa at fedoraproject.org
Wed Apr 3 07:30:31 UTC 2013
commit e606bd59fa8a53c878c333df047977ca6d7e9564
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date: Wed Apr 3 10:30:18 2013 +0300
- Version 94.1, major spring/springlobby upstream release.
- Drop the E323AI UTC time patch.
- Update the DSO, assimp-remove patches.
- pr-downloader still disabled due to excessive DSO issues.
.gitignore | 1 +
sources | 2 +-
spring-89-assimp-remove.patch | 10 +++---
spring-89-dso.patch | 52 ++++++++++----------------------
spring-94-disable-pr-downloader.patch | 25 ++++++++++++++++
5 files changed, 48 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb7a3e6..7bf28d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ spring_0.82.3_src.tar.lzma
/spring_89.0_src.tar.lzma
/spring_90.0_src.tar.lzma
/spring_91.0_src.tar.lzma
+/spring_94.1_src.tar.lzma
diff --git a/sources b/sources
index c9ce840..ed5138b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8849ace38f2ae20dc100b9d0a8d743e9 spring_91.0_src.tar.lzma
+bafc1e889bed31666553efc387a13b49 spring_94.1_src.tar.lzma
diff --git a/spring-89-assimp-remove.patch b/spring-89-assimp-remove.patch
index 4918c48..5b9ce8a 100644
--- a/spring-89-assimp-remove.patch
+++ b/spring-89-assimp-remove.patch
@@ -1,8 +1,8 @@
---- rts/lib/CMakeLists.txt.old 2012-07-16 11:03:12.800511295 +0300
-+++ rts/lib/CMakeLists.txt 2012-07-16 11:03:20.628441071 +0300
-@@ -10,7 +10,6 @@
- ADD_SUBDIRECTORY(md5)
- ADD_SUBDIRECTORY(lobby)
+--- rts/lib/CMakeLists.txt.old 2013-03-31 16:10:02.388476658 +0300
++++ rts/lib/CMakeLists.txt 2013-03-31 16:11:06.465879922 +0300
+@@ -7,7 +7,6 @@
+ ADD_SUBDIRECTORY(minizip)
+ ADD_SUBDIRECTORY(streflop)
ADD_SUBDIRECTORY(headlessStubs)
-ADD_SUBDIRECTORY(assimp)
diff --git a/spring-89-dso.patch b/spring-89-dso.patch
index dc876d3..2fb4bfa 100644
--- a/spring-89-dso.patch
+++ b/spring-89-dso.patch
@@ -1,5 +1,5 @@
---- rts/builds/dedicated/CMakeLists.txt.old 2012-07-16 09:03:54.652059698 +0300
-+++ rts/builds/dedicated/CMakeLists.txt 2012-07-16 09:04:24.368792712 +0300
+--- rts/builds/dedicated/CMakeLists.txt.old 2013-03-31 15:54:40.899139309 +0300
++++ rts/builds/dedicated/CMakeLists.txt 2013-03-31 16:03:46.763991972 +0300
@@ -43,6 +43,8 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
ENDIF (MINGW OR APPLE)
@@ -9,46 +9,26 @@
### Assemble the incude dirs
INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
---- rts/builds/default/CMakeLists.txt.old 2012-07-16 09:00:29.266904434 +0300
-+++ rts/builds/default/CMakeLists.txt 2012-07-16 09:02:33.093792356 +0300
-@@ -19,6 +19,8 @@
- FIND_PACKAGE_STATIC(GLEW 1.5.1 REQUIRED)
- LIST(APPEND engineLibraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES})
+--- rts/builds/default/CMakeLists.txt.old 2013-03-31 15:55:47.795508521 +0300
++++ rts/builds/default/CMakeLists.txt 2013-03-31 16:02:52.518503511 +0300
+@@ -87,6 +87,9 @@
+ SET(ENGINE_ICON "")
+ ENDIF (WIN32)
+FIND_PACKAGE(ZLIB REQUIRED)
+LIST(APPEND engineLibraries ${ZLIB_LIBRARY})
-
- FIND_PACKAGE_STATIC(Freetype REQUIRED)
- INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
---- rts/builds/headless/CMakeLists.txt.old 2012-07-16 09:04:37.071678580 +0300
-+++ rts/builds/headless/CMakeLists.txt 2012-07-16 09:05:16.974320042 +0300
-@@ -31,7 +31,6 @@
++
+ ### allow engineLibraries to be used in multithreaded, too
+ MakeGlobal(engineLibraries)
+ MakeGlobal(engineIncludes)
+--- rts/builds/headless/CMakeLists.txt.old 2013-03-31 15:57:43.874413963 +0300
++++ rts/builds/headless/CMakeLists.txt 2013-03-31 16:04:39.195497535 +0300
+@@ -31,6 +31,8 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
ENDIF (MINGW OR APPLE)
--
- # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL (yes really!)
- LIST(APPEND engineHeadlessLibraries headlessStubs)
-
-@@ -39,6 +38,9 @@
-
- LIST(APPEND engineHeadlessLibraries ${engineCommonLibraries})
-
+FIND_PACKAGE(ZLIB REQUIRED)
+LIST(APPEND engineHeadlessLibraries ${ZLIB_LIBRARY})
-+
- INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/lib/assimp/include)
-
-
---- rts/builds/multithreaded/CMakeLists.txt.old 2012-07-16 09:03:08.063478233 +0300
-+++ rts/builds/multithreaded/CMakeLists.txt 2012-07-16 09:03:34.077244540 +0300
-@@ -31,6 +31,9 @@
- FIND_PACKAGE(GLEW 1.5.1 REQUIRED)
- LIST(APPEND engineLibraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES})
-
-+FIND_PACKAGE(ZLIB REQUIRED)
-+LIST(APPEND engineLibraries ${ZLIB_LIBRARY})
-+
- FIND_PACKAGE_STATIC(Freetype REQUIRED)
- LIST(APPEND engineLibraries ${FREETYPE_LIBRARIES})
+ # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL (yes really!)
+ LIST(APPEND engineHeadlessLibraries headlessStubs)
diff --git a/spring-94-disable-pr-downloader.patch b/spring-94-disable-pr-downloader.patch
new file mode 100644
index 0000000..1729d5b
--- /dev/null
+++ b/spring-94-disable-pr-downloader.patch
@@ -0,0 +1,25 @@
+--- tools/CMakeLists.txt.old 2013-04-01 14:22:50.402820287 +0300
++++ tools/CMakeLists.txt 2013-04-01 14:23:05.079681789 +0300
+@@ -2,22 +2,6 @@
+ Add_Subdirectory(unitsync)
+ Add_Subdirectory(DemoTool)
+
+-If (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/pr-downloader/CMakeLists.txt")
+- # only add this if the submodule is present
+- find_package(CURL)
+- If (CURL_FOUND)
+- set(CMAKE_BUILD_TYPE "RELEASE")
+- Add_Subdirectory(pr-downloader)
+- # add install-pr-downloader target
+- Set(myInstallDeps pr-downloader)
+- Set(myInstallDirs "tools/pr-downloader")
+- CreateInstallTarget("pr-downloader" myInstallDeps myInstallDirs)
+-
+- Else(CURL_FOUND)
+- MESSAGE(STATUS "pr-downloader will NOT be generated/installed; libcurl not found")
+- EndIf(CURL_FOUND)
+-EndIf (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/pr-downloader/CMakeLists.txt")
+-
+ # This is not part of the official source package
+ if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dirchange)
+ Add_Subdirectory(dirchange)
More information about the scm-commits
mailing list