[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd2, updated. debian/1.9.4+svn3842-1-3-ge42b555

[freee at users.alioth.debian.org]

The following commit has been merged in the master.jackd2 branch:
commit e42b555e57ffbaf0e88695c44aa98fe1d7da1d7b
Author: Free Ekanayaka <free at 64studio.com>
Date:   Sun Dec 27 22:57:59 2009 +0100

    Fix a problem with jack_connect using a hard coded JACK client name
    and when calling jack_connect or jack_disconnect multiple times in a
    fast sequence, then the subsequent jack_(dis)connect calls fail.

diff --git a/debian/changelog b/debian/changelog
index f0e65be..8e74227 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-jack-audio-connection-kit (1.9.4+svn3842-2) UNRELEASED; urgency=low
+jack-audio-connection-kit (1.9.4+svn3842-2) experimental; urgency=low
 
-  * TBD
+  * Fix a problem with jack_connect using a hard coded JACK client name
+    and when calling jack_connect or jack_disconnect multiple times in a
+    fast sequence, then the subsequent jack_(dis)connect calls fail.
 
- -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Tue, 15 Dec 2009 14:53:40 +0100
+ -- Free Ekanayaka <freee at debian.org>  Sun, 27 Dec 2009 17:30:06 +0100
 
 jack-audio-connection-kit (1.9.4+svn3842-1) experimental; urgency=low
 
diff --git a/debian/patches/connect.diff b/debian/patches/connect.diff
new file mode 100644
index 0000000..de05208
--- /dev/null
+++ b/debian/patches/connect.diff
@@ -0,0 +1,47 @@
+diff --git a/example-clients/connect.c b/example-clients/connect.c
+index a89e538..4168c29 100644
+--- a/example-clients/connect.c
++++ b/example-clients/connect.c
+@@ -20,6 +20,7 @@
+ #include <errno.h>
+ #ifndef WIN32
+ #include <unistd.h>
++#include <sys/types.h> /* for getpid() */
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
+@@ -37,6 +38,7 @@ main (int argc, char *argv[])
+ {
+ 	jack_client_t* client = NULL;
+ 	char *my_name = strrchr(argv[0], '/');
++	char my_client_name[80];
+ 	connecting = disconnecting = FALSE;
+ 	if (my_name == 0) {
+ 		my_name = argv[0];
+@@ -56,6 +58,8 @@ main (int argc, char *argv[])
+ 		return 1;
+ 	}
+ 
++	printf("connecting %ld\n",connecting);
++
+ 	if (argc != 3) {
+ 		fprintf (stderr, "usage: %s <src_port> <dst_port>\n", my_name);
+ 		fprintf(stderr, "The source port must be an output port of the source client.\n");
+@@ -63,9 +67,16 @@ main (int argc, char *argv[])
+ 		return 1;
+ 	}
+ 
++#ifndef WIN32
++	/* try to assemble an unique JACK client name */
++	sprintf(my_client_name, "jack_connect%d", getpid());
++#else
++	sprintf(my_client_name, "jack_connect");
++#endif
++
+ 	/* try to become a client of the JACK server */
+ 
+-	if ((client = jack_client_open (my_name, JackNullOption, NULL)) == 0) {
++	if ((client = jack_client_new (my_client_name)) == 0) {
+ 		fprintf (stderr, "jack server not running?\n");
+ 		return 1;
+ 	}

-- 
Debian packaging for jack-audio-connection-kit