From ec09de52ad24ea6458d7a34455a94222bfa50cb6 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:06 +0200
Subject: [PATCH] scummvm: rebuild for fluidsynth 2.1.1

---
 .../patches/Fluidsynth-v2.1-part1.patch       | 27 ++++++++++
 .../patches/Fluidsynth-v2.1-part2.patch       | 53 +++++++++++++++++++
 srcpkgs/scummvm/template                      |  2 +-
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch

diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
new file mode 100644
index 00000000000..ef7ff6e8871
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
@@ -0,0 +1,27 @@
+From 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Sun, 15 Dec 2019 22:22:20 +0000
+Subject: [PATCH] AUDIO: Fix Compilation Against Fluidsynth v2.1+
+
+This is as reported by eriktorbjorn.
+---
+ audio/softsynth/fluidsynth.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 4034b2ffc36..33a74a15247 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -35,7 +35,12 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
++// needed to allow compilation, as reported by eriktorbjorn on 20191215
++// This is in include/fluidsynth/log.h around line 82
++#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+ #include <fluidsynth.h>
++#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+ 
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
new file mode 100644
index 00000000000..4b948dd21f7
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
@@ -0,0 +1,53 @@
+From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Tue, 17 Dec 2019 04:21:04 +0000
+Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+
+The previous fix did not work as the forbidden exception had no effect
+since scummsys.h and thus forbidden.h had already been included prior
+to the fluidsynth header being included. This also meant that undefining
+the exception define after the header would have had no effect anyway.
+
+This new solution was suggest by eriktorbjorn on bug #11278 and should
+avoid the need to add an exception which would persist over the entire
+source file.
+---
+ audio/softsynth/fluidsynth.cpp | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 33a74a15247..f8c2412492e 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -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,13 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
+-// needed to allow compilation, as reported by eriktorbjorn on 20191215
+-// This is in include/fluidsynth/log.h around line 82
+-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+-#include <fluidsynth.h>
+-#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 783e7a43576..12be03569aa 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"