Remove deprecated SDL2 driver

.azure/azure-pipelines-alpine.yml

@@ -30,7 +30,7 @@ stages:
   jobs:
   - job: DockerBuild
     pool:
-      vmImage: 'ubuntu-20.04'
+      vmImage: 'ubuntu-24.04'
     steps:
     - checkout: self
 
@@ -64,7 +64,7 @@ stages:
   jobs:
     - job: Alpine
       pool:
-        vmImage: 'ubuntu-20.04'
+        vmImage: 'ubuntu-24.04'
       strategy:
         matrix:
           no-cflags:

CMakeLists.txt

@@ -94,7 +94,6 @@ option ( enable-dsound "compile DirectSound support (if it is available)" on )
 option ( enable-wasapi "compile Windows WASAPI support (if it is available)" on )
 option ( enable-waveout "compile Windows WaveOut support (if it is available)" on )
 option ( enable-winmidi "compile Windows MIDI support (if it is available)" on )
-option ( enable-sdl2 "compile SDL2 audio support (if it is available)" off )
 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-pipewire "compile PipeWire support (if it is available)" on )
@@ -689,27 +688,6 @@ if ( enable-libinstpatch )
     endif ( InstPatch_FOUND )
 endif ( enable-libinstpatch )
 
-unset ( SDL2_SUPPORT CACHE )
-if ( enable-sdl2 )
-    message ( WARNING "SDL2 support is deprecated and will be removed in fluidsynth 2.5.0! Pls. use sdl3.")
-    find_package ( SDL2 QUIET )
-    if ( SDL2_FOUND )
-        if ( NOT DEFINED SDL2_VERSION )
-            include ( GetSDL2VersionFromHeaders )
-            get_sdl2_version_from_headers("${SDL2_INCLUDE_DIRS}" SDL2_VERSION)
-        endif ( NOT DEFINED SDL2_VERSION )
-        if ( SDL2_VERSION VERSION_LESS "2.0.4" )
-            message ( STATUS "Found SDL2 version ${SDL2_VERSION}, but the minimum required is 2.0.4" )
-        else ( SDL2_VERSION VERSION_LESS "2.0.4" )
-            message ( STATUS "Found SDL2: ${SDL2_LIBRARIES} (version: ${SDL2_VERSION})" )
-            set ( SDL2_SUPPORT 1 )
-            list ( APPEND PC_REQUIRES_PRIV "sdl2")
-        endif ( SDL2_VERSION VERSION_LESS "2.0.4" )
-    else ( SDL2_FOUND )
-        message ( STATUS "Could NOT find SDL2 (Set SDL2_DIR to the directory containing its CMake config)" )
-    endif ( SDL2_FOUND )
-endif ( enable-sdl2 )
-
 unset ( SDL3_SUPPORT CACHE )
 if ( enable-sdl3 )
     find_package ( SDL3 QUIET CONFIG COMPONENTS SDL3 )

FluidSynthConfig.cmake.in

@@ -13,7 +13,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_SDL3 @SDL3_SUPPORT@)
 set(FLUIDSYNTH_SUPPORT_WASAPI @WASAPI_SUPPORT@)
 set(FLUIDSYNTH_SUPPORT_WAVEOUT @WAVEOUT_SUPPORT@)
 set(FLUIDSYNTH_SUPPORT_WINMIDI @WINMIDI_SUPPORT@)
@@ -132,8 +132,8 @@ if(NOT FLUIDSYNTH_IS_SHARED)
     find_dependency(Readline)
   endif()
 
-  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_SYSTEMD AND NOT Systemd::libsystemd)

cmake_admin/report.cmake

@@ -86,12 +86,6 @@ else ( PULSE_SUPPORT )
     set ( AUDIO_MIDI_REPORT "${AUDIO_MIDI_REPORT}  PulseAudio:            no\n" )
 endif ( PULSE_SUPPORT )
 
-if ( SDL2_SUPPORT )
-    set ( AUDIO_MIDI_REPORT "${AUDIO_MIDI_REPORT}  SDL2:                  yes\n" )
-else ( SDL2_SUPPORT )
-    set ( AUDIO_MIDI_REPORT "${AUDIO_MIDI_REPORT}  SDL2:                  no\n" )
-endif ( SDL2_SUPPORT )
-
 if ( SDL3_SUPPORT )
     set ( AUDIO_MIDI_REPORT "${AUDIO_MIDI_REPORT}  SDL3:                  yes\n" )
 else ( SDL3_SUPPORT )

doc/fluidsettings.xml

@@ -402,9 +402,9 @@ Developers:
                   coreaudio (Mac OS X),<br />
                   dart (OS/2)
             </def>
-            <vals>alsa, coreaudio, dart, dsound, file, jack, oboe, opensles, oss, portaudio, pulseaudio, sdl2, sndman, wasapi, waveout</vals>
+            <vals>alsa, coreaudio, dart, dsound, file, jack, oboe, opensles, oss, portaudio, pulseaudio, sdl3, sndman, wasapi, waveout</vals>
             <desc>
-                The audio system to be used. In order to use sdl2 as audio driver, the application is responsible for initializing SDL's audio subsystem.<br /><br /><strong>Note:</strong> sdl2 and waveout are available since fluidsynth 2.1.
+                The audio system to be used. In order to use sdl3 as audio driver, the application is responsible for initializing SDL's audio subsystem.<br /><br /><strong>Note:</strong> waveout is available since fluidsynth 2.1.0, sdl3 since fluidsynth 2.4.4.
             </desc>
         </setting>
         <setting>
@@ -707,11 +707,11 @@ Developers:
             </desc>
         </setting>
         <setting>
-            <name>sdl2.device</name>
+            <name>sdl3.device</name>
             <type>str</type>
             <def>default</def>
             <desc>
-                Device to use for SDL2 driver output.
+                Device to use for SDL3 driver output.
             </desc>
         </setting>
         <setting>

src/CMakeLists.txt

@@ -69,10 +69,6 @@ if ( WINMIDI_SUPPORT )
   set ( fluid_winmidi_SOURCES drivers/fluid_winmidi.c )
 endif ( WINMIDI_SUPPORT )
 
-if ( SDL2_SUPPORT )
-  set ( fluid_sdl2_SOURCES drivers/fluid_sdl2.c )
-endif ( SDL2_SUPPORT )
-
 if ( SDL3_SUPPORT )
   set ( fluid_sdl3_SOURCES drivers/fluid_sdl3.c )
 endif ( SDL3_SUPPORT )
@@ -258,7 +254,6 @@ add_library ( libfluidsynth-OBJ OBJECT
     ${fluid_wasapi_SOURCES}
     ${fluid_waveout_SOURCES}
     ${fluid_winmidi_SOURCES}
-    ${fluid_sdl2_SOURCES}
     ${fluid_sdl3_SOURCES}
     ${fluid_libinstpatch_SOURCES}
     ${fluid_osal_SOURCES}
@@ -418,11 +413,6 @@ if ( TARGET InstPatch::libinstpatch AND LIBINSTPATCH_SUPPORT )
     target_link_libraries ( libfluidsynth-OBJ PUBLIC InstPatch::libinstpatch )
 endif()
 
-if ( SDL2_SUPPORT )
-    target_include_directories ( libfluidsynth-OBJ PRIVATE ${SDL2_INCLUDE_DIRS} )
-    target_link_libraries ( libfluidsynth-OBJ PUBLIC ${SDL2_LIBRARIES} )
-endif()
-
 if ( SDL3_SUPPORT )
     target_link_libraries ( libfluidsynth-OBJ PUBLIC SDL3::SDL3 )
 endif()
@@ -519,11 +509,6 @@ if ( TARGET GLib2::glib-2 ) # because g_file_test()
     target_link_libraries ( fluidsynth PRIVATE GLib2::glib-2 )
 endif()
 
-if ( SDL2_SUPPORT ) # because SDL_Init() etc.
-    target_include_directories ( fluidsynth PRIVATE ${SDL2_INCLUDE_DIRS} )
-    target_link_libraries ( fluidsynth PRIVATE ${SDL2_LIBRARIES} )
-endif()
-
 if ( SDL3_SUPPORT )
     target_link_libraries ( fluidsynth PUBLIC SDL3::SDL3 )
 endif ( SDL3_SUPPORT )

src/config.cmake

@@ -205,9 +205,6 @@
 /* Define to enable Windows MIDI driver */
 #cmakedefine WINMIDI_SUPPORT @WINMIDI_SUPPORT@
 
-/* Define to enable SDL2 audio driver */
-#cmakedefine SDL2_SUPPORT @SDL2_SUPPORT@
-
 /* Define to enable SDL3 audio driver */
 #cmakedefine SDL3_SUPPORT @SDL3_SUPPORT@
 

src/drivers/fluid_adriver.c

@@ -199,16 +199,6 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] =
     },
 #endif
 
-#if SDL2_SUPPORT
-    {
-        "sdl2",
-        new_fluid_sdl2_audio_driver,
-        NULL,
-        delete_fluid_sdl2_audio_driver,
-        fluid_sdl2_audio_driver_settings
-    },
-#endif
-
 #if AUFILE_SUPPORT
     {
         "file",

src/drivers/fluid_adriver.h

@@ -172,13 +172,6 @@ void delete_fluid_dart_audio_driver(fluid_audio_driver_t *p);
 void fluid_dart_audio_driver_settings(fluid_settings_t *settings);
 #endif
 
-#if SDL2_SUPPORT
-fluid_audio_driver_t *new_fluid_sdl2_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-void delete_fluid_sdl2_audio_driver(fluid_audio_driver_t *p);
-void fluid_sdl2_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
 #if SDL3_SUPPORT
 fluid_audio_driver_t *new_fluid_sdl3_audio_driver(fluid_settings_t *settings,
         fluid_synth_t *synth);