path: root/user/scummvm/fluidsynth.patch

Backport of upstream commits:

* 8593a9e
* 68758a8
* 8014f12

--- scummvm-2.1.0/audio/softsynth/fluidsynth.cpp.old	2019-10-04 21:41:29.000000000 +0000
+++ scummvm-2.1.0/audio/softsynth/fluidsynth.cpp	2020-01-13 08:21:46.705102910 +0000
@@ -20,10 +20,18 @@
  *
  */
 
-#include "common/scummsys.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #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 +43,6 @@
 #include "backends/platform/ios7/ios7_common.h"
 #endif
 
-#include <fluidsynth.h>
-
 class MidiDriver_FluidSynth : public MidiDriver_Emulated {
 private:
 	MidiChannel_MPU401 _midiChannels[16];