head 1.5; access; symbols pkgsrc-2020Q4:1.4.0.92 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.90 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.86 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.66 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.88 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.84 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.82 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.80 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.78 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.76 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.74 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.72 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.70 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.68 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.64 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.62 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.60 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.58 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.56 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.54 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.52 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.50 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.48 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.46 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.44 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.42 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.40 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.38 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.36 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.34 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.32 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.30 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.28 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.26 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.24 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.22 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.20 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.18 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.16 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.14 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.12 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.10 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.8 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.6 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.4 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.2 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1; locks; strict; comment @# @; 1.5 date 2021.01.14.13.23.25; author nia; state dead; branches; next 1.4; commitid 2NodlZVqWeOJfHDC; 1.4 date 2009.08.29.19.26.01; author wiz; state Exp; branches; next 1.3; 1.3 date 2006.05.12.12.40.10; author joerg; state Exp; branches; next 1.2; 1.2 date 2002.01.02.10.01.36; author hubertf; state Exp; branches; next 1.1; 1.1 date 2000.02.01.02.30.35; author wiz; state Exp; branches; next ; desc @@ 1.5 log @Remove games/quake This has bitrotted with time and no longer works on its target platforms, having been surpassed by newer "faithful ports" like games/tyrquake PR pkg/29439 @ text @$NetBSD: patch-aj,v 1.4 2009/08/29 19:26:01 wiz Exp $ --- WinQuake/snd_linux.c.orig 1999-12-21 18:40:36.000000000 +0000 +++ WinQuake/snd_linux.c @@@@ -25,15 +25,42 @@@@ Foundation, Inc., 59 Temple Place - Suit #include #include #include + +#ifdef __NetBSD__ +#include +#endif + +#if defined(__DragonFly__) +#include +#endif + +#ifdef __linux__ #include +#endif + #include #include "quakedef.h" -int audio_fd; +int audio_fd = -1; int snd_inited; static int tryrates[] = { 11025, 22051, 44100, 8000 }; +#ifdef __linux__ +const char *audio_device="/dev/dsp"; +#define MMAP_PROTECTION PROT_WRITE +#endif + +#ifdef __NetBSD__ +const char *audio_device="/dev/audio"; +#define MMAP_PROTECTION PROT_WRITE|PROT_READ +#endif + +#if defined(__DragonFly__) +const char *audio_device="/dev/dsp"; +#define MMAP_PROTECTION PROT_WRITE|PROT_READ +#endif + qboolean SNDDMA_Init(void) { @@@@ -47,28 +74,29 @@@@ qboolean SNDDMA_Init(void) snd_inited = 0; -// open /dev/dsp, confirm capability to mmap, and get size of dma buffer +// open /dev/dsp or whatever, confirm capability to mmap, and get size of +// dma buffer - audio_fd = open("/dev/dsp", O_RDWR); + audio_fd = open(audio_device, O_RDWR); if (audio_fd < 0) { - perror("/dev/dsp"); - Con_Printf("Could not open /dev/dsp\n"); + perror(audio_device); + Con_Printf("Could not open %s\n",audio_device); return 0; } rc = ioctl(audio_fd, SNDCTL_DSP_RESET, 0); if (rc < 0) { - perror("/dev/dsp"); - Con_Printf("Could not reset /dev/dsp\n"); + perror(audio_device); + Con_Printf("Could not reset %s\n",audio_device); close(audio_fd); return 0; } if (ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps)==-1) { - perror("/dev/dsp"); + perror(audio_device); Con_Printf("Sound driver too old\n"); close(audio_fd); return 0; @@@@ -130,11 +158,11 @@@@ qboolean SNDDMA_Init(void) // memory map the dma buffer shm->buffer = (unsigned char *) mmap(NULL, info.fragstotal - * info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0); + * info.fragsize, MMAP_PROTECTION, MAP_FILE|MAP_SHARED, audio_fd, 0); if (!shm->buffer || shm->buffer == (unsigned char *)-1) { - perror("/dev/dsp"); - Con_Printf("Could not mmap /dev/dsp\n"); + perror(audio_device); + Con_Printf("Could not mmap %s\n",audio_device); close(audio_fd); return 0; } @@@@ -145,8 +173,8 @@@@ qboolean SNDDMA_Init(void) rc = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp); if (rc < 0) { - perror("/dev/dsp"); - Con_Printf("Could not set /dev/dsp to stereo=%d", shm->channels); + perror(audio_device); + Con_Printf("Could not set %s to stereo=%d", audio_device, shm->channels); close(audio_fd); return 0; } @@@@ -158,8 +186,8 @@@@ qboolean SNDDMA_Init(void) rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->speed); if (rc < 0) { - perror("/dev/dsp"); - Con_Printf("Could not set /dev/dsp speed to %d", shm->speed); + perror(audio_device); + Con_Printf("Could not set %s speed to %d", audio_device, shm->speed); close(audio_fd); return 0; } @@@@ -170,7 +198,7 @@@@ qboolean SNDDMA_Init(void) rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc); if (rc < 0) { - perror("/dev/dsp"); + perror(audio_device); Con_Printf("Could not support 16-bit data. Try 8-bit.\n"); close(audio_fd); return 0; @@@@ -182,7 +210,7 @@@@ qboolean SNDDMA_Init(void) rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc); if (rc < 0) { - perror("/dev/dsp"); + perror(audio_device); Con_Printf("Could not support 8-bit data.\n"); close(audio_fd); return 0; @@@@ -190,7 +218,7 @@@@ qboolean SNDDMA_Init(void) } else { - perror("/dev/dsp"); + perror(audio_device); Con_Printf("%d-bit sound not supported.", shm->samplebits); close(audio_fd); return 0; @@@@ -202,7 +230,7 @@@@ qboolean SNDDMA_Init(void) rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); if (rc < 0) { - perror("/dev/dsp"); + perror(audio_device); Con_Printf("Could not toggle.\n"); close(audio_fd); return 0; @@@@ -211,7 +239,7 @@@@ qboolean SNDDMA_Init(void) rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); if (rc < 0) { - perror("/dev/dsp"); + perror(audio_device); Con_Printf("Could not toggle.\n"); close(audio_fd); return 0; @@@@ -233,7 +261,7 @@@@ int SNDDMA_GetDMAPos(void) if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &count)==-1) { - perror("/dev/dsp"); + perror(audio_device); Con_Printf("Uh, sound dead.\n"); close(audio_fd); snd_inited = 0; @ 1.4 log @Change patches for case-sensitive file names. Reported by hasso. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.3 2006/05/12 12:40:10 joerg Exp $ @ 1.3 log @Add DragonFly support. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- winquake/snd_linux.c.orig 1999-12-21 18:40:36.000000000 +0000 +++ winquake/snd_linux.c @ 1.2 log @Make this at least build. This was obviously not tested at all...! :-( @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 2000/02/01 02:30:35 wiz Exp $ d3 3 a5 3 --- winquake/snd_linux.c Tue Dec 21 18:40:36 1999 +++ ../work/winquake/snd_linux.c Thu Jan 20 21:52:45 2000 @@@@ -25,15 +6,33 @@@@ d14 4 d32 1 a32 1 +char *audio_device="/dev/dsp"; d37 6 a42 1 +char *audio_device="/dev/audio"; d49 1 a49 1 @@@@ -47,28 +46,29 @@@@ d86 1 a86 1 @@@@ -130,11 +130,11 @@@@ d101 1 a101 1 @@@@ -145,8 +145,8 @@@@ d112 1 a112 1 @@@@ -158,8 +158,8 @@@@ d123 1 a123 1 @@@@ -170,7 +170,7 @@@@ d132 1 a132 1 @@@@ -182,7 +182,7 @@@@ d141 1 a141 1 @@@@ -190,7 +190,7 @@@@ d150 1 a150 1 @@@@ -202,7 +202,7 @@@@ d159 1 a159 1 @@@@ -211,7 +211,7 @@@@ d168 1 a168 1 @@@@ -233,7 +233,7 @@@@ @ 1.1 log @Quake now playable on NetBSD-1.4.x-i386. Heavily based on pkg/9270 by Brad Spencer , with some modifications. Caveats: ELF builds fail; shareware WADs (level files) have to be gotten separately; playing audio from CDs seems to have problems (see pkg/9270); GLX Quakeworld client probably doesn't work; Quakeworld code perhaps triggers optimization bug? Committed mainly to avoid duplication of work, and for the 1.4.x/i386 users/gamers :-) @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- WinQuake/snd_linux.c Tue Dec 21 18:40:36 1999 +++ ../work/WinQuake/snd_linux.c Thu Jan 20 21:52:45 2000 @