[arch-commits] Commit in spring/trunk (PKGBUILD glew1.11.patch optional.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, October 8, 2014 @ 11:14:58
  Author: svenstaro
Revision: 120390

upgpkg: spring 98.0-2

upstream release 0.98

Modified:
  spring/trunk/PKGBUILD
Deleted:
  spring/trunk/glew1.11.patch
  spring/trunk/optional.patch

----------------+
 PKGBUILD       |   16 ++++------------
 glew1.11.patch |   13 -------------
 optional.patch |   19 -------------------
 3 files changed, 4 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-08 08:23:34 UTC (rev 120389)
+++ PKGBUILD	2014-10-08 09:14:58 UTC (rev 120390)
@@ -4,8 +4,8 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=97.0
-pkgrel=4
+pkgver=98.0
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64')
 url="http://springrts.com/"
@@ -16,12 +16,8 @@
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
-        optional.patch
-        glew1.11.patch)
-md5sums=('cf37518379c2a3a8c3c9cd689ee9b034'
-         'd7904319b17c32299b44594ccb6ff4ea'
-         'd4ec0dc8e3bce4138de4415cc445c77e')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma)
+md5sums=('fbe60dff4d39918157869f45738e0a8a')
 
 build() {
   bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
@@ -28,10 +24,6 @@
   
   cd spring_${pkgver}
 
-  sed -i "/ory(test)/d" tools/unitsync/CMakeLists.txt
-  patch -Np1 < $srcdir/optional.patch
-  patch -Np1 < $srcdir/glew1.11.patch
-
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DDATADIR=share/spring \

Deleted: glew1.11.patch
===================================================================
--- glew1.11.patch	2014-10-08 08:23:34 UTC (rev 120389)
+++ glew1.11.patch	2014-10-08 09:14:58 UTC (rev 120390)
@@ -1,13 +0,0 @@
-diff --git a/rts/Rendering/GL/myGL.cpp b/rts/Rendering/GL/myGL.cpp
-index 07b7472..41c9a78 100644
---- a/rts/Rendering/GL/myGL.cpp
-+++ b/rts/Rendering/GL/myGL.cpp
-@@ -76,7 +76,7 @@ void PrintAvailableResolutions()
- #else
- 	#define _APIENTRY
- #endif
--void _APIENTRY OpenGLDebugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam)
-+void _APIENTRY OpenGLDebugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const GLvoid* userParam)
- {
- 	std::string sourceStr;
- 	std::string typeStr;

Deleted: optional.patch
===================================================================
--- optional.patch	2014-10-08 08:23:34 UTC (rev 120389)
+++ optional.patch	2014-10-08 09:14:58 UTC (rev 120390)
@@ -1,19 +0,0 @@
-diff --git a/rts/System/ThreadPool.cpp b/rts/System/ThreadPool.cpp
-index 0ce4b11..34e53ab 100644
---- a/rts/System/ThreadPool.cpp
-+++ b/rts/System/ThreadPool.cpp
-@@ -136,12 +136,11 @@ static bool DoTask(boost::shared_lock<boost::shared_mutex>& lk_)
- static bool DoTask(std::shared_ptr<ITaskGroup> tg)
- {
- 	auto p = tg->GetTask();
--	const bool f = p;
--	if (f) {
-+	if (p) {
- 		SCOPED_MT_TIMER("::ThreadWorkers (accumulated)");
- 		(*p)();
- 	}
--	return f;
-+	return static_cast<bool>(p);
- }
- 
-