===================================================================
RCS file: /cvs/ports/audio/fluidsynth/Makefile,v
diff -u -r1.40 Makefile
--- Makefile 1 Sep 2025 17:53:49 -0000 1.40
+++ Makefile 19 Jan 2026 19:37:38 -0000
@@ -1,11 +1,12 @@
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.2
-SHARED_LIBS += fluidsynth 4.0 # 3.3 (grep LIB_VERSION CMakeLists.txt)
+DIST_TUPLE = github kthohr gcem 012ae73c6d0a2cb09ffe86475f5c6fba3926e200 gcem
+
+SHARED_LIBS += fluidsynth 4.1 # 3.5.1 (grep LIB_VERSION CMakeLists.txt)
CATEGORIES = audio
@@ -14,7 +15,7 @@
# LGPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} SDL2 c glib-2.0 gthread-2.0 intl
+WANTLIB += ${COMPILER_LIBCXX} c glib-2.0 gthread-2.0 intl
WANTLIB += m readline sndfile sndio
COMPILER = base-clang ports-gcc
@@ -22,8 +23,7 @@
MODULES = devel/cmake
LIB_DEPENDS = audio/libsndfile \
- devel/glib2 \
- devel/sdl2
+ devel/glib2
CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=On \
-Denable-jack=OFF \
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/distinfo,v
diff -u -r1.9 distinfo
--- distinfo 1 Sep 2025 17:53:49 -0000 1.9
+++ distinfo 19 Jan 2026 19:37:38 -0000
@@ -1,2 +1,4 @@
-SHA256 (fluidsynth-2.4.8.tar.gz) = 1tBOkBRVeQbuQqof481YCEDqSC1MOxpF/d1F7GBtbpc=
-SIZE (fluidsynth-2.4.8.tar.gz) = 1798565
+SHA256 (fluidsynth-2.5.2.tar.gz) = HcsTMIs6o4PbZYxgp7Y9c9D/RgHM7liVgrp6gWR1QQ4=
+SHA256 (kthohr-gcem-012ae73c6d0a2cb09ffe86475f5c6fba3926e200.tar.gz) = NKsO6Hqesm0wh/qbScJXLqjuA9sMlwW4NkgwGjo/wXI=
+SIZE (fluidsynth-2.5.2.tar.gz) = 2111488
+SIZE (kthohr-gcem-012ae73c6d0a2cb09ffe86475f5c6fba3926e200.tar.gz) = 57846
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-CMakeLists_txt,v
diff -u -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 1 Sep 2025 17:53:49 -0000 1.5
+++ patches/patch-CMakeLists_txt 19 Jan 2026 19:37:38 -0000
@@ -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") )
+@@ -206,8 +207,6 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MA
+ if (NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin|iOS|OS2|Emscripten|SunOS") )
set ( CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
- set ( CMAKE_SHARED_LINKER_FLAGS
@@ -18,8 +18,8 @@
endif ()
# define some warning flags
-@@ -576,6 +575,18 @@ if ( enable-libsndfile )
- endif ( LIBSNDFILE_SUPPORT )
+@@ -609,6 +608,18 @@ if ( enable-libsndfile )
+ endif ( SndFile_FOUND )
#set(CMAKE_FIND_DEBUG_MODE OFF)
endif ( enable-libsndfile )
+
Index: patches/patch-FluidSynthConfig_cmake_in
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-FluidSynthConfig_cmake_in,v
diff -u -r1.3 patch-FluidSynthConfig_cmake_in
--- patches/patch-FluidSynthConfig_cmake_in 11 Mar 2025 08:17:07 -0000 1.3
+++ patches/patch-FluidSynthConfig_cmake_in 19 Jan 2026 19:37:38 -0000
@@ -10,15 +10,15 @@
@@ -14,6 +15,7 @@ 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_SDL3 @SDL3_SUPPORT@)
+set(FLUIDSYNTH_SUPPORT_SNDIO @SNDIO_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)
+@@ -134,6 +136,10 @@ if(NOT FLUIDSYNTH_IS_SHARED)
- if(FLUIDSYNTH_SUPPORT_SDL2 AND NOT TARGET SDL2::SDL2)
- find_dependency(SDL2)
+ if(FLUIDSYNTH_SUPPORT_SDL3 AND NOT TARGET SDL3::SDL3)
+ find_dependency(SDL3)
+ endif()
+
+ if(FLUIDSYNTH_SUPPORT_SNDIO AND NOT TARGET SNDIO::SNDIO)
Index: patches/patch-cmake_admin_report_cmake
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-cmake_admin_report_cmake,v
diff -u -r1.4 patch-cmake_admin_report_cmake
--- patches/patch-cmake_admin_report_cmake 17 Mar 2025 12:17:12 -0000 1.4
+++ patches/patch-cmake_admin_report_cmake 19 Jan 2026 19:37:38 -0000
@@ -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 )
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-src_CMakeLists_txt,v
diff -u -r1.6 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 1 Sep 2025 17:53:49 -0000 1.6
+++ patches/patch-src_CMakeLists_txt 19 Jan 2026 19:37:38 -0000
@@ -12,15 +12,15 @@
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 )
Index: patches/patch-src_config_cmake
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-src_config_cmake,v
diff -u -r1.2 patch-src_config_cmake
--- patches/patch-src_config_cmake 17 Mar 2025 12:17:12 -0000 1.2
+++ patches/patch-src_config_cmake 19 Jan 2026 19:37:38 -0000
@@ -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@
Index: patches/patch-src_drivers_fluid_adriver_c
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_c,v
diff -u -r1.5 patch-src_drivers_fluid_adriver_c
--- patches/patch-src_drivers_fluid_adriver_c 21 Jan 2024 16:16:19 -0000 1.5
+++ patches/patch-src_drivers_fluid_adriver_c 19 Jan 2026 19:37:38 -0000
@@ -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[] =
{
Index: patches/patch-src_drivers_fluid_adriver_h
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_h,v
diff -u -r1.1 patch-src_drivers_fluid_adriver_h
--- patches/patch-src_drivers_fluid_adriver_h 21 Jan 2024 16:16:19 -0000 1.1
+++ patches/patch-src_drivers_fluid_adriver_h 19 Jan 2026 19:37:38 -0000
@@ -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);
Index: patches/patch-src_drivers_fluid_mdriver_c
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_c,v
diff -u -r1.6 patch-src_drivers_fluid_mdriver_c
--- patches/patch-src_drivers_fluid_mdriver_c 21 Jan 2024 16:16:19 -0000 1.6
+++ patches/patch-src_drivers_fluid_mdriver_c 19 Jan 2026 19:37:38 -0000
@@ -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[] =
{
Index: patches/patch-src_drivers_fluid_mdriver_h
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_h,v
diff -u -r1.1 patch-src_drivers_fluid_mdriver_h
--- patches/patch-src_drivers_fluid_mdriver_h 21 Jan 2024 16:16:19 -0000 1.1
+++ patches/patch-src_drivers_fluid_mdriver_h 19 Jan 2026 19:37:38 -0000
@@ -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);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/pkg/PLIST,v
diff -u -r1.7 PLIST
--- pkg/PLIST 20 Jan 2024 20:01:57 -0000 1.7
+++ pkg/PLIST 19 Jan 2026 19:37:38 -0000
@@ -19,10 +19,10 @@
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
Hi,
Attached updated patch using DIST_TUPLE.
I had a version with SDL3 enabled, and games linking against SDL2 happily linked against SDL3 enabled fluidsynth. But couldn't really test it.
However, I did a bit of research, and figured: SDL is just used as audio output.
As far as that research goes, with games using SDL2, and the fluidsynth backend using SDL3, it may come to all sorts of undefined behaviour. Both SDL versions may fight for the device etc.
Solutions are either: port all games to SDL3, or stick with fluidsynth with SDL2, and with that to the 2.4 version, OR use native OS audio output backend sndiod. As I understand, sndiod should be able to deal with SDL2 on one end, and fluidsynth as a second audio stream? But this may well be wrong here.
Given that, I don't think enabling SDL3 is a good idea for the time being if we want to upgrade, or stick for, maybe a looong time, with fluidsynth 2.4.
Sebastian
On Mon, Jan 19, 2026 at 6:22 PM Stuart Henderson <stu@spacehopper.org> wrote:
On 2026/01/19 17:19, Sebastian Reitenbach wrote:
> Hi,
>
> this updates fluidsynth to latest 2.5.2. They started to use a submodule which requires to
> fetch it before building.
>
> Lightly tested with midish connecting my midi keyboard controller to it.
>
> any comments, test reports etc. welcome.
>
>
> cheers,
> Sebastian
Your diff drops sdl2. I'm not sure what effect that has on other
programs which use fluidsynth that themselves use sdl - any ideas?
(Perhaps it would make sense to switch to sdl3 instead, but similarly
I don't know what effect that will have).
Please use DIST_TUPLE to fetch the submodule - you can do this on
top of your diff:
--- Makefile- Mon Jan 19 17:17:53 2026
+++ Makefile Mon Jan 19 17:17:43 2026
@@ -5,9 +5,7 @@ GH_ACCOUNT = FluidSynth
GH_PROJECT = fluidsynth
GH_TAGNAME = v2.5.2
-GCEM_V = 012ae73c6d0a2cb09ffe86475f5c6fba3926e200
-SITES.gcem = https://github.com/kthohr/gcem/archive/
-DISTFILES.gcem = ${GCEM_V}.zip
+DIST_TUPLE = github kthohr gcem 012ae73c6d0a2cb09ffe86475f5c6fba3926e200 gcem
SHARED_LIBS += fluidsynth 4.1 # 3.5.1 (grep LIB_VERSION CMakeLists.txt)
@@ -43,10 +41,6 @@ CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=
-Denable-sdl3=OFF
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-
-post-extract:
- rmdir ${WRKSRC}/gcem
- mv ${WRKDIR}/gcem-${GCEM_V} ${WRKSRC}/gcem
post-patch:
cp ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/drivers/
No comments:
Post a Comment