head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.54
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.52
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.50
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q2:1.5.0.48
	pkgsrc-2011Q2-base:1.5
	pkgsrc-2009Q4:1.5.0.46
	pkgsrc-2009Q4-base:1.5
	pkgsrc-2008Q4:1.5.0.44
	pkgsrc-2008Q4-base:1.5
	pkgsrc-2008Q3:1.5.0.42
	pkgsrc-2008Q3-base:1.5
	cube-native-xorg:1.5.0.40
	cube-native-xorg-base:1.5
	pkgsrc-2008Q2:1.5.0.38
	pkgsrc-2008Q2-base:1.5
	pkgsrc-2008Q1:1.5.0.36
	pkgsrc-2008Q1-base:1.5
	pkgsrc-2007Q4:1.5.0.34
	pkgsrc-2007Q4-base:1.5
	pkgsrc-2007Q3:1.5.0.32
	pkgsrc-2007Q3-base:1.5
	pkgsrc-2007Q2:1.5.0.30
	pkgsrc-2007Q2-base:1.5
	pkgsrc-2007Q1:1.5.0.28
	pkgsrc-2007Q1-base:1.5
	pkgsrc-2006Q4:1.5.0.26
	pkgsrc-2006Q4-base:1.5
	pkgsrc-2006Q3:1.5.0.24
	pkgsrc-2006Q3-base:1.5
	pkgsrc-2006Q2:1.5.0.22
	pkgsrc-2006Q2-base:1.5
	pkgsrc-2006Q1:1.5.0.20
	pkgsrc-2006Q1-base:1.5
	pkgsrc-2005Q4:1.5.0.18
	pkgsrc-2005Q4-base:1.5
	pkgsrc-2005Q3:1.5.0.16
	pkgsrc-2005Q3-base:1.5
	pkgsrc-2005Q2:1.5.0.14
	pkgsrc-2005Q2-base:1.5
	pkgsrc-2005Q1:1.5.0.12
	pkgsrc-2005Q1-base:1.5
	pkgsrc-2004Q4:1.5.0.10
	pkgsrc-2004Q4-base:1.5
	pkgsrc-2004Q3:1.5.0.8
	pkgsrc-2004Q3-base:1.5
	pkgsrc-2004Q2:1.5.0.6
	pkgsrc-2004Q2-base:1.5
	pkgsrc-2004Q1:1.5.0.4
	pkgsrc-2004Q1-base:1.5
	pkgsrc-2003Q4:1.5.0.2
	pkgsrc-2003Q4-base:1.5
	buildlink2:1.4.0.2
	buildlink2-base:1.4
	netbsd-1-5-PATCH003:1.4
	netbsd-1-5-PATCH001:1.4
	netbsd-1-5-RELEASE:1.4
	netbsd-1-4-PATCH003:1.4
	netbsd-1-4-PATCH002:1.4
	comdex-fall-1999:1.4
	netbsd-1-4-PATCH001:1.4
	netbsd-1-4-RELEASE:1.4
	netbsd-1-3-PATCH003:1.4;
locks; strict;
comment	@# @;


1.5
date	2002.07.11.13.29.49;	author wiz;	state dead;
branches;
next	1.4;

1.4
date	98.08.07.10.40.42;	author agc;	state Exp;
branches;
next	1.3;

1.3
date	98.08.02.23.10.49;	author tron;	state Exp;
branches;
next	1.2;

1.2
date	98.08.02.18.14.32;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	98.07.30.23.11.40;	author tron;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Add and enable maelstrom-sdl; rename maelstrom to maelstrom-x11.
Remove old maelstrom dir.
@
text
@$NetBSD: patch-ad,v 1.4 1998/08/07 10:40:42 agc Exp $

--- mixer.cpp.orig	Thu Dec  5 14:14:44 1996
+++ mixer.cpp	Mon Aug  3 01:01:04 1998
@@@@ -182,7 +182,7 @@@@
 	}
 
 /* Do some system specific initialization */
-#ifdef linux
+#if defined(linux) || defined(__NetBSD__)
 #ifndef PLAY_DEV_AUDIO		/* VoxWare */
 	if ( ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0 ) {
 		if ( complain )
@@@@ -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 )
@@@@ -549,13 +549,14 @@@@
 	write_frag:
 		if ( write(dsp_fd, clipped, frag_size*(AUDIO_BITS/8))
 						!= frag_size*(AUDIO_BITS/8) ) {
-			if ( errno == EINTR )  // Interrupted system call...
+			if ( errno == EINTR)  // Interrupted system call...
 				// This should happen (SA_RESTART)
 				goto write_frag;
-			else {
-				perror("Mixer: Can't write to audio device");
-				return;
-			}
+			else
+				if ( errno != EAGAIN) {
+					perror("Mixer: Can't write to audio device");
+					return;
+				}
 		}
 #endif /* Not SGI Source */
 	} else
@


1.4
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Improve sound support.
@
text
@d1 2
@


1.2
log
@Replace "#ifdef sparc" with "if defined(sparc) && !defined(__NetBSD__)"
to make this compile on NetBSD sparc. Fixes PR pkg/5894 by Brad Salai.
@
text
@d2 10
a11 1
+++ mixer.cpp	Sun Aug  2 20:07:14 1998
d30 20
@


1.1
log
@New "maelstrom" package created by Tim Rightnour:
an incredible, fast moving, high graphics version of asteroids.
@
text
@d1 5
a5 3
--- mixer.cpp.orig	Thu Jul 30 03:59:50 1998
+++ mixer.cpp	Thu Jul 30 04:02:23 1998
@@@@ -287,3 +287,3 @@@@
d10 11
@