[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-8-4-gd63a437

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

The following commit has been merged in the master branch:
commit e4b31b03f820a2a90ada8dce9f2955f81dc858d1
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed May 5 16:40:15 2010 +0200

    Provide fix for GNU/kFreeBSD (Closes: #579465)

diff --git a/debian/patches/kfreebsd-fix b/debian/patches/kfreebsd-fix
new file mode 100644
index 0000000..51475ac
--- /dev/null
+++ b/debian/patches/kfreebsd-fix
@@ -0,0 +1,47 @@
+Index: jack-audio-connection-kit/common/jack/systemdeps.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/jack/systemdeps.h	2010-05-05 16:36:31.000000000 +0200
++++ jack-audio-connection-kit/common/jack/systemdeps.h	2010-05-05 16:36:55.000000000 +0200
+@@ -53,7 +53,7 @@
+ 
+ #endif /* WIN32 */
+ 
+-#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun)
++#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) || defined(__unix__)
+     #include <inttypes.h>
+     #include <pthread.h>
+     #include <sys/types.h>
+Index: jack-audio-connection-kit/linux/cycles.h
+===================================================================
+--- jack-audio-connection-kit.orig/linux/cycles.h	2010-05-05 16:37:14.000000000 +0200
++++ jack-audio-connection-kit/linux/cycles.h	2010-05-05 16:38:04.000000000 +0200
+@@ -119,4 +119,17 @@
+ 
+ #endif
+ 
++#if defined(__FreeBSD_kernel__)
++
++#warning No suitable get_cycles() implementation. Returning 0 instead
++
++typedef unsigned long long cycles_t;
++
++static inline cycles_t get_cycles(void)
++{
++    return 0;
++}
++
++#endif
++
+ #endif /* __jack_cycles_h__ */
+Index: jack-audio-connection-kit/wscript
+===================================================================
+--- jack-audio-connection-kit.orig/wscript	2010-05-05 16:35:25.000000000 +0200
++++ jack-audio-connection-kit/wscript	2010-05-05 16:35:46.000000000 +0200
+@@ -79,6 +79,7 @@
+     platform = Utils.detect_platform()
+     conf.env['IS_MACOSX'] = platform == 'darwin'
+     conf.env['IS_LINUX'] = platform == 'linux'
++    conf.env['IS_LINUX'] = platform == 'posix'
+     conf.env['IS_SUN'] = platform == 'sunos'
+ 
+     if conf.env['IS_LINUX']:
diff --git a/debian/patches/more-kfreebsd b/debian/patches/more-kfreebsd
new file mode 100644
index 0000000..dfff165
--- /dev/null
+++ b/debian/patches/more-kfreebsd
@@ -0,0 +1,13 @@
+Index: jack-audio-connection-kit-1.9.5~dfsg/dbus/sigsegv.c
+===================================================================
+--- jack-audio-connection-kit-1.9.5~dfsg.orig/dbus/sigsegv.c	2010-05-05 18:51:06.000000000 +0200
++++ jack-audio-connection-kit-1.9.5~dfsg/dbus/sigsegv.c	2010-05-05 18:52:05.000000000 +0200
+@@ -98,7 +98,7 @@
+     jack_error("info.si_errno = %d", info->si_errno);
+     jack_error("info.si_code  = %d (%s)", info->si_code, si_codes[info->si_code]);
+     jack_error("info.si_addr  = %p", info->si_addr);
+-#if !defined(__alpha__) && !defined(__ia64__)
++#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__)
+     for(i = 0; i < NGREG; i++)
+         jack_error("reg[%02d]       = 0x" REGFORMAT, i, 
+ #if defined(__powerpc__)
diff --git a/debian/patches/series b/debian/patches/series
index 061c93c..87690b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,8 @@
 0000_sync_upstream_VCS.patch
+kfreebsd-fix
 alpha_ia64-sigsegv
 0001_jackrec-rename.patch
 0002_manpages.patch
 1001_connect.patch
 1002_waf_wscript_update.patch
+more-kfreebsd

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