[arch-commits] Commit in spring/repos (3 files)

[Evangelos Foutras]

    Date: Tuesday, September 18, 2018 @ 04:46:23
  Author: foutrelis
Revision: 382913

archrelease: copy trunk to community-staging-x86_64

Added:
  spring/repos/community-staging-x86_64/
  spring/repos/community-staging-x86_64/PKGBUILD
    (from rev 382912, spring/trunk/PKGBUILD)
  spring/repos/community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch
    (from rev 382912, spring/trunk/fix-reinterpret_cast-in-constexpr.patch)

-----------------------------------------+
 PKGBUILD                                |   50 ++++++++++++++++++++++++++++++
 fix-reinterpret_cast-in-constexpr.patch |   15 +++++++++
 2 files changed, 65 insertions(+)

Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 382912, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2018-09-18 04:46:23 UTC (rev 382913)
@@ -0,0 +1,50 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=104.0
+pkgrel=4
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2' 'libunwind'
+         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'jdk8-openjdk' 'mesa')
+optdepends=('python2: python-based bots'
+            'java-runtime: java-based bots')
+source=(https://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+        fix-reinterpret_cast-in-constexpr.patch)
+sha512sums=('be8922e798d7c959c248501494ab61cff625154c109debd324875a4e2a7149748224b6fcb428948f2b4d66cc9e484bc002a63810f55c5f25a499c34a01dfc225'
+            'ba8a6f3031c7507983f2ae10de9f19b27434cd9159df6ce431d1f83b21b37974e8add4bea8bc0d738f88f5bfebdbeeacaeb3964b9db31b5181d12bed66ff2109')
+
+prepare() {
+  cd spring_$pkgver
+
+  # https://springrts.com/mantis/view.php?id=5781
+  # https://github.com/spring/spring/commit/6104061fe3
+  patch -Np1 -i ../fix-reinterpret_cast-in-constexpr.patch
+}
+
+build() {
+  cd spring_${pkgver}
+
+  cmake	. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDATADIR=share/spring \
+    -DJAVA_HOME=/usr/lib/jvm/java-8-openjdk \
+    -DCMAKE_SKIP_RPATH=ON
+  make
+}
+
+package() {
+  cd spring_${pkgver}
+
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/etc/spring"
+  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:

Copied: spring/repos/community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch (from rev 382912, spring/trunk/fix-reinterpret_cast-in-constexpr.patch)
===================================================================
--- community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch	                        (rev 0)
+++ community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch	2018-09-18 04:46:23 UTC (rev 382913)
@@ -0,0 +1,15 @@
+diff --git a/rts/Rendering/GL/myGL.cpp b/rts/Rendering/GL/myGL.cpp
+index 5abef32ce0..95a786970c 100644
+--- a/rts/Rendering/GL/myGL.cpp
++++ b/rts/Rendering/GL/myGL.cpp
+@@ -146,8 +147,8 @@ static bool GetVideoMemInfoMESA(GLint* memInfo)
+ 
+ 	typedef PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC QCRIProc;
+ 
+-	static constexpr const GLubyte* qcriProcName = (const GLubyte*) "glXQueryCurrentRendererIntegerMESA";
+-	static           const QCRIProc qcriProcAddr = (QCRIProc) glXGetProcAddress(qcriProcName);
++	static const     char qcriProcName[] = "glXQueryCurrentRendererIntegerMESA";
++	static const QCRIProc qcriProcAddr   = (QCRIProc) glXGetProcAddress(reinterpret_cast<const GLubyte*>(qcriProcName));
+ 
+ 	if (qcriProcAddr == nullptr)
+ 		return false;