diff --git a/games-engines/scummvm/patches/scummvm-2.1-fluidsynth.patch b/games-engines/scummvm/patches/scummvm-2.1-fluidsynth.patch new file mode 100644 index 000000000..6b4760e16 --- /dev/null +++ b/games-engines/scummvm/patches/scummvm-2.1-fluidsynth.patch @@ -0,0 +1,39 @@ +From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001 +From: D G Turner +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 ++ ++#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.1.recipe b/games-engines/scummvm/scummvm-2.1.2.recipe similarity index 96% rename from games-engines/scummvm/scummvm-2.1.1.recipe rename to games-engines/scummvm/scummvm-2.1.2.recipe index 3e42e2311..4c73688d9 100644 --- a/games-engines/scummvm/scummvm-2.1.1.recipe +++ b/games-engines/scummvm/scummvm-2.1.2.recipe @@ -7,10 +7,11 @@ were never designed!" HOMEPAGE="https://www.scummvm.org/" COPYRIGHT="2001-2020 ScummVM Team" LICENSE="GNU GPL v2" -REVISION="4" +REVISION="1" SOURCE_URI="http://www.scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.gz" -CHECKSUM_SHA256="b03396c7008015e7e7effee528f0d05d92d6bf38b6bca8dd3978a46f09552051" +CHECKSUM_SHA256="f24e693c169a4c18fa545026dc97cc2eb90b8fa85b1c20ec33a45ca397f04f89" ADDITIONAL_FILES="scummvm.rdef.in" +PATCHES="scummvm-${portVersion%.*}-fluidsynth.patch" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86"