From: Stuart Henderson Subject: Re: UPDATE: audio/fluidsynth To: Rafael Sadowski , Date: Tue, 05 May 2026 12:16:39 +0100 have you checked to make sure switching to sdl3 doesn't break detergency chains? if supports builds then you're probably ok with that... -- Sent from a phone, apologies for poor formatting. On 5 May 2026 11:49:35 Rafael Sadowski wrote: > Simple diff to update fluidsynth to 2.5. This update depends on > devel/gcem (see ports@) and also switch from SDL2 to 3 (default > upstream). > > OK? > > diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile > index 0e4b06ef11f..f5102f4a860 100644 > --- a/audio/fluidsynth/Makefile > +++ b/audio/fluidsynth/Makefile > @@ -1,11 +1,10 @@ > COMMENT = SoundFont2 software synthesizer > > -# 2.5.x is expected to remove SDL2 support in favour of SDL3 > GH_ACCOUNT = FluidSynth > GH_PROJECT = fluidsynth > -GH_TAGNAME = v2.4.8 > +GH_TAGNAME = v2.5.4 > > -SHARED_LIBS += fluidsynth 4.0 # 3.3 (grep LIB_VERSION > CMakeLists.txt) > +SHARED_LIBS += fluidsynth 5.0 # 3.5 (grep LIB_VERSION > CMakeLists.txt) > > CATEGORIES = audio > > @@ -14,16 +13,19 @@ HOMEPAGE = https://www.fluidsynth.org/ > # LGPLv2+ > PERMIT_PACKAGE = Yes > > -WANTLIB += ${COMPILER_LIBCXX} SDL2 c glib-2.0 gthread-2.0 intl > +WANTLIB += ${COMPILER_LIBCXX} SDL3 c glib-2.0 gthread-2.0 intl > WANTLIB += m readline sndfile sndio > > COMPILER = base-clang ports-gcc > > MODULES = devel/cmake > > +BUILD_PACKAGES = devel/gcem > + > LIB_DEPENDS = audio/libsndfile \ > + devel/gettext,-runtime \ > devel/glib2 \ > - devel/sdl2 > + devel/sdl3 > > CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=On \ > -Denable-jack=OFF \ > @@ -37,7 +39,7 @@ CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=On \ > -Denable-oss=OFF \ > -Denable-pipewire=OFF \ > -Denable-pulseaudio=OFF \ > - -Denable-sdl3=OFF > + -Denable-sdl3=ON > > DEBUG_PACKAGES = ${BUILD_PACKAGES} > > diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo > index 97c391b7ab3..12d38e1eba7 100644 > --- a/audio/fluidsynth/distinfo > +++ b/audio/fluidsynth/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (fluidsynth-2.4.8.tar.gz) = > 1tBOkBRVeQbuQqof481YCEDqSC1MOxpF/d1F7GBtbpc= > -SIZE (fluidsynth-2.4.8.tar.gz) = 1798565 > +SHA256 (fluidsynth-2.5.4.tar.gz) = > cvVyAyj+ROLlxngTiF8Ka0sATQSL0u7rDABkB06/9TA= > +SIZE (fluidsynth-2.5.4.tar.gz) = 2115539 > diff --git a/audio/fluidsynth/patches/patch-CMakeLists_txt > b/audio/fluidsynth/patches/patch-CMakeLists_txt > index 84ea885fa1d..0569be81bd3 100644 > --- a/audio/fluidsynth/patches/patch-CMakeLists_txt > +++ b/audio/fluidsynth/patches/patch-CMakeLists_txt > @@ -1,16 +1,16 @@ > Index: CMakeLists.txt > --- CMakeLists.txt.orig > +++ CMakeLists.txt > -@@ -97,6 +97,7 @@ option ( enable-winmidi "compile Windows MIDI support > - option ( enable-sdl2 "compile SDL2 audio support (if it is available)" off ) > +@@ -96,6 +96,7 @@ option ( enable-waveout "compile Windows WaveOut suppo > + option ( enable-winmidi "compile Windows MIDI support (if it is > available)" on ) > option ( enable-sdl3 "compile SDL3 audio support (if it is available)" on ) > option ( enable-pulseaudio "compile PulseAudio support (if it is > available)" on ) > +option ( enable-sndio "compile sndio support (if it is available)" on ) > option ( enable-pipewire "compile PipeWire support (if it is available)" on ) > option ( enable-readline "compile readline lib line editing (if it is > available)" on ) > option ( enable-threads "enable multi-threading support (such as parallel > voice synthesis)" on ) > -@@ -201,8 +202,6 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MA > - if (NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin|OS2|Emscripten|SunOS") ) > +@@ -209,8 +210,6 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MA > + if (NOT (CMAKE_SYSTEM_NAME MATCHES > "Darwin|iOS|tvOS|OS2|Emscripten|SunOS") ) > set ( CMAKE_EXE_LINKER_FLAGS > "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" ) > - set ( CMAKE_SHARED_LINKER_FLAGS > @@ -18,8 +18,8 @@ Index: CMakeLists.txt > endif () > > # define some warning flags > -@@ -576,6 +575,18 @@ if ( enable-libsndfile ) > - endif ( LIBSNDFILE_SUPPORT ) > +@@ -612,6 +611,18 @@ if ( enable-libsndfile ) > + endif ( SndFile_FOUND ) > #set(CMAKE_FIND_DEBUG_MODE OFF) > endif ( enable-libsndfile ) > + > diff --git a/audio/fluidsynth/patches/patch-FluidSynthConfig_cmake_in > b/audio/fluidsynth/patches/patch-FluidSynthConfig_cmake_in > index 2c51b2c5901..d15a2bfe637 100644 > --- a/audio/fluidsynth/patches/patch-FluidSynthConfig_cmake_in > +++ b/audio/fluidsynth/patches/patch-FluidSynthConfig_cmake_in > @@ -7,22 +7,11 @@ Index: FluidSynthConfig.cmake.in > set(FLUIDSYNTH_SUPPORT_ALSA @ALSA_SUPPORT@) > set(FLUIDSYNTH_SUPPORT_COREAUDIO @COREAUDIO_SUPPORT@) > set(FLUIDSYNTH_SUPPORT_COREMIDI @COREMIDI_SUPPORT@) > -@@ -14,6 +15,7 @@ set(FLUIDSYNTH_SUPPORT_PIPEWIRE @PIPEWIRE_SUPPORT@) > +@@ -13,6 +14,7 @@ set(FLUIDSYNTH_SUPPORT_OSS @OSS_SUPPORT@) > + set(FLUIDSYNTH_SUPPORT_PIPEWIRE @PIPEWIRE_SUPPORT@) > set(FLUIDSYNTH_SUPPORT_PORTAUDIO @PORTAUDIO_SUPPORT@) > set(FLUIDSYNTH_SUPPORT_PULSE @PULSE_SUPPORT@) > - set(FLUIDSYNTH_SUPPORT_SDL2 @SDL2_SUPPORT@) > +set(FLUIDSYNTH_SUPPORT_SNDIO @SNDIO_SUPPORT@) > + set(FLUIDSYNTH_SUPPORT_SDL3 @SDL3_SUPPORT@) > set(FLUIDSYNTH_SUPPORT_WASAPI @WASAPI_SUPPORT@) > set(FLUIDSYNTH_SUPPORT_WAVEOUT @WAVEOUT_SUPPORT@) > - set(FLUIDSYNTH_SUPPORT_WINMIDI @WINMIDI_SUPPORT@) > -@@ -133,6 +135,10 @@ if(NOT FLUIDSYNTH_IS_SHARED) > - > - if(FLUIDSYNTH_SUPPORT_SDL2 AND NOT TARGET SDL2::SDL2) > - find_dependency(SDL2) > -+ endif() > -+ > -+ if(FLUIDSYNTH_SUPPORT_SNDIO AND NOT TARGET SNDIO::SNDIO) > -+ find_dependency(SNDIO) > - endif() > - > - if(FLUIDSYNTH_SUPPORT_SYSTEMD AND NOT Systemd::libsystemd) > diff --git a/audio/fluidsynth/patches/patch-cmake_admin_report_cmake > b/audio/fluidsynth/patches/patch-cmake_admin_report_cmake > index 8955b944a2e..7dfcf8ebd28 100644 > --- a/audio/fluidsynth/patches/patch-cmake_admin_report_cmake > +++ b/audio/fluidsynth/patches/patch-cmake_admin_report_cmake > @@ -1,7 +1,7 @@ > Index: cmake_admin/report.cmake > --- cmake_admin/report.cmake.orig > +++ cmake_admin/report.cmake > -@@ -98,6 +98,12 @@ else ( SDL3_SUPPORT ) > +@@ -96,6 +96,12 @@ else ( SDL3_SUPPORT ) > set ( AUDIO_MIDI_REPORT "${AUDIO_MIDI_REPORT} SDL3: no\n" ) > endif ( SDL3_SUPPORT ) > > diff --git a/audio/fluidsynth/patches/patch-src_CMakeLists_txt > b/audio/fluidsynth/patches/patch-src_CMakeLists_txt > index 70a3faadeb6..5d5fae3cb94 100644 > --- a/audio/fluidsynth/patches/patch-src_CMakeLists_txt > +++ b/audio/fluidsynth/patches/patch-src_CMakeLists_txt > @@ -12,15 +12,15 @@ Index: src/CMakeLists.txt > if ( PULSE_SUPPORT ) > set ( fluid_pulse_SOURCES drivers/fluid_pulse.c ) > endif ( PULSE_SUPPORT ) > -@@ -252,6 +256,7 @@ add_library ( libfluidsynth-OBJ OBJECT > +@@ -277,6 +281,7 @@ add_library ( libfluidsynth-OBJ OBJECT > + ${fluid_waveout_SOURCES} > ${fluid_winmidi_SOURCES} > - ${fluid_sdl2_SOURCES} > ${fluid_sdl3_SOURCES} > + ${fluid_sndio_SOURCES} > + ${fluid_dls_SOURCES} > ${fluid_libinstpatch_SOURCES} > - ${libfluidsynth_SOURCES} > - ${public_HEADERS} > -@@ -371,6 +376,11 @@ target_link_libraries ( libfluidsynth-OBJ PUBLIC GLib2 > + ${fluid_osal_SOURCES} > +@@ -405,6 +410,11 @@ endif() > > if ( TARGET SndFile::sndfile AND LIBSNDFILE_SUPPORT ) > target_link_libraries ( libfluidsynth-OBJ PUBLIC SndFile::sndfile ) > diff --git a/audio/fluidsynth/patches/patch-src_config_cmake > b/audio/fluidsynth/patches/patch-src_config_cmake > index 921188a257c..f0138131067 100644 > --- a/audio/fluidsynth/patches/patch-src_config_cmake > +++ b/audio/fluidsynth/patches/patch-src_config_cmake > @@ -1,7 +1,7 @@ > Index: src/config.cmake > --- src/config.cmake.orig > +++ src/config.cmake > -@@ -211,6 +211,9 @@ > +@@ -209,6 +209,9 @@ > /* Define to enable SDL3 audio driver */ > #cmakedefine SDL3_SUPPORT @SDL3_SUPPORT@ > > diff --git a/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_c > b/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_c > index b78241db6c5..a3ca213efb8 100644 > --- a/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_c > +++ b/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_c > @@ -1,7 +1,7 @@ > Index: src/drivers/fluid_adriver.c > --- src/drivers/fluid_adriver.c.orig > +++ src/drivers/fluid_adriver.c > -@@ -40,6 +40,16 @@ struct _fluid_audriver_definition_t > +@@ -39,6 +39,16 @@ struct _fluid_audriver_definition_t > /* Available audio drivers, listed in order of preference */ > static const fluid_audriver_definition_t fluid_audio_drivers[] = > { > diff --git a/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_h > b/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_h > index 1154badcfe0..df3c8415890 100644 > --- a/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_h > +++ b/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_h > @@ -1,7 +1,7 @@ > Index: src/drivers/fluid_adriver.h > --- src/drivers/fluid_adriver.h.orig > +++ src/drivers/fluid_adriver.h > -@@ -43,6 +43,15 @@ void fluid_audio_driver_settings(fluid_settings_t *set > +@@ -42,6 +42,15 @@ void fluid_audio_driver_settings(fluid_settings_t *set > /* Defined in fluid_filerenderer.c */ > void fluid_file_renderer_settings(fluid_settings_t *settings); > > diff --git a/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_c > b/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_c > index e4a4c30df24..b2ee644e805 100644 > --- a/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_c > +++ b/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_c > @@ -1,7 +1,7 @@ > Index: src/drivers/fluid_mdriver.c > --- src/drivers/fluid_mdriver.c.orig > +++ src/drivers/fluid_mdriver.c > -@@ -38,6 +38,14 @@ struct _fluid_mdriver_definition_t > +@@ -37,6 +37,14 @@ struct _fluid_mdriver_definition_t > > static const fluid_mdriver_definition_t fluid_midi_drivers[] = > { > diff --git a/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_h > b/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_h > index b93f2e3f8fa..b4727aa7557 100644 > --- a/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_h > +++ b/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_h > @@ -1,7 +1,7 @@ > Index: src/drivers/fluid_mdriver.h > --- src/drivers/fluid_mdriver.h.orig > +++ src/drivers/fluid_mdriver.h > -@@ -38,6 +38,15 @@ struct _fluid_midi_driver_t > +@@ -37,6 +37,15 @@ struct _fluid_midi_driver_t > > void fluid_midi_driver_settings(fluid_settings_t *settings); > > diff --git a/audio/fluidsynth/pkg/PLIST b/audio/fluidsynth/pkg/PLIST > index 37c39e29282..8d10c6768dd 100644 > --- a/audio/fluidsynth/pkg/PLIST > +++ b/audio/fluidsynth/pkg/PLIST > @@ -19,10 +19,10 @@ include/fluidsynth/types.h > include/fluidsynth/version.h > include/fluidsynth/voice.h > lib/cmake/fluidsynth/ > +lib/cmake/fluidsynth/FluidSynth-shared-targets${MODCMAKE_BUILD_SUFFIX} > +lib/cmake/fluidsynth/FluidSynth-shared-targets.cmake > lib/cmake/fluidsynth/FluidSynthConfig.cmake > lib/cmake/fluidsynth/FluidSynthConfigVersion.cmake > -lib/cmake/fluidsynth/FluidSynthTargets${MODCMAKE_BUILD_SUFFIX} > -lib/cmake/fluidsynth/FluidSynthTargets.cmake > @lib lib/libfluidsynth.so.${LIBfluidsynth_VERSION} > lib/pkgconfig/fluidsynth.pc > @man man/man1/fluidsynth.1