Browse Source

Update Fluidsynth to version 2.0.0

pull/31/head
brummer10 7 months ago
parent
commit
25985930e2
6 changed files with 56 additions and 3 deletions
  1. +1
    -1
      bootstrap-common.sh
  2. +1
    -0
      bootstrap-plugins.sh
  3. +1
    -1
      patches/fluidsynth/01_force-empty-libsuffix.patch
  4. +52
    -0
      patches/fluidsynth/02_skip_dsound_support.patch
  5. +0
    -0
      patches/fluidsynth/03_skip-drivers-build.patch~old
  6. +1
    -1
      setup/versions.sh

+ 1
- 1
bootstrap-common.sh View File

@@ -223,7 +223,7 @@ if [ "${LINUX}" -eq 1 ]; then
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/glib-2.0.pc" ]; then
cp $(pkg-config --variable=pcfiledir glib-2.0)/g{io,lib,module,object,thread}-2.0.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/g{io,lib,module,object,thread}-2.0.pc
sed -i '/Libs.private/d;/Requires.private/d' ${TARGET_PKG_CONFIG_PATH}/g{io,lib,module,object,thread}-2.0.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/libpcre.pc" ]; then
cp $(pkg-config --variable=pcfiledir libpcre)/libpcre.pc ${TARGET_PKG_CONFIG_PATH}/


+ 1
- 0
bootstrap-plugins.sh View File

@@ -371,6 +371,7 @@ if [ -z "${PAWPAW_SKIP_GLIB}" ] || [ "${PAWPAW_SKIP_GLIB}" -eq 0 ]; then

if [ "${MACOS}" -eq 1 ] || [ "${WASM}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
GLIB_EXTRAFLAGS="--disable-rebuilds"
GLIB_EXTRAFLAGS="--disable-profile"

if [ "${WIN32}" -eq 1 ]; then
GLIB_EXTRAFLAGS+=" --with-threads=win32"


+ 1
- 1
patches/fluidsynth/01_force-empty-libsuffix.patch View File

@@ -1,6 +1,6 @@
--- fluidsynth-static-1.1.11.orig/CMakeLists.txt
+++ fluidsynth-static-1.1.11/CMakeLists.txt
@@ -89,16 +89,7 @@ if ( CMAKE_SYSTEM MATCHES "OS2" )
@@ -90,16 +90,7 @@ if ( CMAKE_SYSTEM MATCHES "OS2" )
endif ( CMAKE_SYSTEM MATCHES "OS2" )
# Initialize the library directory name suffix.


+ 52
- 0
patches/fluidsynth/02_skip_dsound_support.patch View File

@@ -0,0 +1,52 @@
--- fluidsynth-static-1.1.11.orig/src/drivers/fluid_dsound.c
+++ fluidsynth-static-1.1.11/src/drivers/fluid_dsound.c
@@ -23,7 +23,7 @@
#include "fluid_adriver.h"
#include "fluid_settings.h"

-#if DSOUND_SUPPORT
+#if DSOUND_SUPPORT_OFF

#define INITGUID

--- fluidsynth-static-1.1.11.orig/src/drivers/fluid_adriver.h
+++ fluidsynth-static-1.1.11/src/drivers/fluid_adriver.h
@@ -74,7 +74,7 @@ void delete_fluid_core_audio_driver(fluid_audio_driver_t *p);
void fluid_core_audio_driver_settings(fluid_settings_t *settings);
#endif

-#if DSOUND_SUPPORT
+#if DSOUND_SUPPORT_OFF
fluid_audio_driver_t *new_fluid_dsound_audio_driver(fluid_settings_t *settings,
fluid_synth_t *synth);
void delete_fluid_dsound_audio_driver(fluid_audio_driver_t *p);

--- fluidsynth-static-1.1.11.orig/src/drivers/fluid_adriver.c
+++ fluidsynth-static-1.1.11/src/drivers/fluid_adriver.c
@@ -89,7 +89,7 @@ static const fluid_audriver_definition_t fluid_audio_drivers[$
},
#endif

-#if DSOUND_SUPPORT
+#if DSOUND_SUPPORT_OFF
{
"dsound",
new_fluid_dsound_audio_driver,
@@ -181,7 +181,7 @@ void fluid_audio_driver_settings(fluid_settings_t *settings)
fluid_settings_register_str(settings, "audio.driver", "oss", 0);
#elif COREAUDIO_SUPPORT
fluid_settings_register_str(settings, "audio.driver", "coreaudio", 0);
-#elif DSOUND_SUPPORT
+#elif DSOUND_SUPPORT_OFF
fluid_settings_register_str(settings, "audio.driver", "dsound", 0);
#elif SNDMAN_SUPPORT
fluid_settings_register_str(settings, "audio.driver", "sndman", 0);
@@ -208,7 +208,7 @@ void fluid_audio_driver_settings(fluid_settings_t *settings)
#if COREAUDIO_SUPPORT
fluid_settings_add_option(settings, "audio.driver", "coreaudio");
#endif
-#if DSOUND_SUPPORT
+#if DSOUND_SUPPORT_OFF
fluid_settings_add_option(settings, "audio.driver", "dsound");
#endif
#if SNDMAN_SUPPORT

patches/fluidsynth/03_skip-drivers-build.patch → patches/fluidsynth/03_skip-drivers-build.patch~old View File


+ 1
- 1
setup/versions.sh View File

@@ -117,7 +117,7 @@ KXSTUDIO_LV2_EXTENSIONS_URL=https://github.com/KXStudio/LV2-Extensions.git
MOD_SDK_VERSION=f4341a6c2b2f50e2eb405b06ce19f9f0b4b1a62b
MOD_SDK_URL=https://github.com/moddevices/mod-lv2-extensions.git

FLUIDSYNTH_VERSION=f65c6ba25fb2c7e37c89fc6a4afc5aa645e208c2 # 1.1.11
FLUIDSYNTH_VERSION=cbe4003d97332d3a443422eab8d2764428e31130 # 2.0.0 # f65c6ba25fb2c7e37c89fc6a4afc5aa645e208c2 # 1.1.11
FLUIDSYNTH_URL=https://github.com/FluidSynth/fluidsynth.git

MXML_VERSION=3.3.1


Loading…
Cancel
Save