head 1.7; access; symbols pkgsrc-2020Q4:1.6.0.92 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.90 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.86 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.66 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.88 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.84 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.82 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.80 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.78 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.76 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.74 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.72 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.70 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.68 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.64 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.62 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.60 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.58 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.56 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.54 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.52 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.50 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.48 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.46 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.44 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.42 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.40 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.38 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.36 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.34 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.32 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.30 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.28 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.26 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.24 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.22 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.20 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.18 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.16 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.14 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.12 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.10 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.8 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.6 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.4 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.2 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.5.0.30 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.28 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.26 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.24 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.22 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.20 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.18 pkgsrc-2008Q1:1.5.0.16 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.14 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.12 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.10 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.8 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.6 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.4 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.2 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.4.0.28 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.26 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.24 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.22 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.20 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2021.01.14.13.23.25; author nia; state dead; branches; next 1.6; commitid 2NodlZVqWeOJfHDC; 1.6 date 2009.08.29.19.26.01; author wiz; state Exp; branches; next 1.5; 1.5 date 2006.05.12.12.40.10; author joerg; state Exp; branches; next 1.4; 1.4 date 2002.01.02.10.01.35; author hubertf; state Exp; branches; next 1.3; 1.3 date 2000.02.01.02.30.32; author wiz; state Exp; branches; next 1.2; 1.2 date 2000.01.13.00.35.05; author wiz; state Exp; branches; next 1.1; 1.1 date 99.12.28.14.20.42; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.12.28.14.20.42; author tron; state Exp; branches; next ; desc @@ 1.7 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-aa,v 1.6 2009/08/29 19:26:01 wiz Exp $ --- QW/client/cd_linux.c.orig 1999-12-21 18:58:58.000000000 +0000 +++ QW/client/cd_linux.c @@@@ -31,7 +31,23 @@@@ Foundation, Inc., 59 Temple Place - Suit #include #include +#ifdef __linux__ #include +#endif + +#if defined(__DragonFly__) +#include +#endif + +#if defined(__NetBSD__) +#include + +/* resume seems to have some trouble right now. xcdplayer also can not resume + the drive correctly. It appears to play, but no audio is heard */ + +#define PAUSE_BY_STOPPING 1 + +#endif #include "quakedef.h" @@@@ -46,165 +62,296 @@@@ static byte remap[100]; static byte playTrack; static byte maxTrack; +#ifdef PAUSE_BY_STOPPING +static qboolean t_playLooping; +static byte t_playTrack; +#endif + static int cdfile = -1; +#ifdef __linux__ static char cd_dev[64] = "/dev/cdrom"; +#endif + +#ifdef __DragonFly__ +static char cd_dev[64] = "/dev/cd0d"; +#endif + +#ifdef __NetBSD__ +static char cd_dev[64] = "/dev/rcd0d"; +#endif static void CDAudio_Eject(void) { - if (cdfile == -1 || !enabled) - return; // no cd init'd +#if defined(__DragonFly__) || defined(__NetBSD__) + int arg=0; +#endif - if ( ioctl(cdfile, CDROMEJECT) == -1 ) - Con_DPrintf("ioctl cdromeject failed\n"); + if (cdfile == -1 || !enabled) + return; // no cd init'd + +#ifdef __linux__ + if ( ioctl(cdfile, CDROMEJECT) == -1 ) + Con_DPrintf("ioctl cdromeject failed\n"); +#elif defined(__DragonFly__) + ioctl(cdfile, CDIOCALLOW); + if ( ioctl(cdfile, CDIOCEJECT) == -1 ) + Con_DPrintf("ioctl cdromeject failed\n"); +#elif defined(__NetBSD__) + if(ioctl(cdfile, DIOCLOCK, &arg) == -1) + Con_DPrintf("ioctl cdromunlock failed\n"); + arg = 1; + if ( ioctl(cdfile, DIOCEJECT, &arg) == -1 ) + Con_DPrintf("ioctl cdromeject failed\n"); +#endif } static void CDAudio_CloseDoor(void) { - if (cdfile == -1 || !enabled) - return; // no cd init'd +if (cdfile == -1 || !enabled) + return; // no cd init'd - if ( ioctl(cdfile, CDROMCLOSETRAY) == -1 ) - Con_DPrintf("ioctl cdromclosetray failed\n"); +#ifdef __linux__ + if ( ioctl(cdfile, CDROMCLOSETRAY) == -1 ) + Con_DPrintf("ioctl cdromclosetray failed\n"); +#endif +#if defined(__DragonFly__) || defined(__NetBSD__) + if(ioctl(cdfile, CDIOCCLOSE, NULL) == -1) { + Con_DPrintf("ioctl cdromclosetray failed\n"); + } +#endif } static int CDAudio_GetAudioDiskInfo(void) { - struct cdrom_tochdr tochdr; +#ifdef __linux__ +struct cdrom_tochdr tochdr; +#endif +#if defined(__DragonFly__) || defined(__NetBSD__) +struct ioc_toc_header tochdr; +#endif - cdValid = false; +cdValid = false; - if ( ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1 ) - { - Con_DPrintf("ioctl cdromreadtochdr failed\n"); - return -1; - } +#ifdef __linux +if ( ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1 ) +{ + Con_DPrintf("ioctl cdromreadtochdr failed\n"); + return -1; +} +#endif - if (tochdr.cdth_trk0 < 1) - { - Con_DPrintf("CDAudio: no music tracks\n"); - return -1; - } +#if defined(__DragonFly__) || defined(__NetBSD__) +if ( ioctl(cdfile, CDIOREADTOCHEADER, &tochdr) == -1 ) +{ + Con_DPrintf("ioctl cdromreadtochdr failed\n"); + return -1; +} +#endif + +#ifdef __linux__ +if (tochdr.cdth_trk0 < 1) + { + Con_DPrintf("CDAudio: no music tracks\n"); + return -1; + } +#endif +#if defined(__DragonFly__) || defined(__NetBSD__) +if (tochdr.starting_track < 1) + { + Con_DPrintf("CDAudio: no music tracks\n"); + return -1; + } +#endif - cdValid = true; - maxTrack = tochdr.cdth_trk1; +cdValid = true; +#ifdef __linux__ +maxTrack = tochdr.cdth_trk1; +#endif +#if defined(__DragonFly__) || defined(__NetBSD__) +maxTrack = tochdr.ending_track; +#endif - return 0; +return 0; } void CDAudio_Play(byte track, qboolean looping) { - struct cdrom_tocentry entry; - struct cdrom_ti ti; +#ifdef __linux__ + struct cdrom_tocentry entry; + struct cdrom_ti ti; +#endif - if (cdfile == -1 || !enabled) - return; +#if defined(__DragonFly__) || defined(__NetBSD__) + struct ioc_read_toc_entry entry; + struct ioc_play_track ti; + int arg=1; +#endif + + if (cdfile == -1 || !enabled) + return; - if (!cdValid) - { - CDAudio_GetAudioDiskInfo(); - if (!cdValid) - return; - } + if (!cdValid) + { + CDAudio_GetAudioDiskInfo(); + if (!cdValid) + return; + } - track = remap[track]; + track = remap[track]; - if (track < 1 || track > maxTrack) - { - Con_DPrintf("CDAudio: Bad track number %u.\n", track); - return; - } + if (track < 1 || track > maxTrack) + { + Con_DPrintf("CDAudio: Bad track number %u.\n", track); + return; + } - // don't try to play a non-audio track - entry.cdte_track = track; - entry.cdte_format = CDROM_MSF; - if ( ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1 ) - { - Con_DPrintf("ioctl cdromreadtocentry failed\n"); - return; - } - if (entry.cdte_ctrl == CDROM_DATA_TRACK) - { - Con_Printf("CDAudio: track %i is not audio\n", track); - return; - } +#ifdef __linux__ /* Not sure what the equiv is for NetBSD */ + /* don't try to play a non-audio track */ + entry.cdte_track = track; + entry.cdte_format = CDROM_MSF; + if ( ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1 ) + { + Con_DPrintf("ioctl cdromreadtocentry failed\n"); + return; + } + if (entry.cdte_ctrl == CDROM_DATA_TRACK) + { + Con_Printf("CDAudio: track %i is not audio\n", track); + return; + } - if (playing) - { - if (playTrack == track) - return; - CDAudio_Stop(); - } +#endif - ti.cdti_trk0 = track; - ti.cdti_trk1 = track; - ti.cdti_ind0 = 1; - ti.cdti_ind1 = 99; + if (playing) + { + if (playTrack == track) + return; + CDAudio_Stop(); + } - if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 ) +#ifdef __linux__ + ti.cdti_trk0 = track; + ti.cdti_trk1 = track; + ti.cdti_ind0 = 1; + ti.cdti_ind1 = 99; + if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 ) { - Con_DPrintf("ioctl cdromplaytrkind failed\n"); - return; + Con_DPrintf("ioctl cdromplaytrkind failed\n"); + return; + } + + if ( ioctl(cdfile, CDROMRESUME) == -1 ) + Con_DPrintf("ioctl cdromresume failed\n"); +#endif + +#if defined(__DragonFly__) || defined(__NetBSD__) + ti.start_track = track; + ti.end_track = track; + ti.start_index = 1; + ti.end_index = 99; + if ( ioctl(cdfile, CDIOCPLAYTRACKS, &ti) == -1 ) + { + Con_DPrintf("ioctl cdromplaytrkind failed\n"); + return; } - if ( ioctl(cdfile, CDROMRESUME) == -1 ) - Con_DPrintf("ioctl cdromresume failed\n"); + if ( ioctl(cdfile, CDIOCRESUME, &arg) == -1 ) + Con_DPrintf("ioctl cdromresume failed\n"); +#endif - playLooping = looping; - playTrack = track; - playing = true; + playLooping = looping; + playTrack = track; + playing = true; - if (cdvolume == 0.0) - CDAudio_Pause (); + if (cdvolume == 0.0) + CDAudio_Pause (); } void CDAudio_Stop(void) { - if (cdfile == -1 || !enabled) - return; + if (cdfile == -1 || !enabled) + return; - if (!playing) - return; + if (!playing) + return; - if ( ioctl(cdfile, CDROMSTOP) == -1 ) - Con_DPrintf("ioctl cdromstop failed (%d)\n", errno); +#ifdef __linux__ + if ( ioctl(cdfile, CDROMSTOP) == -1 ) + Con_DPrintf("ioctl cdromstop failed (%d)\n", errno); +#endif +#if defined(__DragonFly__) || defined(__NetBSD__) + if ( ioctl(cdfile, CDIOCSTOP) == -1 ) + Con_DPrintf("ioctl cdromstop failed (%d)\n", errno); +#endif - wasPlaying = false; - playing = false; + wasPlaying = false; + playing = false; } void CDAudio_Pause(void) { - if (cdfile == -1 || !enabled) - return; +#ifdef PAUSE_BY_STOPPING + qboolean t; +#endif - if (!playing) - return; + if (cdfile == -1 || !enabled) + return; - if ( ioctl(cdfile, CDROMPAUSE) == -1 ) - Con_DPrintf("ioctl cdrompause failed\n"); + if (!playing) + return; - wasPlaying = playing; - playing = false; +#ifndef PAUSE_BY_STOPPING +#ifdef __linux__ + if ( ioctl(cdfile, CDROMPAUSE) == -1 ) + Con_DPrintf("ioctl cdrompause failed\n"); +#endif + +#if defined(__DragonFly__) || defined(__NetBSD__) + if ( ioctl(cdfile, CDIOCPAUSE) == -1 ) + Con_DPrintf("ioctl cdrompause failed\n"); +#endif +#else + t_playLooping = playLooping; + t_playTrack=playTrack; + t=playing; + CDAudio_Stop(); + playing=t; +#endif + + wasPlaying = playing; + playing = false; } void CDAudio_Resume(void) { - if (cdfile == -1 || !enabled) - return; + if (cdfile == -1 || !enabled) + return; - if (!cdValid) - return; + if (!cdValid) + return; - if (!wasPlaying) - return; + if (!wasPlaying) + return; - if ( ioctl(cdfile, CDROMRESUME) == -1 ) - Con_DPrintf("ioctl cdromresume failed\n"); - playing = true; +#ifndef PAUSE_BY_STOPPING +#ifdef __linux__ + if ( ioctl(cdfile, CDROMRESUME) == -1 ) + Con_DPrintf("ioctl cdromresume failed\n"); +#endif + +#if defined(__DragonFly__) || defined(__NetBSD__) + if ( ioctl(cdfile, CDIOCRESUME) == -1 ) + Con_DPrintf("ioctl cdromresume failed\n"); +#endif +#else + CDAudio_Play(t_playTrack, t_playLooping); +#endif + + playing = true; } static void CD_f (void) @@@@ -327,43 +474,72 @@@@ static void CD_f (void) void CDAudio_Update(void) { - struct cdrom_subchnl subchnl; - static time_t lastchk; +#ifdef __linux__ + struct cdrom_subchnl subchnl; +#endif +#if defined(__DragonFly__) || defined(__NetBSD__) + struct ioc_read_subchannel subchnl; + struct cd_sub_channel_info data; +#endif + static time_t lastchk; - if (!enabled) - return; + if (!enabled) + return; - if (bgmvolume.value != cdvolume) + if (bgmvolume.value != cdvolume) + { + if (cdvolume) { - if (cdvolume) - { - Cvar_SetValue ("bgmvolume", 0.0); - cdvolume = bgmvolume.value; - CDAudio_Pause (); - } - else - { - Cvar_SetValue ("bgmvolume", 1.0); - cdvolume = bgmvolume.value; - CDAudio_Resume (); - } + Cvar_SetValue ("bgmvolume", 0.0); + cdvolume = bgmvolume.value; + CDAudio_Pause (); } - - if (playing && lastchk < time(NULL)) { - lastchk = time(NULL) + 2; //two seconds between chks - subchnl.cdsc_format = CDROM_MSF; - if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) { - Con_DPrintf("ioctl cdromsubchnl failed\n"); - playing = false; - return; - } - if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY && - subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED) { - playing = false; - if (playLooping) - CDAudio_Play(playTrack, true); - } + else + { + Cvar_SetValue ("bgmvolume", 1.0); + cdvolume = bgmvolume.value; + CDAudio_Resume (); } + } + + + if (playing && lastchk < time(NULL)) { + lastchk = time(NULL) + 2; /* two seconds between chks */ +#ifdef __linux + subchnl.cdsc_format = CDROM_MSF; + if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) { + Con_DPrintf("ioctl cdromsubchnl failed\n"); + playing = false; + return; + } + if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY && + subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED) { + playing = false; + if (playLooping) + CDAudio_Play(playTrack, true); + } +#endif +#if defined(__DragonFly__) || defined(__NetBSD__) + subchnl.address_format = CD_MSF_FORMAT; + subchnl.data_format = CD_CURRENT_POSITION; + subchnl.data_len = sizeof(data); + subchnl.track = playTrack; + subchnl.data = &data; + + if (ioctl(cdfile, CDIOCREADSUBCHANNEL, &subchnl) == -1 ) { + Con_DPrintf("ioctl cdromsubchnl failed\n"); + playing = false; + return; + } + if (subchnl.data->header.audio_status != CD_AS_PLAY_IN_PROGRESS && + subchnl.data->header.audio_status != CD_AS_PLAY_PAUSED) { + playing = false; + if (playLooping) + CDAudio_Play(playTrack, true); + } +#endif + } + } int CDAudio_Init(void) @@@@ -375,6 +551,8 @@@@ int CDAudio_Init(void) return -1; #endif + fprintf(stderr,"...... cdaudio_init .......\n"); + if (COM_CheckParm("-nocdaudio")) return -1; @@@@ -384,9 +562,9 @@@@ int CDAudio_Init(void) } if ((cdfile = open(cd_dev, O_RDONLY)) == -1) { - Con_Printf("CDAudio_Init: open of \"%s\" failed (%i)\n", cd_dev, errno); - cdfile = -1; - return -1; + Con_Printf("CDAudio_Init: open of \"%s\" failed (%i)\n", cd_dev, errno); + cdfile = -1; + return -1; } for (i = 0; i < 100; i++) @ 1.6 log @Change patches for case-sensitive file names. Reported by hasso. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2006/05/12 12:40:10 joerg Exp $ @ 1.5 log @Add DragonFly support. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- qw/client/cd_linux.c.orig 1999-12-21 18:58:58.000000000 +0000 +++ qw/client/cd_linux.c @ 1.4 log @Make this at least build. This was obviously not tested at all...! :-( @ text @d3 1 a3 1 --- qw/client/cd_linux.c.orig Tue Dec 21 18:58:58 1999 d5 1 a5 1 @@@@ -31,7 +31,19 @@@@ d13 5 a17 1 +#ifdef __NetBSD__ d29 1 a29 1 @@@@ -46,165 +58,289 @@@@ d43 4 d55 1 a55 1 +#ifdef __NetBSD__ d67 5 a71 2 +#endif +#ifdef __NetBSD__ d94 1 a94 1 +#ifdef __NetBSD__ d107 1 a107 1 +#ifdef __NetBSD__ d132 1 a132 1 +#ifdef __NetBSD__ d139 1 a139 3 - cdValid = true; - maxTrack = tochdr.cdth_trk1; d147 1 a147 1 +#ifdef __NetBSD__ d154 3 a156 1 + d161 1 a161 1 +#ifdef __NetBSD__ d181 1 a181 1 +#ifdef __NetBSD__ d252 5 a256 1 + d263 2 a264 1 + d271 3 a273 1 + { d277 1 a277 5 - ti.cdti_trk0 = track; - ti.cdti_trk1 = track; - ti.cdti_ind0 = 1; - ti.cdti_ind1 = 99; d281 2 a282 3 - if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 ) +#ifdef __NetBSD__ d288 1 a288 3 { - Con_DPrintf("ioctl cdromplaytrkind failed\n"); - return; d331 1 a331 1 +#ifdef __NetBSD__ d359 3 a361 1 + d367 2 a368 4 - wasPlaying = playing; - playing = false; +#ifdef __NetBSD__ d411 1 a411 1 +#ifdef __NetBSD__ d423 1 a423 1 @@@@ -327,43 +463,72 @@@@ d432 1 a432 1 +#ifdef __NetBSD__ d504 1 a504 1 +#ifdef __NetBSD__ d528 1 a528 1 @@@@ -375,6 +540,8 @@@@ d537 1 a537 1 @@@@ -384,9 +551,9 @@@@ @ 1.3 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 @d3 2 a4 11 --- QW/client/cd_linux.c Tue Dec 21 18:58:58 1999 +++ ../work/QW/client/cd_linux.c Sun Jan 16 19:56:16 2000 @@@@ -10,7 +10,7 @@@@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the included (GNU.txt) GNU General Public License for more details. +See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software @ 1.2 log @does compile client now on 1.4.1/i386/a.out, but still untested for lack of shareware WADs currently @ text @d3 14 a16 5 --- Makefile.Linux.orig Wed Apr 21 20:16:24 1999 +++ Makefile.Linux Thu Jan 13 01:05:47 2000 @@@@ -27,8 +27,6 @@@@ RPMARCH=i386 endif d18 444 a461 1 -MAINDIR=/grog/Projects/QW d463 83 a545 83 BUILD_DEBUG_DIR=debug$(ARCH)$(GLIBC) BUILD_RELEASE_DIR=release$(ARCH)$(GLIBC) CLIENT_DIR=$(MAINDIR)/client @@@@ -37,7 +35,8 @@@@ MESA_DIR=/usr/local/src/Mesa-3.0 CC=gcc -BASE_CFLAGS=-Wall -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) +BASE_CFLAGS=-Wall -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) \ + ${CFLAGS} -I${X11BASE}/include DEBUG_CFLAGS=$(BASE_CFLAGS) -g ifeq ($(ARCH),axp) RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \ @@@@ -49,19 +48,21 @@@@ endif GLCFLAGS=-DGLQUAKE -I/usr/local/src/Mesa-3.0/include -I/usr/include/glide -LDFLAGS=-lm +LDFLAGS=-lm -lossaudio SVGALDFLAGS=-lvga XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -GL_SVGA_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga -GL_X11_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lGL -lX11 -lXext +GL_SVGA_LDFLAGS=-L/usr/X11R6/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga +GL_X11_LDFLAGS=-L/usr/X11R6/lib -L/usr/local/src/Mesa-3.0/lib -lm -lGL -lX11 -lXext DO_CC=$(CC) $(CFLAGS) -o $@@ -c $< DO_O_CC=$(CC) -O $(CFLAGS) -o $@@ -c $< DO_GL_CC=$(CC) $(CFLAGS) $(GLCFLAGS) -o $@@ -c $< DO_SERVER_CC=$(CC) -DSERVERONLY $(CFLAGS) -o $@@ -c $< -DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@@ -c $< -DO_GL_AS=$(CC) $(CFLAGS) $(GLCFLAGS) -DELF -x assembler-with-cpp -o $@@ -c $< +DO_AS=$(CC) $(CFLAGS) -DAOUT -x assembler-with-cpp -o $@@ -c $< +#DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@@ -c $< +DO_GL_AS=$(CC) $(CFLAGS) $(GLCFLAGS) -DAOUT -x assembler-with-cpp -o $@@ -c $< +#DO_GL_AS=$(CC) $(CFLAGS) $(GLCFLAGS) -DELF -x assembler-with-cpp -o $@@ -c $< ############################################################################# # SETUP AND BUILD @@@@ -71,7 +72,7 @@@@ TARGETS=$(BUILDDIR)/qwsv #$(BUILDDIR)/qwcl.x11 else -TARGETS=$(BUILDDIR)/qwsv $(BUILDDIR)/qwcl $(BUILDDIR)/qwcl.x11 $(BUILDDIR)/glqwcl $(BUILDDIR)/glqwcl.glx +TARGETS=$(BUILDDIR)/qwsv $(BUILDDIR)/qwcl.x11 $(BUILDDIR)/glqwcl.glx endif build_debug: @@@@ -269,7 +270,7 @@@@ $(BUILDDIR)/client/view.o \ $(BUILDDIR)/client/wad.o \ $(BUILDDIR)/client/zone.o \ - $(BUILDDIR)/client/cd_linux.o \ + $(BUILDDIR)/client/cd_null.o \ $(BUILDDIR)/client/sys_linux.o \ $(BUILDDIR)/client/snd_linux.o \ @@@@ -485,7 +486,7 @@@@ $(BUILDDIR)/client/zone.o : $(CLIENT_DIR)/zone.c $(DO_CC) -$(BUILDDIR)/client/cd_linux.o : $(CLIENT_DIR)/cd_linux.c +$(BUILDDIR)/client/cd_null.o : $(CLIENT_DIR)/cd_null.c $(DO_CC) $(BUILDDIR)/client/sys_linux.o : $(CLIENT_DIR)/sys_linux.c @@@@ -590,7 +591,7 @@@@ $(BUILDDIR)/glclient/view.o \ $(BUILDDIR)/glclient/wad.o \ $(BUILDDIR)/glclient/zone.o \ - $(BUILDDIR)/glclient/cd_linux.o \ + $(BUILDDIR)/glclient/cd_null.o \ $(BUILDDIR)/glclient/sys_linux.o \ $(BUILDDIR)/glclient/snd_linux.o \ \ @@@@ -715,7 +716,7 @@@@ $(BUILDDIR)/glclient/zone.o : $(CLIENT_DIR)/zone.c $(DO_GL_CC) -$(BUILDDIR)/glclient/cd_linux.o : $(CLIENT_DIR)/cd_linux.c +$(BUILDDIR)/glclient/cd_null.o : $(CLIENT_DIR)/cd_null.c $(DO_GL_CC) d547 1 a547 1 $(BUILDDIR)/glclient/sys_linux.o : $(CLIENT_DIR)/sys_linux.c @ 1.1 log @Initial revision @ text @d4 1 a4 1 +++ Makefile.Linux Tue Dec 28 12:01:52 1999 d14 82 @ 1.1.1.1 log @Import of *unfinished* "quake" package based on the recently under GPL released source code: legendary 1st person shoot'em up game @ text @@