[SCM] fluidsynth/master: Patches refreshed/deleted.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 25c90ea7243864fe56a756aee5bfd9fd7c0d42e1
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Oct 2 11:07:53 2017 +0200

    Patches refreshed/deleted.

diff --git a/debian/patches/10-ftbfs-bug-690006.patch b/debian/patches/10-ftbfs-bug-690006.patch
deleted file mode 100644
index b7157fc..0000000
--- a/debian/patches/10-ftbfs-bug-690006.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Christoph Egger <christoph at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690006
-Description: Revert broken patch from release 1.1.6
-
-diff --git a/src/drivers/fluid_oss.c b/src/drivers/fluid_oss.c
-index 840dad1..40761db 100644
---- a/src/drivers/fluid_oss.c
-+++ b/src/drivers/fluid_oss.c
-@@ -45,7 +45,7 @@
- #define BUFFER_LENGTH 512
- 
- // Build issue on some systems (OSS 4.0)?
--#ifdef SNDCTL_DSP_CHANNELS
-+#ifndef SOUND_PCM_WRITE_CHANNELS
-   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
- #endif
diff --git a/debian/patches/1001-revert_abi_break_114.patch b/debian/patches/1001-revert_abi_break_114.patch
index b2e4c85..8effc35 100644
--- a/debian/patches/1001-revert_abi_break_114.patch
+++ b/debian/patches/1001-revert_abi_break_114.patch
@@ -4,9 +4,11 @@ Origin: upstream, commit:428
  src/sfloader/fluid_defsfont.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+Index: fluidsynth/src/sfloader/fluid_defsfont.h
+===================================================================
 --- fluidsynth.orig/src/sfloader/fluid_defsfont.h
 +++ fluidsynth/src/sfloader/fluid_defsfont.h
-@@ -421,7 +421,7 @@ int fluid_defsfont_iteration_next(fluid_
+@@ -426,7 +426,7 @@ int fluid_defsfont_iteration_next(fluid_
  int fluid_defsfont_load_sampledata(fluid_defsfont_t* sfont);
  int fluid_defsfont_add_sample(fluid_defsfont_t* sfont, fluid_sample_t* sample);
  int fluid_defsfont_add_preset(fluid_defsfont_t* sfont, fluid_defpreset_t* preset);
diff --git a/debian/patches/1010-Fix_server-connection.patch b/debian/patches/1010-Fix_server-connection.patch
deleted file mode 100644
index 674893f..0000000
--- a/debian/patches/1010-Fix_server-connection.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Description: Fix server connection ... cherrypicked from upstream
-Forwarded: no
-
-Index: fluidsynth/src/bindings/fluid_cmd.c
-===================================================================
---- fluidsynth.orig/src/bindings/fluid_cmd.c
-+++ fluidsynth/src/bindings/fluid_cmd.c
-@@ -1803,7 +1803,7 @@ struct _fluid_server_t {
-   fluid_mutex_t mutex;
- };
- 
--static void fluid_server_handle_connection(fluid_server_t* server,
-+static int fluid_server_handle_connection(fluid_server_t* server,
- 					  fluid_socket_t client_socket,
- 					  char* addr);
- static void fluid_server_close(fluid_server_t* server);
-@@ -1896,7 +1896,7 @@ static void fluid_server_close(fluid_ser
-   }
- }
- 
--static void
-+static int
- fluid_server_handle_connection(fluid_server_t* server, fluid_socket_t client_socket, char* addr)
- {
-   fluid_client_t* client;
-@@ -1904,14 +1904,15 @@ fluid_server_handle_connection(fluid_ser
- 
-   handler = server->newclient(server->data, addr);
-   if (handler == NULL) {
--    return;
-+    return -1;
-   }
- 
-   client = new_fluid_client(server, server->settings, handler, client_socket);
-   if (client == NULL) {
--    return;
-+    return -1;
-   }
-   fluid_server_add_client(server, client);
-+  return 0;
- }
- 
- void fluid_server_add_client(fluid_server_t* server, fluid_client_t* client)
diff --git a/debian/patches/series b/debian/patches/series
index 69b23a2..bf95dad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-10-ftbfs-bug-690006.patch
 1001-revert_abi_break_114.patch
-1010-Fix_server-connection.patch

-- 
fluidsynth packaging