[arch-commits] Commit in spring/repos (5 files)
Felix Yan
felixonmars at archlinux.org
Sun Dec 6 22:00:24 UTC 2020
Date: Sunday, December 6, 2020 @ 22:00:24
Author: felixonmars
Revision: 771232
archrelease: copy trunk to community-staging-x86_64
Added:
spring/repos/community-staging-x86_64/
spring/repos/community-staging-x86_64/PKGBUILD
(from rev 771230, spring/trunk/PKGBUILD)
spring/repos/community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
(from rev 771230, spring/trunk/fix-6358-compile-error-because-of-new-openal-version.patch)
spring/repos/community-staging-x86_64/fix-include.patch
(from rev 771230, spring/trunk/fix-include.patch)
spring/repos/community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch
(from rev 771230, spring/trunk/fix-reinterpret_cast-in-constexpr.patch)
------------------------------------------------------------+
PKGBUILD | 59 +++++++++++
fix-6358-compile-error-because-of-new-openal-version.patch | 44 ++++++++
fix-include.patch | 12 ++
fix-reinterpret_cast-in-constexpr.patch | 15 ++
4 files changed, 130 insertions(+)
Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 771230, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2020-12-06 22:00:24 UTC (rev 771232)
@@ -0,0 +1,59 @@
+# 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=10
+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' 'python' 'jdk8-openjdk' 'mesa')
+optdepends=('python: python-based bots'
+ 'java-runtime: java-based bots')
+source=(https://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+ fix-6358-compile-error-because-of-new-openal-version.patch
+ fix-reinterpret_cast-in-constexpr.patch
+ fix-include.patch)
+sha512sums=('be8922e798d7c959c248501494ab61cff625154c109debd324875a4e2a7149748224b6fcb428948f2b4d66cc9e484bc002a63810f55c5f25a499c34a01dfc225'
+ '76cf4c596f87f8306ad19ae82d68a36db250fbf7e2e3656c05453be761d13fd1a5cbc8e6499c24b46af993566ed624da744b9e21b240627c214ae4b505f0701b'
+ 'ba8a6f3031c7507983f2ae10de9f19b27434cd9159df6ce431d1f83b21b37974e8add4bea8bc0d738f88f5bfebdbeeacaeb3964b9db31b5181d12bed66ff2109'
+ '0fd54748e3dfa3792ff66b6cbe2c482f1d553033dc48f6279863ad0b07aaff15069669b1d1d85be11e89fdad2faba5f16e4b9c99af718da0152ac9aba7b0f75a')
+
+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
+
+ # https://springrts.com/mantis/view.php?id=6358
+ patch -Np1 -i ../fix-6358-compile-error-because-of-new-openal-version.patch
+
+ patch -Np1 -i ../fix-include.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}
+
+ DESTDIR="$pkgdir" make 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-6358-compile-error-because-of-new-openal-version.patch (from rev 771230, spring/trunk/fix-6358-compile-error-because-of-new-openal-version.patch)
===================================================================
--- community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch (rev 0)
+++ community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch 2020-12-06 22:00:24 UTC (rev 771232)
@@ -0,0 +1,44 @@
+From d159c9f0d21d3bc96c85063cc258b6fd8ec1be2d Mon Sep 17 00:00:00 2001
+From: abma <spring at abma.de>
+Date: Mon, 6 Jan 2020 11:16:25 +0100
+Subject: [PATCH] fix #6358: compile error because of new openal version /
+ changed struct
+
+---
+ rts/System/Sound/OpenAL/Sound.cpp | 1 -
+ rts/System/Sound/OpenAL/Sound.h | 3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/rts/System/Sound/OpenAL/Sound.cpp b/rts/System/Sound/OpenAL/Sound.cpp
+index 50bc40e8c4..9ea2ad6a73 100644
+--- a/rts/System/Sound/OpenAL/Sound.cpp
++++ b/rts/System/Sound/OpenAL/Sound.cpp
+@@ -4,7 +4,6 @@
+
+ #include <cstdlib>
+ #include <cmath>
+-#include <alc.h>
+
+ #ifndef ALC_ALL_DEVICES_SPECIFIER
+ #define ALC_ALL_DEVICES_SPECIFIER 0x1013
+diff --git a/rts/System/Sound/OpenAL/Sound.h b/rts/System/Sound/OpenAL/Sound.h
+index 11d36ef86c..d362cb5b39 100644
+--- a/rts/System/Sound/OpenAL/Sound.h
++++ b/rts/System/Sound/OpenAL/Sound.h
+@@ -5,6 +5,7 @@
+
+ #include <string>
+ #include <vector>
++#include <alc.h>
+
+ #include "System/Sound/ISound.h"
+ #include "System/float3.h"
+@@ -16,8 +17,6 @@
+ class CSoundSource;
+ class SoundBuffer;
+ class SoundItem;
+-struct ALCdevice_struct;
+-typedef struct ALCdevice_struct ALCdevice;
+
+ /// Default sound system implementation (OpenAL)
+ class CSound : public ISound
Copied: spring/repos/community-staging-x86_64/fix-include.patch (from rev 771230, spring/trunk/fix-include.patch)
===================================================================
--- community-staging-x86_64/fix-include.patch (rev 0)
+++ community-staging-x86_64/fix-include.patch 2020-12-06 22:00:24 UTC (rev 771232)
@@ -0,0 +1,12 @@
+diff --git a/rts/System/Sync/SHA512.cpp b/rts/System/Sync/SHA512.cpp
+index ab4e973a23..adc9b3ee47 100644
+--- a/rts/System/Sync/SHA512.cpp
++++ b/rts/System/Sync/SHA512.cpp
+@@ -2,6 +2,7 @@
+
+ #include <cassert>
+ #include <cstring>
++#include <cstdio>
+
+ #include "SHA512.hpp"
+
Copied: spring/repos/community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch (from rev 771230, 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 2020-12-06 22:00:24 UTC (rev 771232)
@@ -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;
More information about the arch-commits
mailing list