[BACK]Return to patch-ay CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / games / xdoom / patches

File: [cvs.NetBSD.org] / pkgsrc / games / xdoom / patches / patch-ay (download)

Revision 1.5, Mon Feb 22 21:58:48 2010 UTC (10 years, 9 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, HEAD
Changes since 1.4: +0 -0 lines

Re-add xdoom, requested by drochner.
Address PR 24024 by marking it as not-for-lp64platforms.

$NetBSD: patch-ay,v 1.5 2010/02/22 21:58:48 wiz Exp $

--- sndserv/linux.c.orig	Sun Jan 26 07:45:01 1997
+++ sndserv/linux.c	Thu Feb  3 01:34:05 2000
@@ -36,13 +36,17 @@ static const char rcsid[] = "$Id: linux.
 
 
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/ioctl.h>
 
-#include <linux/soundcard.h>
+#include <sys/soundcard.h>
 
 #include "soundsrv.h"
 
+#define SOUND_DEV "/dev/sound"
+
 int	audio_fd;
 
@@ -54,5 +58,4 @@ myioctl
 {   
     int		rc;
-    extern int	errno;
     
     rc = ioctl(fd, command, arg);  
@@ -77,7 +80,10 @@ I_InitSound
     int i;
                 
-    audio_fd = open("/dev/dsp", O_WRONLY);
+    audio_fd = open(SOUND_DEV, O_WRONLY);
     if (audio_fd<0)
-        fprintf(stderr, "Could not open /dev/dsp\n");
+    {
+        perror("sndserv: Could not open "SOUND_DEV);
+	exit(-1);
+    }