head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.130 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.128 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.126 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.124 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.122 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.120 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.118 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.116 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.114 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.112 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.110 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.108 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.106 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.104 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.102 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.100 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.98 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.96 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.94 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.92 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.90 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.88 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.86 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.82 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.62 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.84 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.80 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.78 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.76 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.74 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.72 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.70 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.68 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.66 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.64 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.60 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.58 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.56 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.54 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.52 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.50 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.48 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.46 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.44 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.42 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.40 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.38 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.36 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.34 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.32 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.30 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.28 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.26 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.24 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.22 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.20 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.18 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.16 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.14 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.12 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.10 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.8 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.6 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.4 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.2 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.3.0.36 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.34 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.32 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.30 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.28 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.26 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.24 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.22 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.20 pkgsrc-2008Q1:1.3.0.18 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.16 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.14 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.12 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 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.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.5 date 2010.02.22.21.58.47; author wiz; state Exp; branches; next 1.4; 1.4 date 2010.02.21.16.17.12; author wiz; state dead; branches; next 1.3; 1.3 date 2006.01.13.00.04.16; author joerg; state Exp; branches; next 1.2; 1.2 date 2000.02.03.16.01.15; author abs; state Exp; branches; next 1.1; 1.1 date 99.03.15.01.54.32; author sommerfe; state Exp; branches; next ; desc @@ 1.5 log @Re-add xdoom, requested by drochner. Address PR 24024 by marking it as not-for-lp64platforms. @ text @$NetBSD: patch-ah,v 1.3 2006/01/13 00:04:16 joerg Exp $ --- linuxdoom-1.10/i_sound.c.orig Mon Dec 22 19:57:15 1997 +++ linuxdoom-1.10/i_sound.c Thu Feb 3 02:56:08 2000 @@@@ -26,2 +26,3 @@@@ rcsid[] = "$Id: i_unix.c,v 1.5 1997/02/0 +#include #include @@@@ -43,4 +44,7 @@@@ rcsid[] = "$Id: i_unix.c,v 1.5 1997/02/0 +#ifdef LINUX // Linux voxware output. #include +#endif + @@@@ -165,3 +169,2 @@@@ myioctl int rc; - extern int errno; @@@@ -484,4 +487,8 @@@@ I_StartSound { - fprintf(sndserver, "p%2.2x%2.2x%2.2x%2.2x\n", id, pitch, vol, sep); - fflush(sndserver); + if (fprintf(sndserver, "p%2.2x%2.2x%2.2x%2.2x\n", id, pitch, vol, sep) + <= 0 || fflush(sndserver) ) + { + fprintf(stderr, "Unable to write to sndserver - closing\n"); + sndserver = 0; + } } @@@@ -747,6 +754,16 @@@@ I_InitSound() else - sprintf(buffer, "%s", sndserver_filename); +#ifdef INSTALL_PREFIX + { + sprintf(buffer, INSTALL_PREFIX"/bin/%s", sndserver_filename); + /* sndserver won't find its wadfile if DOMMWADDIR isn't set - HF */ + if(!getenv("DOOMWADDIR")) + setenv("DOOMWADDIR", INSTALL_PREFIX"/share/doom", 1); + } +#else + strcpy(buffer, sndserver_filename); +#endif + // start sound process - if ( !access(buffer, X_OK) ) + if (!access(buffer, X_OK) ) { @@@@ -754,2 +771,4 @@@@ I_InitSound() sndserver = popen(buffer, "w"); + /* Don't die with SIGPIPE if the sndserver has problems */ + signal(SIGPIPE, (void (*)(int)) SIG_IGN); } @ 1.4 log @Remove xdoom, use prboom instead, which also works on 64bit machines (see PR 24024). @ text @@ 1.3 log @Fix errno. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 2000/02/03 16:01:15 abs Exp $ @ 1.2 log @Update to 1.10nb1 Actually work with the supplied WAD file One file-to-patch per patchfile Remove strange 'post-patch' substitute X11_BASE phase Fix numerous coredumps Add a '-h' usage Handle the sndserver dying Make it work on little endian systems Add a '-volume X' flag, and skip all sound code if 0 Other cleanup in some of the more repellant code areas. @ text @d1 1 a1 1 $NetBSD$ d5 5 a9 3 @@@@ -41,8 +41,11 @@@@ #include #include d17 5 a21 5 // Timer stuff. Experimental. #include @@@@ -482,8 +485,12 @@@@ #ifdef SNDSERV if (sndserver) d32 1 a32 5 // warning: control reaches end of non-void function. return id; @@@@ -745,13 +752,25 @@@@ getenv("DOOMWADDIR"), sndserver_filename); d51 1 a51 1 strcat(buffer, " -quiet"); a55 2 else fprintf(stderr, "Could not start sound server [%s]\n", buffer); @ 1.1 log @Fix PR7160: critical bug fix to xdoom @ text @d3 57 a59 20 *** linuxdoom-1.10/info.h.orig Sun Mar 14 17:14:18 1999 --- linuxdoom-1.10/info.h Sun Mar 14 17:14:46 1999 *************** *** 1156,1162 **** } state_t; extern state_t states[NUMSTATES]; ! extern char *sprnames[NUMSPRITES]; --- 1156,1163 ---- } state_t; extern state_t states[NUMSTATES]; ! /* R_InitSpriteDefs insists on a NULL terminated list, add one for NULL. (jfw) */ ! extern char *sprnames[NUMSPRITES+1]; @