[Scummvm-git-logs] scummvm master -> 65164e00d49008ef916a2cab7919082adaac695b

[ccawley2011]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e95f86f9e2 CONFIGURE: Support using pkg-config to detect FluidSynth
65164e00d4 AUDIO: Fix unused functions with older FluidSynth versions


Commit: e95f86f9e24baa86f9aca52cdd565c5612a1daaf
    https://github.com/scummvm/scummvm/commit/e95f86f9e24baa86f9aca52cdd565c5612a1daaf
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-01T20:32:09+01:00

Commit Message:
CONFIGURE: Support using pkg-config to detect FluidSynth

Changed paths:
    configure


diff --git a/configure b/configure
index 11ae1e2625..480c75dbef 100755
--- a/configure
+++ b/configure
@@ -4847,6 +4847,10 @@ if test "$_fluidsynth" = auto; then
 int main(void) { delete_fluid_settings(new_fluid_settings()); return 0; }
 EOF
 	cc_check_no_clean $FLUIDSYNTH_CFLAGS $FLUIDSYNTH_LIBS && _fluidsynth=yes
+	if test "$_fluidsynth" != yes && test "$_pkg_config" = "yes" && $_pkgconfig --exists fluidsynth; then
+		FLUIDSYNTH_LIBS="`$_pkgconfig --static --libs fluidsynth`"
+		cc_check_no_clean $FLUIDSYNTH_CFLAGS $FLUIDSYNTH_LIBS && _fluidsynth=yes
+	fi
 	if test "$_fluidsynth" != yes; then
 		FLUIDSYNTH_LIBS="$FLUIDSYNTH_STATIC_LIBS"
 		cc_check_no_clean $FLUIDSYNTH_CFLAGS $FLUIDSYNTH_LIBS && _fluidsynth=yes


Commit: 65164e00d49008ef916a2cab7919082adaac695b
    https://github.com/scummvm/scummvm/commit/65164e00d49008ef916a2cab7919082adaac695b
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-01T20:32:09+01:00

Commit Message:
AUDIO: Fix unused functions with older FluidSynth versions

Changed paths:
    audio/softsynth/fluidsynth.cpp


diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index fc982268f1..d136e1846a 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -126,6 +126,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
 static void *SoundFontMemLoader_open(const char *filename) {
 	void *p;
 	if (filename[0] != '&') {
@@ -151,6 +152,7 @@ static int SoundFontMemLoader_close(void *handle) {
 static long SoundFontMemLoader_tell(void *handle) {
 	return ((Common::SeekableReadStream *) handle)->pos();
 }
+#endif
 
 int MidiDriver_FluidSynth::open() {
 	if (_isOpen)