diff options
| author | tron <tron> | 1998-08-02 18:14:32 +0000 |
|---|---|---|
| committer | tron <tron> | 1998-08-02 18:14:32 +0000 |
| commit | 47395225edb3f7d276c4faea338973356829598f (patch) | |
| tree | 3f4162c7390214cf5c253b2aab8f621f35cccefc /games/maelstrom | |
| parent | 75b8078d5718db33d3cb1d2f5a818c4ed30ad83f (diff) | |
| download | pkgsrc-47395225edb3f7d276c4faea338973356829598f.tar.gz | |
Replace "#ifdef sparc" with "if defined(sparc) && !defined(__NetBSD__)"
to make this compile on NetBSD sparc. Fixes PR pkg/5894 by Brad Salai.
Diffstat (limited to 'games/maelstrom')
| -rw-r--r-- | games/maelstrom/patches/patch-ac | 19 | ||||
| -rw-r--r-- | games/maelstrom/patches/patch-ad | 19 |
2 files changed, 32 insertions, 6 deletions
diff --git a/games/maelstrom/patches/patch-ac b/games/maelstrom/patches/patch-ac index dd4550f14d7..f51c2d9fc04 100644 --- a/games/maelstrom/patches/patch-ac +++ b/games/maelstrom/patches/patch-ac @@ -1,8 +1,21 @@ ---- mixer.h.orig Thu Jul 30 03:57:30 1998 -+++ mixer.h Thu Jul 30 03:59:31 1998 -@@ -40,2 +40,5 @@ +--- mixer.h.orig Sun May 25 23:18:10 1997 ++++ mixer.h Sun Aug 2 20:06:20 1998 +@@ -22,7 +22,7 @@ + #include <linux/soundcard.h> + #undef sparc /* For sparc Linux */ + #else +-#ifdef sparc ++#if defined(sparc) && !defined(__NetBSD__) + #ifdef __SVR4 /* Solaris */ + #include <sys/audioio.h> + #else /* SunOS */ +@@ -38,6 +38,9 @@ + #endif /* HPUX */ + #endif /* sparc */ #endif /* linux */ +#ifdef __NetBSD__ +#include <soundcard.h> +#endif }; + + #define _PATH_DEV_AUDIO "/dev/audio" diff --git a/games/maelstrom/patches/patch-ad b/games/maelstrom/patches/patch-ad index 78afa99121a..b5b21db8446 100644 --- a/games/maelstrom/patches/patch-ad +++ b/games/maelstrom/patches/patch-ad @@ -1,7 +1,20 @@ ---- mixer.cpp.orig Thu Jul 30 03:59:50 1998 -+++ mixer.cpp Thu Jul 30 04:02:23 1998 -@@ -287,3 +287,3 @@ +--- mixer.cpp.orig Thu Dec 5 14:14:44 1996 ++++ mixer.cpp Sun Aug 2 20:07:14 1998 +@@ -285,7 +285,7 @@ + /* This is necessary so that the sound server stays in sync */ + long flags; flags = fcntl(dsp_fd, F_GETFL, 0); - flags |= O_SYNC; +/* flags |= O_SYNC;*/ (void) fcntl(dsp_fd, F_SETFL, flags); + + return(0); +@@ -539,7 +539,7 @@ + error("Mixer::Play: ALwritesamps (Play) failed!\n"); + } + #else /* Normal device write */ +-#ifdef sparc ++#if defined(sparc) && !defined(__NetBSD__) + drain_it: + if ( ioctl(dsp_fd, AUDIO_DRAIN, 0) < 0 ) { + if ( errno == EINTR ) |