[SCM] snd/master: Really fixed FTBFS on kFreeBSD/Hurd

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fc336c92480299aeb791d9d39637bc212fa6c94f
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jan 27 11:06:27 2016 +0100

    Really fixed FTBFS on kFreeBSD/Hurd
    
    took a ride to the porter-boxes...

diff --git a/debian/patches/jack-kfreebsd-hurd.diff b/debian/patches/jack-kfreebsd-hurd.diff
index 4645c2c..0aaeee5 100644
--- a/debian/patches/jack-kfreebsd-hurd.diff
+++ b/debian/patches/jack-kfreebsd-hurd.diff
@@ -2,14 +2,21 @@ 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/
+Index: snd/audio.c
+===================================================================
 --- snd.orig/audio.c
 +++ snd/audio.c
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,12 @@
  /* 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__))
++/* using JACK on GNU/linux, GNU/kFreeBSD and GNU/Hurd is all the same */
++#if (defined __linux__ || (defined __FreeBSD_kernel__ && defined __GLIBC__) || defined __GNU__)
++# define HAVE_JACK_IN_LINUX MUS_JACK
++#else
++# define HAVE_JACK_IN_LINUX 0
++#endif
  
  #include "_sndlib.h"
  #include "sndlib-strings.h"
diff --git a/debian/patches/support-kfreebsd-hurd.diff b/debian/patches/support-kfreebsd-hurd.diff
index 5ef3edf..c7a4743 100644
--- a/debian/patches/support-kfreebsd-hurd.diff
+++ b/debian/patches/support-kfreebsd-hurd.diff
@@ -5,18 +5,17 @@ Bug: http://bugs.debian.org/566779
  configure.ac |   30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)
 
+Index: snd/configure.ac
+===================================================================
 --- snd.orig/configure.ac
 +++ snd/configure.ac
-@@ -657,6 +657,38 @@
+@@ -657,6 +657,35 @@ case "$host" in
      fi
      ;;
  
 +    *-*-kfreebsd*|*-*-gnu*)
 +        LDSO_FLAGS="-shared"
-+        LIBS="$LIBS -lm"
-+        if test "$ac_cv_header_dlfcn_h" = yes ; then
-+          LIBS="$LIBS -ldl"
-+        fi
++        LIBS="$LIBS -lm -ldl"
 +        if test "$GCC" = yes ; then
 +          SO_FLAGS="-fPIC $SO_FLAGS"
 +        fi

-- 
snd packaging