residualvm: rebuild and patch against fluidsynth 2.1.1

This commit is contained in:
fosslinux 2019-12-30 05:06:30 +00:00 committed by Piotr Wójcik
parent 62e0d2ba9f
commit 58cddcc968
2 changed files with 30 additions and 1 deletions

View file

@ -0,0 +1,29 @@
--- audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000
+++ audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000
@@ -20,10 +20,16 @@
*
*/
-#include "common/scummsys.h"
+#include "config.h"
#ifdef USE_FLUIDSYNTH
+// Fluidsynth v2.1+ uses printf in one of it's headers,
+// include/fluidsynth/log.h around line 82 so need to include this
+// prior scummsys.h inclusion and thus forbidden.h
+#include <fluidsynth.h>
+
+#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/error.h"
#include "common/system.h"
@@ -35,8 +41,6 @@
#include "backends/platform/ios7/ios7_common.h"
#endif
-#include <fluidsynth.h>
-
class MidiDriver_FluidSynth : public MidiDriver_Emulated {
private:
MidiChannel_MPU401 _midiChannels[16];

View file

@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
revision=2
revision=3
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"