diff --git a/Config.in.legacy b/Config.in.legacy index 7b2d448aba..affd1cf8c0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,12 +146,6 @@ endif comment "Legacy options removed in 2026.05.2" -config BR2_PACKAGE_FLUIDSYNTH_SDL2 - bool "fluidsynth sdl2 audio support removed" - select BR2_LEGACY - help - FluidSynth SDL2 audio support was removed in v2.5.0. - config BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP bool "hostapd hostap driver removed" select BR2_LEGACY diff --git a/package/fluidsynth/Config.in b/package/fluidsynth/Config.in index 206824560b..66fb07f45e 100644 --- a/package/fluidsynth/Config.in +++ b/package/fluidsynth/Config.in @@ -84,11 +84,15 @@ comment "pulseaudio support needs a toolchain w/ dynamic library, wchar, threads depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC depends on BR2_STATIC_LIBS || !BR2_USE_MMU || !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_FLUIDSYNTH_SDL3 - bool "sdl3" - select BR2_PACKAGE_SDL3 +config BR2_PACKAGE_FLUIDSYNTH_SDL2 + bool "sdl2" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_SDL2 help - Enable SDL3 audio support. + Enable SDL2 audio support. + +comment "SDL2 audio support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS comment "Misc options" @@ -110,15 +114,6 @@ config BR2_PACKAGE_FLUIDSYNTH_FLOATS Enable 32-bit single precision float support, instead of 64-bit double precision floats for DSP samples. -config BR2_PACKAGE_FLUIDSYNTH_NATIVE_DLS - bool "Native DLS soundfont" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 - help - Enable the native DLS soundfont format support. - -comment "native dls soundfont support needs gcc >= 7" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 - config BR2_PACKAGE_FLUIDSYNTH_READLINE bool "readline" select BR2_PACKAGE_READLINE diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 0d727e75e6..9953997692 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ce27840221ab00dd59bf27e85ecbba480c6c2a7c9fbec4243658f68f59c07f4a fluidsynth-2.5.7.tar.gz -sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 LICENSE +sha256 7fb0e328c66a24161049e2b9e27c3b6e51a6904b31b1a647f73cc1f322523e88 fluidsynth-2.4.7.tar.gz +sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 1d6cb118ff..e06afe4a07 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.5.7 +FLUIDSYNTH_VERSION = 2.4.7 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE @@ -46,12 +46,6 @@ else FLUIDSYNTH_CONF_OPTS += -Denable-libsndfile=0 endif -ifeq ($(BR2_PACKAGE_FLUIDSYNTH_NATIVE_DLS),y) -FLUIDSYNTH_CONF_OPTS += -Denable-native-dls=1 -else -FLUIDSYNTH_CONF_OPTS += -Denable-native-dls=0 -endif - ifeq ($(BR2_PACKAGE_FLUIDSYNTH_PORTAUDIO),y) FLUIDSYNTH_CONF_OPTS += -Denable-portaudio=1 FLUIDSYNTH_DEPENDENCIES += portaudio @@ -73,11 +67,11 @@ else FLUIDSYNTH_CONF_OPTS += -Denable-readline=0 endif -ifeq ($(BR2_PACKAGE_FLUIDSYNTH_SDL3),y) -FLUIDSYNTH_CONF_OPTS += -Denable-sdl3=1 -FLUIDSYNTH_DEPENDENCIES += sdl3 +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_SDL2),y) +FLUIDSYNTH_CONF_OPTS += -Denable-sdl2=1 +FLUIDSYNTH_DEPENDENCIES += sdl2 else -FLUIDSYNTH_CONF_OPTS += -Denable-sdl3=0 +FLUIDSYNTH_CONF_OPTS += -Denable-sdl2=0 endif ifeq ($(BR2_PACKAGE_SYSTEMD),y)