Package: audacity
Severity: important
Tags: patch

Hi,

audacity fails to build on GNU/kFreeBSD because of missing #if #endif to
handle this system. Please find attached a patch to fix that. It would
be nice if you could apply it in the next upload.

Thanks in advance,
Aurelien



-- System Information:
Debian Release: testing/unstable
Architecture: kfreebsd-i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: GNU/kFreeBSD 5.4-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Status: in BTS
Author: aurel32

--- audacity-1.2.4b.orig/lib-src/libnyquist/snd/sndconfig.h
+++ audacity-1.2.4b/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.2.4b.orig/lib-src/libnyquist/sys/term.c
+++ audacity-1.2.4b/lib-src/libnyquist/sys/term.c
@@ -40,7 +40,7 @@
 #else
 
 #include <termios.h>
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #include <asm/ioctls.h>
 #endif
 #include <signal.h>
only in patch2:
unchanged:
--- audacity-1.2.4b.orig/lib-src/portaudio/pa_unix_oss/pa_unix_oss.c
+++ audacity-1.2.4b/lib-src/portaudio/pa_unix_oss/pa_unix_oss.c
@@ -42,6 +42,8 @@
 
 #ifdef __linux__
 #include <linux/soundcard.h>
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <sys/soundcard.h>
 #else
 #include <machine/soundcard.h> /* JH20010905 */
 #endif
only in patch2:
unchanged:
--- audacity-1.2.4b.orig/lib-src/portmixer/px_unix_oss/px_unix_oss.c
+++ audacity-1.2.4b/lib-src/portmixer/px_unix_oss/px_unix_oss.c
@@ -37,6 +37,8 @@
 
 #ifdef __linux__
 #include <linux/soundcard.h>
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <sys/soundcard.h>
 #else
 #include <machine/soundcard.h> /* JH20010905 */
 #endif

Reply via email to