Date: Saturday, February 15, 2020 @ 23:26:06 Author: svenstaro Revision: 572027
upgpkg: scummvm 2.1.1-1 Added: scummvm/trunk/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch scummvm/trunk/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch Modified: scummvm/trunk/PKGBUILD ------------------------------------------------+ 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch | 51 +++++++++++++++++++++++ 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch | 25 +++++++++++ PKGBUILD | 19 ++++++-- 3 files changed, 91 insertions(+), 4 deletions(-) Added: 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch =================================================================== --- 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch (rev 0) +++ 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch 2020-02-15 23:26:06 UTC (rev 572027) @@ -0,0 +1,51 @@ +commit 68758a879e0c8ecc0d40962516d4e808aa4e15e5 +Author: D G Turner <[email protected]> +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]; Added: 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch =================================================================== --- 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch (rev 0) +++ 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch 2020-02-15 23:26:06 UTC (rev 572027) @@ -0,0 +1,25 @@ +commit 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 +Author: D G Turner <[email protected]> +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: Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-15 23:25:50 UTC (rev 572026) +++ PKGBUILD 2020-02-15 23:26:06 UTC (rev 572027) @@ -3,8 +3,8 @@ # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=2.1.0 -pkgrel=2 +pkgver=2.1.1 +pkgrel=1 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('x86_64') license=('GPL') @@ -12,9 +12,20 @@ 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}/scummvm-${pkgver}.tar.xz";) -sha512sums=('9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218') +source=("https://scummvm.org/frs/scummvm/${pkgver}/scummvm-${pkgver}.tar.xz"; + 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch + 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch) +sha512sums=('ed4b3519f1ac099a1f939ebc1b8e339fb32bcd7259acd82c8fb18054625bf189d24fa0363eff6cbc2804d9ee74e8755c428ed95ccb091c4b820ad399a553fff3' + '5693442762d8a1bdeae2e7c9d63cb6809a90aef4e508aeb04a1c0dea0dcc573a0c62f415ec1b15d97e061aae561761220eae4d39a12362cd586667d6c9072fef' + 'caebf9901b63bce5c98218c63c84da6d2ed60c384464fa2a996d057e295fde6efe96fafbe61bef9e19c0170bc04e82d707eb855f5cc82254308458e25c95132f') +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + + patch -Np1 -i "${srcdir}"/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch + patch -Np1 -i "${srcdir}"/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch +} + build() { cd "${srcdir}"/${pkgname}-${pkgver} ./configure \
