zepto-forks/meta-games
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from schnitzeltony/prepare-fluidsynth-2.2.0

Browse Source 
scummvm: Fix build with upcoming fluidsynth 2.2.0
This commit is contained in:
Marko Lindqvist
2021-04-08 07:07:57 +03:00
committed by GitHub
parent c71a36b469 fcf7f87a3f
commit 9c9a235cbe
3 changed files with 182 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
recipes-games/scummvm/scummvm/0003-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch Normal file
View File

@@ -0,0 +1,69 @@
From 81cad79ae2a5aff72c0c655a608075b27cf9f02e Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Mon, 5 Apr 2021 12:22:51 +0200
Subject: [PATCH 1/2] FLUIDSYNTH: Simplify FluidSynth version check
---
audio/softsynth/fluidsynth.cpp | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index 3b9f553464..e770fb6854 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -46,7 +46,15 @@
#include "backends/platform/ios7/ios7_common.h"
#endif
-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
+// We assume here Fluidsynth minor will never be above 255 and
+// that micro versions won't break API compatibility
+#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
+#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) | FLUIDSYNTH_VERSION_MINOR)
+#else
+#define FS_API_VERSION 0
+#endif
+
+#if FS_API_VERSION >= 0x0200
static void logHandler(int level, const char *message, void *data)
#else
static void logHandler(int level, char *message, void *data)
@@ -103,7 +111,7 @@ public:
void setEngineSoundFont(Common::SeekableReadStream *soundFontData) override;
bool acceptsSoundFontData() override {
-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
+#if FS_API_VERSION >= 0x0200
return true;
#else
return false;
@@ -162,7 +170,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const char *val) {
// Soundfont memory loader callback functions.
-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
+#if FS_API_VERSION >= 0x0200
static void *SoundFontMemLoader_open(const char *filename) {
void *p;
if (filename[0] != '&') {
@@ -200,7 +208,7 @@ int MidiDriver_FluidSynth::open() {
fluid_set_log_function(FLUID_INFO, logHandler, NULL);
fluid_set_log_function(FLUID_DBG, logHandler, NULL);
-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
+#if FS_API_VERSION >= 0x0200
// When provided with in-memory SoundFont data, only use the configured
// SoundFont instead if it's explicitly configured on the current game.
bool isUsingInMemorySoundFontData = _engineSoundFontData && !ConfMan.getActiveDomain()->contains("soundfont");
@@ -280,7 +288,7 @@ int MidiDriver_FluidSynth::open() {
const char *soundfont = !isUsingInMemorySoundFontData ?
ConfMan.get("soundfont").c_str() : Common::String::format("&%p", (void *)_engineSoundFontData).c_str();
-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
+#if FS_API_VERSION >= 0x0200
if (isUsingInMemorySoundFontData) {
fluid_sfloader_t *soundFontMemoryLoader = new_fluid_defsfloader(_settings);
fluid_sfloader_set_callbacks(soundFontMemoryLoader,
--
2.26.2

111
recipes-games/scummvm/scummvm/0004-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch Normal file
View File

@@ -0,0 +1,111 @@
From bcff6ee782fd58250d2365a08e3a6d29268d425e Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Mon, 5 Apr 2021 12:23:26 +0200
Subject: [PATCH 2/2] FLUIDSYNTH: Fix compilation with Fluidsynth 2.2
We replace deprecated functions as well
---
audio/softsynth/fluidsynth.cpp | 43 ++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index e770fb6854..f01dd8c736 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -180,11 +180,19 @@ static void *SoundFontMemLoader_open(const char *filename) {
return p;
}
+#if FS_API_VERSION >= 0x0202
+static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void *handle) {
+#else
static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
+#endif
return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
}
+#if FS_API_VERSION >= 0x0202
+static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, int origin) {
+#else
static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
+#endif
return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
}
@@ -193,7 +201,11 @@ static int SoundFontMemLoader_close(void *handle) {
return FLUID_OK;
}
+#if FS_API_VERSION >= 0x0202
+static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
+#else
static long SoundFontMemLoader_tell(void *handle) {
+#endif
return ((Common::SeekableReadStream *) handle)->pos();
}
#endif
@@ -237,7 +249,11 @@ int MidiDriver_FluidSynth::open() {
_synth = new_fluid_synth(_settings);
if (ConfMan.getBool("fluidsynth_chorus_activate")) {
+#if FS_API_VERSION >= 0x0202
+ fluid_synth_chorus_on(_synth, -1, 1);
+#else
fluid_synth_set_chorus_on(_synth, 1);
+#endif
int chorusNr = ConfMan.getInt("fluidsynth_chorus_nr");
double chorusLevel = (double)ConfMan.getInt("fluidsynth_chorus_level") / 100.0;
@@ -252,22 +268,49 @@ int MidiDriver_FluidSynth::open() {
chorusType = FLUID_CHORUS_MOD_TRIANGLE;
}
+#if FS_API_VERSION >= 0x0202
+ fluid_synth_set_chorus_group_nr(_synth, -1, chorusNr);
+ fluid_synth_set_chorus_group_level(_synth, -1, chorusLevel);
+ fluid_synth_set_chorus_group_speed(_synth, -1, chorusSpeed);
+ fluid_synth_set_chorus_group_depth(_synth, -1, chorusDepthMs);
+ fluid_synth_set_chorus_group_type(_synth, -1, chorusType);
+#else
fluid_synth_set_chorus(_synth, chorusNr, chorusLevel, chorusSpeed, chorusDepthMs, chorusType);
+#endif
} else {
+#if FS_API_VERSION >= 0x0202
+ fluid_synth_chorus_on(_synth, -1, 0);
+#else
fluid_synth_set_chorus_on(_synth, 0);
+#endif
}
if (ConfMan.getBool("fluidsynth_reverb_activate")) {
+#if FS_API_VERSION >= 0x0202
+ fluid_synth_reverb_on(_synth, -1, 1);
+#else
fluid_synth_set_reverb_on(_synth, 1);
+#endif
double reverbRoomSize = (double)ConfMan.getInt("fluidsynth_reverb_roomsize") / 100.0;
double reverbDamping = (double)ConfMan.getInt("fluidsynth_reverb_damping") / 100.0;
int reverbWidth = ConfMan.getInt("fluidsynth_reverb_width");
double reverbLevel = (double)ConfMan.getInt("fluidsynth_reverb_level") / 100.0;
+#if FS_API_VERSION >= 0x0202
+ fluid_synth_set_reverb_group_roomsize(_synth, -1, reverbRoomSize);
+ fluid_synth_set_reverb_group_damp(_synth, -1, reverbDamping);
+ fluid_synth_set_reverb_group_width(_synth, -1, reverbWidth);
+ fluid_synth_set_reverb_group_level(_synth, -1, reverbLevel);
+#else
fluid_synth_set_reverb(_synth, reverbRoomSize, reverbDamping, reverbWidth, reverbLevel);
+#endif
} else {
+#if FS_API_VERSION >= 0x0202
+ fluid_synth_reverb_on(_synth, -1, 0);
+#else
fluid_synth_set_reverb_on(_synth, 0);
+#endif
}
Common::String interpolation = ConfMan.get("fluidsynth_misc_interpolation");
--
2.26.2

2
recipes-games/scummvm/scummvm_2.2.0.bb
View File

@@ -14,6 +14,8 @@ SRC_URI = " \
https://www.scummvm.org/frs/scummvm/${PV}/${BPN}-${PV}.tar.xz \
file://0001-use-pkg-config-to-gather-sdl-information.patch \
file://0002-Do-not-split-binaries-during-install.patch \
file://0003-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch \
file://0004-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch \
file://scummvm.desktop \
"
SRC_URI[sha256sum] = "1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387"