Make old fluidsynth patches apply clean

patches/fluidsynth/02_skip_dsound_support.patch

@@ -1,52 +0,0 @@
---- fluidsynth-static-1.1.11.orig/src/drivers/fluid_dsound.c
-+++ fluidsynth-static-1.1.11/src/drivers/fluid_dsound.c
-@@ -23,7 +23,7 @@
- #include "fluid_adriver.h"
- #include "fluid_settings.h"
-
--#if DSOUND_SUPPORT
-+#if DSOUND_SUPPORT_OFF
-
- #define INITGUID
-
---- fluidsynth-static-1.1.11.orig/src/drivers/fluid_adriver.h
-+++ fluidsynth-static-1.1.11/src/drivers/fluid_adriver.h
-@@ -74,7 +74,7 @@ void delete_fluid_core_audio_driver(fluid_audio_driver_t *p);
- void fluid_core_audio_driver_settings(fluid_settings_t *settings);
- #endif
-
--#if DSOUND_SUPPORT
-+#if DSOUND_SUPPORT_OFF
- fluid_audio_driver_t *new_fluid_dsound_audio_driver(fluid_settings_t *settings,
-         fluid_synth_t *synth);
- void delete_fluid_dsound_audio_driver(fluid_audio_driver_t *p);
-
---- fluidsynth-static-1.1.11.orig/src/drivers/fluid_adriver.c
-+++ fluidsynth-static-1.1.11/src/drivers/fluid_adriver.c
-@@ -89,7 +89,7 @@ static const fluid_audriver_definition_t fluid_audio_drivers[$
-     },
- #endif
-
--#if DSOUND_SUPPORT
-+#if DSOUND_SUPPORT_OFF
-     {
-         "dsound",
-         new_fluid_dsound_audio_driver,
-@@ -181,7 +181,7 @@ void fluid_audio_driver_settings(fluid_settings_t *settings)
-     fluid_settings_register_str(settings, "audio.driver", "oss", 0);
- #elif COREAUDIO_SUPPORT
-     fluid_settings_register_str(settings, "audio.driver", "coreaudio", 0);
--#elif DSOUND_SUPPORT
-+#elif DSOUND_SUPPORT_OFF
-     fluid_settings_register_str(settings, "audio.driver", "dsound", 0);
- #elif SNDMAN_SUPPORT
-     fluid_settings_register_str(settings, "audio.driver", "sndman", 0);
-@@ -208,7 +208,7 @@ void fluid_audio_driver_settings(fluid_settings_t *settings)
- #if COREAUDIO_SUPPORT
-     fluid_settings_add_option(settings, "audio.driver", "coreaudio");
- #endif
--#if DSOUND_SUPPORT
-+#if DSOUND_SUPPORT_OFF
-     fluid_settings_add_option(settings, "audio.driver", "dsound");
- #endif
- #if SNDMAN_SUPPORT

patches/fluidsynth/03_skip-drivers-build.patch~old → patches/fluidsynth/03_skip-drivers-build.patch

@@ -1,6 +1,6 @@
 --- fluidsynth-static-1.1.11.orig/src/CMakeLists.txt
 +++ fluidsynth-static-1.1.11/src/CMakeLists.txt
-@@ -175,11 +175,6 @@ set ( libfluidsynth_SOURCES
+@@ -168,11 +168,6 @@ set ( libfluidsynth_SOURCES
      midi/fluid_midi_router.h
      midi/fluid_seqbind.c
      midi/fluid_seq.c
@@ -12,12 +12,10 @@
      bindings/fluid_cmd.c
      bindings/fluid_cmd.h
      bindings/fluid_filerenderer.c
-@@ -335,32 +330,14 @@ target_link_libraries ( libfluidsynth
-     ${LIBFLUID_LIBS}
- )
+@@ -319,30 +314,14 @@ target_link_libraries ( libfluidsynth
+ 
+ # ************ CLI program ************
  
--# ************ CLI program ************
--
 -set ( fluidsynth_SOURCES fluidsynth.c )
 -
 -add_executable ( fluidsynth
@@ -47,14 +45,15 @@
      RUNTIME DESTINATION ${BIN_INSTALL_DIR}
      LIBRARY DESTINATION ${LIB_INSTALL_DIR}
      ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+
 --- fluidsynth-static-1.1.11.orig/src/utils/fluid_settings.c
 +++ fluidsynth-static-1.1.11/src/utils/fluid_settings.c
-@@ -297,8 +297,6 @@ fluid_settings_init(fluid_settings_t* se
-   fluid_shell_settings(settings);
-   fluid_player_settings(settings);
-   fluid_file_renderer_settings(settings);
--  fluid_audio_driver_settings(settings);
--  fluid_midi_driver_settings(settings);
+@@ -331,8 +331,6 @@ fluid_settings_init(fluid_settings_t *settings)
+     fluid_shell_settings(settings);
+     fluid_player_settings(settings);
+     fluid_file_renderer_settings(settings);
+-    fluid_audio_driver_settings(settings);
+-    fluid_midi_driver_settings(settings);
  }
- 
+
  static int