diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2002-04-16 19:34:24 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2002-04-16 19:34:24 +0000 |
| commit | 4a6fa7fd6f61046675783b817e4a3a5324617c84 (patch) | |
| tree | 721c2692ccc973d97f0c8461ae2fa99203156601 /java | |
| parent | 7ca01b048033af4ade37af5af2af09c6e4c020ab (diff) | |
| download | ports-4a6fa7fd6f61046675783b817e4a3a5324617c84.tar.gz ports-4a6fa7fd6f61046675783b817e4a3a5324617c84.zip | |
Fix the build of libaudio.so on 5-CURRENT by using <sys/soundcard.h>
rather than <machine/soundcard.h>. This doesn't affect the build
on 4-STABLE.
PR: 36988
Submitted by: Motoyuki Konno <motoyuki@bsdclub.org>
Reviewed by: sobomax
Approved by: sobomax
Notes
Notes:
svn path=/head/; revision=57770
Diffstat (limited to 'java')
8 files changed, 128 insertions, 0 deletions
diff --git a/java/jdk13/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c b/java/jdk13/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c new file mode 100644 index 000000000000..5adab099618b --- /dev/null +++ b/java/jdk13/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 15:14:18 2002 +@@ -58,7 +58,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> diff --git a/java/jdk13/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c b/java/jdk13/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c new file mode 100644 index 000000000000..2a97feca640e --- /dev/null +++ b/java/jdk13/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 15:15:16 2002 +@@ -45,7 +45,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> diff --git a/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c new file mode 100644 index 000000000000..5adab099618b --- /dev/null +++ b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 15:14:18 2002 +@@ -58,7 +58,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> diff --git a/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c new file mode 100644 index 000000000000..2a97feca640e --- /dev/null +++ b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 15:15:16 2002 +@@ -45,7 +45,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> diff --git a/java/jdk15/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c b/java/jdk15/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c new file mode 100644 index 000000000000..5adab099618b --- /dev/null +++ b/java/jdk15/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 15:14:18 2002 +@@ -58,7 +58,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> diff --git a/java/jdk15/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c b/java/jdk15/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c new file mode 100644 index 000000000000..2a97feca640e --- /dev/null +++ b/java/jdk15/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 15:15:16 2002 +@@ -45,7 +45,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> diff --git a/java/jdk16/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c b/java/jdk16/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c new file mode 100644 index 000000000000..5adab099618b --- /dev/null +++ b/java/jdk16/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c Thu Apr 11 15:14:18 2002 +@@ -58,7 +58,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> diff --git a/java/jdk16/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c b/java/jdk16/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c new file mode 100644 index 000000000000..2a97feca640e --- /dev/null +++ b/java/jdk16/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 14:58:48 2002 ++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c Thu Apr 11 15:15:16 2002 +@@ -45,7 +45,11 @@ + #include <sys/wait.h> + #include <errno.h> + #ifdef __FreeBSD__ ++#if __FreeBSD__ > 3 ++#include <sys/soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #endif + #ifdef __NetBSD__ + #include <soundcard.h> |