diff --git a/bootstrap-common.sh b/bootstrap-common.sh index 48ea696..bd143f9 100755 --- a/bootstrap-common.sh +++ b/bootstrap-common.sh @@ -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}/ diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh index 4f6c981..77a8044 100755 --- a/bootstrap-plugins.sh +++ b/bootstrap-plugins.sh @@ -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" diff --git a/patches/fluidsynth/01_force-empty-libsuffix.patch b/patches/fluidsynth/01_force-empty-libsuffix.patch index 670711c..9a2686b 100644 --- a/patches/fluidsynth/01_force-empty-libsuffix.patch +++ b/patches/fluidsynth/01_force-empty-libsuffix.patch @@ -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. diff --git a/patches/fluidsynth/03_skip-drivers-build.patch b/patches/fluidsynth/03_skip-drivers-build.patch index 2e43326..e7a1d98 100644 --- a/patches/fluidsynth/03_skip-drivers-build.patch +++ b/patches/fluidsynth/03_skip-drivers-build.patch @@ -1,6 +1,6 @@ --- fluidsynth-static-1.1.11.orig/src/CMakeLists.txt +++ fluidsynth-static-1.1.11/src/CMakeLists.txt -@@ -175,11 +175,6 @@ set ( libfluidsynth_SOURCES +@@ -168,11 +168,6 @@ set ( libfluidsynth_SOURCES midi/fluid_midi_router.h midi/fluid_seqbind.c midi/fluid_seq.c @@ -12,12 +12,10 @@ bindings/fluid_cmd.c bindings/fluid_cmd.h bindings/fluid_filerenderer.c -@@ -335,32 +330,14 @@ target_link_libraries ( libfluidsynth - ${LIBFLUID_LIBS} - ) +@@ -319,30 +314,14 @@ target_link_libraries ( libfluidsynth + + # ************ CLI program ************ --# ************ CLI program ************ -- -set ( fluidsynth_SOURCES fluidsynth.c ) - -add_executable ( fluidsynth @@ -47,14 +45,15 @@ RUNTIME DESTINATION ${BIN_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + --- fluidsynth-static-1.1.11.orig/src/utils/fluid_settings.c +++ fluidsynth-static-1.1.11/src/utils/fluid_settings.c -@@ -297,8 +297,6 @@ fluid_settings_init(fluid_settings_t* se - fluid_shell_settings(settings); - fluid_player_settings(settings); - fluid_file_renderer_settings(settings); -- fluid_audio_driver_settings(settings); -- fluid_midi_driver_settings(settings); +@@ -331,8 +331,6 @@ fluid_settings_init(fluid_settings_t *settings) + fluid_shell_settings(settings); + fluid_player_settings(settings); + fluid_file_renderer_settings(settings); +- fluid_audio_driver_settings(settings); +- fluid_midi_driver_settings(settings); } - + static int diff --git a/setup/versions.sh b/setup/versions.sh index 7eeb83d..8a27f89 100644 --- a/setup/versions.sh +++ b/setup/versions.sh @@ -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