[SCM] fluidsynth/master: Add patch to fix server connection. (Closes: #798815)

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Mon Sep 14 07:04:32 UTC 2015


The following commit has been merged in the master branch:
commit 4029324f12a16f3f9d1490d9fe11e4f8429426c9
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Sep 14 09:04:18 2015 +0200

    Add patch to fix server connection. (Closes: #798815)

diff --git a/debian/patches/1010-Fix_server-connection.patch b/debian/patches/1010-Fix_server-connection.patch
new file mode 100644
index 0000000..674893f
--- /dev/null
+++ b/debian/patches/1010-Fix_server-connection.patch
@@ -0,0 +1,44 @@
+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 898537c..69b23a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10-ftbfs-bug-690006.patch
 1001-revert_abi_break_114.patch
+1010-Fix_server-connection.patch

-- 
fluidsynth packaging



More information about the pkg-multimedia-commits mailing list