Bug#542765: audacity: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: audacity
Version: 1.3.7-3
Severity: important
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD,
it is partial reincarnation of #409260.

It still needs some "|| defined(__FreeBSD_kernel__)".
Please find attached patch with them.

It would also be nice if you can ask upstream
to include this changes.

Thanks in advance

                        Petr
only in patch2:
unchanged:
--- audacity-1.3.7.orig/lib-src/libnyquist/snd/sndconfig.h
+++ audacity-1.3.7/lib-src/libnyquist/snd/sndconfig.h
@@ -60,7 +60,7 @@
 #elif defined(IRIX)
   #include "sndirix.h"
 
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   #include "sndfreebsd.h"
 
 #elif defined(_WIN32)
only in patch2:
unchanged:
--- audacity-1.3.7.orig/lib-src/portmixer/src/px_unix_oss.c
+++ audacity-1.3.7/lib-src/portmixer/src/px_unix_oss.c
@@ -38,7 +38,7 @@
 
 #if defined(__linux__)
 #include <linux/soundcard.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/soundcard.h>
 #else
 #include <machine/soundcard.h> /* JH20010905 */
only in patch2:
unchanged:
--- audacity-1.3.7.orig/lib-src/portmixer/px_unix_oss/px_unix_oss.c
+++ audacity-1.3.7/lib-src/portmixer/px_unix_oss/px_unix_oss.c
@@ -37,7 +37,7 @@
 
 #if defined(__linux__)
 #include <linux/soundcard.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/soundcard.h>
 #else
 #include <machine/soundcard.h> /* JH20010905 */