SDL3 Support

CMakeLists.txt

@@ -95,6 +95,7 @@ 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)" off )
 option ( enable-pulseaudio "compile PulseAudio 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 )
@@ -683,6 +684,26 @@ if ( enable-sdl2 )
     endif ( SDL2_FOUND )
 endif ( enable-sdl2 )
 
+unset ( SDL3_SUPPORT CACHE )
+if ( enable-sdl3 )
+    find_package ( SDL3 QUIET )
+    if ( SDL3_FOUND )
+        if ( NOT DEFINED SDL3_VERSION )
+            include ( GetSDL3VersionFromHeaders )
+            get_sdl3_version_from_headers("${SDL2_INCLUDE_DIRS}" SDL3_VERSION)
+        endif ( NOT DEFINED SDL3_VERSION )
+        if ( SDL3_VERSION VERSION_LESS "3.2.0" )
+            message ( STATUS "Found SDL3 version ${SDL3_VERSION}, but the minimum required is 3.2.0" )
+        else ( SDL3_VERSION VERSION_LESS "3.2.0" )
+            message ( STATUS "Found SDL3: ${SDL3_LIBRARIES} (version: ${SDL3_VERSION})" )
+            set ( SDL3_SUPPORT TRUE )
+            list ( APPEND PC_REQUIRES_PRIV "sdl3")
+        endif ( SDL2_VERSION VERSION_LESS "3.2.0" )
+    else ( SDL3_FOUND )
+        message ( STATUS "Could NOT find SDL3 (Set SDL3_DIR to the directory containing its CMake config)" )
+    endif ( SDL3_FOUND )
+endif ( enable-sdl3 )
+
 unset ( OBOE_SUPPORT CACHE )
 if ( enable-oboe )
   find_package ( oboe )

cmake_admin/GetSDL3VersionFromHeaders.cmake

@@ -0,0 +1,21 @@
+# Get the version of SDL2 through headers
+# This is needed for autotools builds before 2.0.12
+function(get_sdl3_version_from_headers INCLUDE_DIR OUT_VAR)
+  file(READ "${INCLUDE_DIR}/SDL_version.h" SDL_VERSION_H)
+  string(REGEX MATCH "#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)"
+               SDL3_MAJOR_RE "${SDL_VERSION_H}")
+  set(SDL3_MAJOR "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)"
+               SDL3_MINOR_RE "${SDL_VERSION_H}")
+  set(SDL3_MINOR "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)" SDL3_PATCH_RE
+               "${SDL_VERSION_H}")
+  set(SDL3_PATCH "${CMAKE_MATCH_1}")
+  if(SDL3_MAJOR_RE
+     AND SDL3_MINOR_RE
+     AND SDL3_PATCH_RE)
+    set(${OUT_VAR}
+        "${SDL3_MAJOR}.${SDL3_MINOR}.${SDL3_PATCH}"
+        PARENT_SCOPE)
+  endif()
+endfunction()

cmake_admin/report.cmake

@@ -92,6 +92,12 @@ 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 )
+    set ( AUDIO_MIDI_REPORT "${AUDIO_MIDI_REPORT}  SDL3:                  no\n" )
+endif ( SDL3_SUPPORT )
+
 if ( WASAPI_SUPPORT )
     set ( AUDIO_MIDI_REPORT "${AUDIO_MIDI_REPORT}  WASAPI:                yes\n" )
 else ( WASAPI_SUPPORT )

src/CMakeLists.txt

@@ -73,6 +73,10 @@ 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 )
+
 if ( OSS_SUPPORT )
   set ( fluid_oss_SOURCES drivers/fluid_oss.c )
 endif ( OSS_SUPPORT )
@@ -240,6 +244,7 @@ add_library ( libfluidsynth-OBJ OBJECT
     ${fluid_waveout_SOURCES}
     ${fluid_winmidi_SOURCES}
     ${fluid_sdl2_SOURCES}
+    ${fluid_sdl3_SOURCES}
     ${fluid_libinstpatch_SOURCES}
     ${libfluidsynth_SOURCES}
     ${public_HEADERS}

src/config.cmake

@@ -208,6 +208,9 @@
 /* Define to enable SDL2 audio driver */
 #cmakedefine SDL2_SUPPORT @SDL2_SUPPORT@
 
+/* Define to enable SDL3 audio driver */
+#cmakedefine SDL3_SUPPORT @SDL3_SUPPORT@
+
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS @STDC_HEADERS@
 

src/drivers/fluid_adriver.c

@@ -190,6 +190,16 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] =
     },
 #endif
 
+#if SDL3_SUPPORT
+    {
+        "sdl3",
+        new_fluid_sdl3_audio_driver,
+        NULL,
+        delete_fluid_sdl3_audio_driver,
+        fluid_sdl3_audio_driver_settings
+    },
+#endif
+
 #if SDL2_SUPPORT
     {
         "sdl2",

src/drivers/fluid_adriver.h

@@ -180,6 +180,13 @@ 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);
+void delete_fluid_sdl3_audio_driver(fluid_audio_driver_t *p);
+void fluid_sdl3_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
 #if AUFILE_SUPPORT
 fluid_audio_driver_t *new_fluid_file_audio_driver(fluid_settings_t *settings,
         fluid_synth_t *synth);