diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-13 09:00:59 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-13 09:00:59 +0000 |
| commit | 3a5eb59dc72572666a8d51a489cb396f23526541 (patch) | |
| tree | 26caeb985595194b928a3312fecb9b16a31523eb /user/scummvm/fluidsynth.patch | |
| parent | 24bb84929c1fcdfd3cab369b94ce63b02b7e3c7c (diff) | |
| download | packages-3a5eb59dc72572666a8d51a489cb396f23526541.tar.gz packages-3a5eb59dc72572666a8d51a489cb396f23526541.tar.bz2 packages-3a5eb59dc72572666a8d51a489cb396f23526541.tar.xz packages-3a5eb59dc72572666a8d51a489cb396f23526541.zip | |
user/*: Modernise / fix syntax / deps / code
Diffstat (limited to 'user/scummvm/fluidsynth.patch')
| -rw-r--r-- | user/scummvm/fluidsynth.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/user/scummvm/fluidsynth.patch b/user/scummvm/fluidsynth.patch new file mode 100644 index 000000000..a815cc705 --- /dev/null +++ b/user/scummvm/fluidsynth.patch @@ -0,0 +1,37 @@ +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]; |