[SCM] jackd2/master: Add patch to fix FTBFS on kFreeBSD (Closes: #651108)

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Wed Jan 18 13:40:17 UTC 2012


The following commit has been merged in the master branch:
commit b9daa430e7c3d17298b4eec1cf1500ec325d35aa
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Jan 17 16:48:48 2012 +0100

    Add patch to fix FTBFS on kFreeBSD (Closes: #651108)
    
    CELT is included indirectly via config.h. __linux__ isn't the right
    macro to make the include conditional, since it doesn't work on kFreeBSD
    and hurd.
    
    This patch fixes the problem. I've submitted it to upstream and expect
    it to be included in jackd2-1.9.9.

diff --git a/debian/patches/netjack-kfreebsd.patch b/debian/patches/netjack-kfreebsd.patch
new file mode 100644
index 0000000..95705e0
--- /dev/null
+++ b/debian/patches/netjack-kfreebsd.patch
@@ -0,0 +1,43 @@
+From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+Forwarded: http://trac.jackaudio.org/ticket/264
+Bugs-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651108
+Description: Fix FTBFS on kFreeBSD
+diff --git a/common/netjack.c b/common/netjack.c
+index 075b97c..74cdc5d 100644
+--- a/common/netjack.c
++++ b/common/netjack.c
+@@ -47,7 +47,7 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $
+ #include <netinet/in.h>
+ #endif
+ 
+-#ifdef __linux__
++#if defined(HAVE_CONFIG_H)
+ #include "config.h"
+ #endif
+ 
+diff --git a/common/netjack_packet.c b/common/netjack_packet.c
+index 9434985..634a069 100644
+--- a/common/netjack_packet.c
++++ b/common/netjack_packet.c
+@@ -26,7 +26,7 @@
+  *
+  */
+ 
+-#ifdef __linux__
++#if defined(HAVE_CONFIG_H)
+ #include "config.h"
+ #endif
+ 
+diff --git a/example-clients/netsource.c b/example-clients/netsource.c
+index 8da4d4f..e2b916e 100644
+--- a/example-clients/netsource.c
++++ b/example-clients/netsource.c
+@@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ #include <string.h>
+ #include <signal.h>
+ 
+-#ifdef __linux__
++#if defined(HAVE_CONFIG_H)
+ #include "config.h"
+ #endif
+ 

-- 
jackd2 packaging



More information about the pkg-multimedia-commits mailing list