From e55f340ddf704f3953dfa36fed99bc59c1d00e0a Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 14 Sep 2020 16:23:23 +0200
Subject: [PATCH] scummvm, bump version (#5281)

---
 .../patches/scummvm-2.1-fluidsynth.patch      | 39 -------------------
 ...mmvm-2.1.2.recipe => scummvm-2.2.0.recipe} |  5 +--
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 games-engines/scummvm/patches/scummvm-2.1-fluidsynth.patch
 rename games-engines/scummvm/{scummvm-2.1.2.recipe => scummvm-2.2.0.recipe} (95%)

diff --git a/games-engines/scummvm/patches/scummvm-2.1-fluidsynth.patch b/games-engines/scummvm/patches/scummvm-2.1-fluidsynth.patch
deleted file mode 100644
index 6b4760e16..000000000
--- a/games-engines/scummvm/patches/scummvm-2.1-fluidsynth.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 33a74a15247..f8c2412492e 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/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"
diff --git a/games-engines/scummvm/scummvm-2.1.2.recipe b/games-engines/scummvm/scummvm-2.2.0.recipe
similarity index 95%
rename from games-engines/scummvm/scummvm-2.1.2.recipe
rename to games-engines/scummvm/scummvm-2.2.0.recipe
index 4c73688d9..95308f5eb 100644
--- a/games-engines/scummvm/scummvm-2.1.2.recipe
+++ b/games-engines/scummvm/scummvm-2.2.0.recipe
@@ -9,9 +9,8 @@ COPYRIGHT="2001-2020 ScummVM Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://www.scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.gz"
-CHECKSUM_SHA256="f24e693c169a4c18fa545026dc97cc2eb90b8fa85b1c20ec33a45ca397f04f89"
-ADDITIONAL_FILES="scummvm.rdef.in"
-PATCHES="scummvm-${portVersion%.*}-fluidsynth.patch"
+CHECKSUM_SHA256="6ec5bd63b73861c10ca9869f27a74989a9ad6013bad30a1ef70de6ec146c2cb5"
+ADDITIONAL_FILES="scummvm.rdef.in
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"