[arch-commits] Commit in spring/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, January 28, 2020 @ 04:26:49
  Author: foutrelis
Revision: 557239

Fix build with openal 1.20.x

Added:
  spring/trunk/fix-6358-compile-error-because-of-new-openal-version.patch
Modified:
  spring/trunk/PKGBUILD

------------------------------------------------------------+
 PKGBUILD                                                   |    5 +
 fix-6358-compile-error-because-of-new-openal-version.patch |   44 +++++++++++
 2 files changed, 49 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-28 04:26:44 UTC (rev 557238)
+++ PKGBUILD	2020-01-28 04:26:49 UTC (rev 557239)
@@ -15,8 +15,10 @@
 optdepends=('python2: 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)
 sha512sums=('be8922e798d7c959c248501494ab61cff625154c109debd324875a4e2a7149748224b6fcb428948f2b4d66cc9e484bc002a63810f55c5f25a499c34a01dfc225'
+            '76cf4c596f87f8306ad19ae82d68a36db250fbf7e2e3656c05453be761d13fd1a5cbc8e6499c24b46af993566ed624da744b9e21b240627c214ae4b505f0701b'
             'ba8a6f3031c7507983f2ae10de9f19b27434cd9159df6ce431d1f83b21b37974e8add4bea8bc0d738f88f5bfebdbeeacaeb3964b9db31b5181d12bed66ff2109')
 
 prepare() {
@@ -25,6 +27,9 @@
   # 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
 }
 
 build() {

Added: fix-6358-compile-error-because-of-new-openal-version.patch
===================================================================
--- fix-6358-compile-error-because-of-new-openal-version.patch	                        (rev 0)
+++ fix-6358-compile-error-because-of-new-openal-version.patch	2020-01-28 04:26:49 UTC (rev 557239)
@@ -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