Updated to 2.2.0

3 files changed, 4 insertions, 91 deletions

diff --git a/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch b/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
deleted file mode 100644
index d7b15fe..0000000
--- a/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 68758a879e0c8ecc0d40962516d4e808aa4e15e5
-Author: D G Turner <digitall@scummvm.org>
-Date:   Tue Dec 17 04:21:04 2019 +0000
-
-    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.
-
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 33a74a1524..f8c2412492 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"
-@@ -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/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch b/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
deleted file mode 100644
index 47f53c5..0000000
--- a/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6
-Author: D G Turner <digitall@scummvm.org>
-Date:   Sun Dec 15 22:22:20 2019 +0000
-
-    AUDIO: Fix Compilation Against Fluidsynth v2.1+
-    
-    This is as reported by eriktorbjorn.
-
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 4034b2ffc3..33a74a1524 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/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/PKGBUILD b/PKGBUILD
index 9ec9d27..4caec44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 # Arch version lacks additional optimization and hardening flags
 
 pkgname=scummvm
-pkgver=2.1.2
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('x86_64')
@@ -17,19 +17,8 @@ url="http://www.scummvm.org/"
 depends=('libpng' 'libtheora' 'sdl2' 'sdl2_net' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2'
          'libgl' 'glu' 'libjpeg-turbo' 'libmpeg2' 'curl' 'a52dec')
 makedepends=('mesa')
-source=("https://scummvm.org/frs/scummvm/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-        68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
-        8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch)
-b2sums=('0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2'
-        'cf1cf9652bd611bb38e3f4add677e91e9c4cd8fdbf9577433dccb4fb7a288f016f1dd4fc92ab55eb05d2fb1e4071902eec2b63eda8e3f2108b3ed2e63af05005'
-        'f3e4fd72d60b453e1393eb0af094fd39e63cf4617181a29ec950e9a6428dc5ccad8b2351bb0e0aa57e97b455aa94603c35a20822a1e88f45e2929920f0fbcd38')
-
-prepare() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}"/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
-  patch -Np1 -i "${srcdir}"/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
-}
+source=("https://scummvm.org/frs/scummvm/${pkgver}/${pkgname}-${pkgver}.tar.xz")
+b2sums=('b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -47,6 +36,6 @@ build() {
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
   install -Dm644 dists/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
 }