[SCM] snd/master: Fix FTBFS on kFreeBSD & Hurd

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue Jan 26 22:08:52 UTC 2016


The following commit has been merged in the master branch:
commit f26e020081c9c86e19a97c48e95014aa11d3c0d3
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Jan 26 22:37:34 2016 +0100

    Fix FTBFS on kFreeBSD & Hurd

diff --git a/debian/patches/jack-kfreebsd-hurd.diff b/debian/patches/jack-kfreebsd-hurd.diff
new file mode 100644
index 0000000..4645c2c
--- /dev/null
+++ b/debian/patches/jack-kfreebsd-hurd.diff
@@ -0,0 +1,15 @@
+Description: fix the HAVE_JACK_ON_LINUX macro for kFreeBSD & GNU/Hurd
+Author: IOhannes m zmölnig
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- snd.orig/audio.c
++++ snd/audio.c
+@@ -83,7 +83,7 @@
+ /* these pull in stdbool.h apparently, so they have to precede sndlib.h */
+ #endif
+ 
+-#define HAVE_JACK_IN_LINUX (MUS_JACK && __linux__)
++#define HAVE_JACK_IN_LINUX (MUS_JACK && (__linux__ || (__FreeBSD_kernel__ && __GLIBC__) || __GNU__))
+ 
+ #include "_sndlib.h"
+ #include "sndlib-strings.h"
diff --git a/debian/patches/series b/debian/patches/series
index e7f63cd..9c41bd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@ hardening.diff
 manpage_warnings.diff
 gcc_warnings.diff
 support-kfreebsd-hurd.diff
+jack-kfreebsd-hurd.diff
 reproducible.diff
 fix-typos.diff

-- 
snd packaging



More information about the pkg-multimedia-commits mailing list