开源软件构建与测试

_service:tar_scm:fluidsynth.spec Changed

_service Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/.cirrus.yml -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/.cirrus.yml Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/CMakeLists.txt -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/CMakeLists.txt Changed

@@ -47,7 +47,7 @@
 # FluidSynth package version
 set ( FLUIDSYNTH_VERSION_MAJOR 2 )
 set ( FLUIDSYNTH_VERSION_MINOR 3 )
-set ( FLUIDSYNTH_VERSION_MICRO 4 )
+set ( FLUIDSYNTH_VERSION_MICRO 5 )
 set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" )
 set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
 
@@ -62,7 +62,7 @@
 # This is not exactly the same algorithm as the libtool one, but the results are the same.
 set ( LIB_VERSION_CURRENT 3 )
 set ( LIB_VERSION_AGE 2 )
-set ( LIB_VERSION_REVISION 2 )
+set ( LIB_VERSION_REVISION 3 )
 set ( LIB_VERSION_INFO
       "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" )
 
@@ -102,7 +102,7 @@
 
 # Platform specific options
 if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
-    option ( enable-lash "compile LASH support (if it is available)" on )
+    option ( enable-lash "compile LASH support (if it is available)" off )
     option ( enable-alsa "compile ALSA support (if it is available)" on )
 endif ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
 
@@ -600,6 +600,7 @@
 if ( enable-lash )
     find_package ( LASH ${LASH_MINIMUM_VERSION} )
     if ( LASH_FOUND )
+        message ( WARNING "LASH support has been deprecated and will be removed in fluidsynth 2.4.0" )
         set ( LASH_SUPPORT 1 )
         add_definitions ( -DHAVE_LASH )
         list( APPEND PC_REQUIRES_PRIV "lash-1.0")

_service:tar_scm:fluidsynth-2.3.4.tar.gz/cmake_admin/FindInstPatch.cmake -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/cmake_admin/FindInstPatch.cmake Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/cmake_admin/FindOpus.cmake -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/cmake_admin/FindOpus.cmake Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/cmake_admin/FindSndFile.cmake -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/cmake_admin/FindSndFile.cmake Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/cmake_admin/Findmpg123.cmake -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/cmake_admin/Findmpg123.cmake Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/doc/fluidsynth-v20-devdoc.txt -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/doc/fluidsynth-v20-devdoc.txt Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/doc/fluidsynth.1 -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/doc/fluidsynth.1 Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/src/CMakeLists.txt -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/src/CMakeLists.txt Changed

@@ -499,10 +499,6 @@
     target_link_libraries ( fluidsynth PRIVATE PipeWire::PipeWire )
 endif()
 
-if ( TARGET InstPatch::libinstpatch AND LIBINSTPATCH_SUPPORT )
-    target_link_libraries ( fluidsynth PRIVATE InstPatch::libinstpatch )
-endif()
-
 if ( TARGET LASH::LASH AND LASH_SUPPORT )
     target_link_libraries ( fluidsynth PRIVATE LASH::LASH )
 endif()
@@ -552,12 +548,19 @@
 # To fix cross-compiling fluidsynth from Win32 to ARM (using vcpkg), we need to pass the current generator
 # on to the external project, otherwise (for some unknown reason) the target compiler will be used rather
 # than the host compiler.
+#
+# Some use-cases however cannot rely on this logic, therefore, FLUID_HOST_COMPILER can be specified to
+# force using a particular host compiler, see https://github.com/FluidSynth/fluidsynth/issues/1301
+if ( FLUID_HOST_COMPILER )
+  set ( EXPLICIT_HOST_COMPILER_STR "-DCMAKE_C_COMPILER=${FLUID_HOST_COMPILER}" )
+endif ()
+
 ExternalProject_Add(gentables
     DOWNLOAD_COMMAND ""
     SOURCE_DIR ${GENTAB_SDIR}
     BINARY_DIR ${GENTAB_BDIR}
     CONFIGURE_COMMAND
-        "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}"
+        "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} ${EXPLICIT_HOST_COMPILER_STR} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}"
     BUILD_COMMAND
         "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}"
     INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${FluidSynth_BINARY_DIR}/"

_service:tar_scm:fluidsynth-2.3.4.tar.gz/src/drivers/fluid_pipewire.c -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/src/drivers/fluid_pipewire.c Changed

@@ -154,6 +154,7 @@
     char *media_category = NULL;
     float *buffer = NULL;
     const struct spa_pod *params1;
+    struct pw_properties *props;
 
     drv = FLUID_NEW(fluid_pipewire_audio_driver_t);
 
@@ -196,7 +197,7 @@
         goto driver_cleanup;
     }
 
-    struct pw_properties *props = pw_properties_new(PW_KEY_MEDIA_TYPE, media_type, PW_KEY_MEDIA_CATEGORY, media_category, PW_KEY_MEDIA_ROLE, media_role, NULL);
+    props = pw_properties_new(PW_KEY_MEDIA_TYPE, media_type, PW_KEY_MEDIA_CATEGORY, media_category, PW_KEY_MEDIA_ROLE, media_role, NULL);
 
     pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%d/%d", period_size, (int) sample_rate);
     pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%d", (int) sample_rate);
@@ -294,6 +295,11 @@
     fluid_pipewire_audio_driver_t *drv = (fluid_pipewire_audio_driver_t *)p;
     fluid_return_if_fail(drv);
 
+    if (drv->pw_loop)
+    {
+        pw_thread_loop_lock(drv->pw_loop);
+    }
+
     if(drv->pw_stream)
     {
         pw_stream_destroy(drv->pw_stream);
@@ -301,6 +307,7 @@
 
     if(drv->pw_loop)
     {
+        pw_thread_loop_unlock(drv->pw_loop);
         pw_thread_loop_destroy(drv->pw_loop);
     }

_service:tar_scm:fluidsynth-2.3.4.tar.gz/src/fluidsynth.c -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/src/fluidsynth.c Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/src/midi/fluid_midi.c -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/src/midi/fluid_midi.c Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/src/synth/fluid_chan.c -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/src/synth/fluid_chan.c Changed

_service:tar_scm:fluidsynth-2.3.4.tar.gz/src/synth/fluid_synth.c -> _service:tar_scm:fluidsynth-2.3.5.tar.gz/src/synth/fluid_synth.c Changed

@@ -202,16 +202,16 @@
     fluid_settings_register_int(settings, "synth.verbose", 0, 0, 1, FLUID_HINT_TOGGLED);
 
     fluid_settings_register_int(settings, "synth.reverb.active", 1, 0, 1, FLUID_HINT_TOGGLED);
-    fluid_settings_register_num(settings, "synth.reverb.room-size", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0f, 1.0f, 0);
-    fluid_settings_register_num(settings, "synth.reverb.damp", FLUID_REVERB_DEFAULT_DAMP, 0.0f, 1.0f, 0);
-    fluid_settings_register_num(settings, "synth.reverb.width", FLUID_REVERB_DEFAULT_WIDTH, 0.0f, 100.0f, 0);
-    fluid_settings_register_num(settings, "synth.reverb.level", FLUID_REVERB_DEFAULT_LEVEL, 0.0f, 1.0f, 0);
+    fluid_settings_register_num(settings, "synth.reverb.room-size", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0, 1.0, 0);
+    fluid_settings_register_num(settings, "synth.reverb.damp", FLUID_REVERB_DEFAULT_DAMP, 0.0, 1.0, 0);
+    fluid_settings_register_num(settings, "synth.reverb.width", FLUID_REVERB_DEFAULT_WIDTH, 0.0, 100.0, 0);
+    fluid_settings_register_num(settings, "synth.reverb.level", FLUID_REVERB_DEFAULT_LEVEL, 0.0, 1.0, 0);
 
     fluid_settings_register_int(settings, "synth.chorus.active", 1, 0, 1, FLUID_HINT_TOGGLED);
     fluid_settings_register_int(settings, "synth.chorus.nr", FLUID_CHORUS_DEFAULT_N, 0, 99, 0);
-    fluid_settings_register_num(settings, "synth.chorus.level", FLUID_CHORUS_DEFAULT_LEVEL, 0.0f, 10.0f, 0);
-    fluid_settings_register_num(settings, "synth.chorus.speed", FLUID_CHORUS_DEFAULT_SPEED, 0.1f, 5.0f, 0);
-    fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0f, 256.0f, 0);
+    fluid_settings_register_num(settings, "synth.chorus.level", FLUID_CHORUS_DEFAULT_LEVEL, 0.0, 10.0, 0);
+    fluid_settings_register_num(settings, "synth.chorus.speed", FLUID_CHORUS_DEFAULT_SPEED, 0.1, 5.0, 0);
+    fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0, 256.0, 0);
 
     fluid_settings_register_int(settings, "synth.ladspa.active", 0, 0, 1, FLUID_HINT_TOGGLED);
     fluid_settings_register_int(settings, "synth.lock-memory", 1, 0, 1, FLUID_HINT_TOGGLED);
@@ -223,12 +223,12 @@
 
     fluid_settings_register_int(settings, "synth.polyphony", 256, 1, 65535, 0);
     fluid_settings_register_int(settings, "synth.midi-channels", 16, 16, 256, 0);
-    fluid_settings_register_num(settings, "synth.gain", 0.2f, 0.0f, 10.0f, 0);
+    fluid_settings_register_num(settings, "synth.gain", 0.2, 0.0, 10.0, 0);
     fluid_settings_register_int(settings, "synth.audio-channels", 1, 1, 128, 0);
     fluid_settings_register_int(settings, "synth.audio-groups", 1, 1, 128, 0);
     fluid_settings_register_int(settings, "synth.effects-channels", 2, 2, 2, 0);
     fluid_settings_register_int(settings, "synth.effects-groups", 1, 1, 128, 0);
-    fluid_settings_register_num(settings, "synth.sample-rate", 44100.0f, 8000.0f, 96000.0f, 0);
+    fluid_settings_register_num(settings, "synth.sample-rate", 44100.0, 8000.0, 96000.0, 0);
     fluid_settings_register_int(settings, "synth.device-id", 0, 0, 127, 0);
 #ifdef ENABLE_MIXER_THREADS
     fluid_settings_register_int(settings, "synth.cpu-cores", 1, 1, 256, 0);

Changes of Revision 2