diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 10:39:12 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 10:39:12 +0000 |
| commit | b2a7ffa557e166a30a966f2ec91a172ee7f3bee7 (patch) | |
| tree | 9a71ce5647e8f78e92a36c4f1f1e0283c3546fbf | |
| parent | Fix build on -current (machine/soundcard.h -> sys/soundcard.h) (diff) | |
Fix build on -current (machine/soundcard.h -> sys/soundcard.h)
Notes
Notes:
svn path=/head/; revision=65835
| -rw-r--r-- | audio/xtuner/files/patch-aa | 12 | ||||
| -rw-r--r-- | audio/xwave/files/patch-ad | 10 |
2 files changed, 14 insertions, 8 deletions
diff --git a/audio/xtuner/files/patch-aa b/audio/xtuner/files/patch-aa index 8a5fb144435c..9619159db448 100644 --- a/audio/xtuner/files/patch-aa +++ b/audio/xtuner/files/patch-aa @@ -1,12 +1,16 @@ ---- xtuner.h.orig Thu Dec 19 14:33:57 1996 -+++ xtuner.h Thu Jul 4 05:52:14 2002 -@@ -9,15 +9,14 @@ +--- xtuner.h.orig Thu Dec 19 11:33:57 1996 ++++ xtuner.h Sun Sep 8 03:33:58 2002 +@@ -9,15 +9,18 @@ #if (defined(BSD) && (BSD >= 199306)) # include <osreldate.h> # include <stdlib.h> -# include "/usr/X11/include/X11/forms.h" # include <machine/cpufunc.h> ++#ifdef __FreeBSD__ ++# include <sys/soundcard.h> ++#else # include <machine/soundcard.h> ++#endif #else # include <asm/io.h> -# include "forms.h" @@ -17,7 +21,7 @@ #include <X11/xpm.h> #include <X11/Xlib.h> #include <X11/Xutil.h> -@@ -46,6 +45,13 @@ +@@ -46,6 +49,13 @@ #if (defined(BSD) && (BSD >= 199306)) int fpiopl; diff --git a/audio/xwave/files/patch-ad b/audio/xwave/files/patch-ad index 7ddc80f2a60b..38e4f310a2de 100644 --- a/audio/xwave/files/patch-ad +++ b/audio/xwave/files/patch-ad @@ -1,14 +1,16 @@ ---- src/audio.c.orig Mon Nov 9 08:22:55 1998 -+++ src/audio.c Fri Jun 30 19:49:15 2000 -@@ -37,7 +37,7 @@ +--- src/audio.c.orig Sun Nov 8 15:22:55 1998 ++++ src/audio.c Sun Sep 8 03:35:52 2002 +@@ -37,8 +37,8 @@ #ifdef linux #include <linux/soundcard.h> -#elif defined(FreeBSD) +-#include <machine/soundcard.h> +#elif defined(__FreeBSD__) - #include <machine/soundcard.h> ++#include <sys/soundcard.h> #elif defined(sgi) + #include <dmedia/audio.h> @@ -55,7 +55,7 @@ #include "sample_settings.h" #include "audio.h" |