Boom - make da noise! (add soundserver)

8 files changed, 88 insertions, 49 deletions

diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 0a562748340..ce4e20d93eb 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/08/28 12:53:03 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1998/09/06 16:37:44 hubertf Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.idsoftware.com/archives/doomarc.html
 
 BUILD_DEPENDS=	unzip:../../archivers/unzip
 
+WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	unzip
 EXTRACT_BEFORE_ARGS=	-qo
 EXTRACT_ONLY=	doomsrc.zip
@@ -20,16 +21,23 @@ USE_GMAKE=	yes
 
 post-extract:
 	(cd ${WRKDIR}; tar xzf linuxdoom-1.10.src.tgz)
+	(cd ${WRKDIR}; tar xzf sndserv.tgz)
+	ln -s /usr/include/soundcard.h ${WRKDIR}/sndserv/linux
 
 post-patch:
-	@${MV} ${WRKSRC}/i_sound.c foo
-	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <foo> ${WRKSRC}/i_sound.c
-	@${MV} ${WRKSRC}/d_main.c foo
-	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <foo> ${WRKSRC}/d_main.c
+	@${MV} ${WRKSRC}/${DISTNAME}/i_sound.c foo
+	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <foo> ${WRKSRC}/${DISTNAME}/i_sound.c
+	@${MV} ${WRKSRC}/${DISTNAME}/d_main.c foo
+	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <foo> ${WRKSRC}/${DISTNAME}/d_main.c
 	@${RM} -f foo
 
+do-build:
+	cd ${WRKSRC}/${DISTNAME} ; ${GMAKE} X11BASE=${X11BASE}
+	cd ${WRKSRC}/sndserv ; ${GMAKE} X11BASE=${X11BASE}
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/linux/linuxxdoom ${PREFIX}/bin/xdoom
+	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/linux/linuxxdoom ${PREFIX}/bin/xdoom
+	${INSTALL_PROGRAM} ${WRKSRC}/sndserv/linux/sndserver ${PREFIX}/bin/sndserver
 	${MKDIR} ${PREFIX}/share/doom
 	${GUNZIP_CMD} -c ${DISTDIR}/doom-1.8.wad.gz > ${PREFIX}/share/doom/doom1.wad
 
diff --git a/games/xdoom/patches/patch-aa b/games/xdoom/patches/patch-aa
index 498b4e64ce6..beb1661b8ed 100644
--- a/games/xdoom/patches/patch-aa
+++ b/games/xdoom/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 1998/08/28 12:53:04 garbled Exp $
---- Makefile.orig	Mon Dec 22 12:55:36 1997
-+++ Makefile	Fri Aug 28 05:16:43 1998
+$NetBSD: patch-aa,v 1.2 1998/09/06 16:37:44 hubertf Exp $
+--- linuxdoom-1.10/Makefile.orig	Mon Dec 22 12:55:36 1997
++++ linuxdoom-1.10/Makefile	Fri Aug 28 05:16:43 1998
 @@ -6,9 +6,10 @@
  #
  CC=  gcc  # gcc or g++
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.1 1998/08/28 12:53:04 garbled Exp $
 -CFLAGS=-g -Wall -DNORMALUNIX -DLINUX # -DUSEASM 
 -LDFLAGS=-L/usr/X11R6/lib
 -LIBS=-lXext -lX11 -lnsl -lm
-+CFLAGS=-g -Wall -DNORMALUNIX # -DUSEASM 
++CFLAGS=-g -Wall -DNORMALUNIX -DSNDSRV # -DUSEASM 
 +CFLAGS+= -I$(X11BASE)/include
 +LDFLAGS=-Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
 +LIBS=-lXext -lX11 -lm
diff --git a/games/xdoom/patches/patch-ab b/games/xdoom/patches/patch-ab
index f08e7fb7708..28668f2adeb 100644
--- a/games/xdoom/patches/patch-ab
+++ b/games/xdoom/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 1998/08/28 12:53:05 garbled Exp $
+$NetBSD: patch-ab,v 1.2 1998/09/06 16:37:44 hubertf Exp $
 *** 1.1.1.1	1998/07/03 16:32:29
---- d_net.h	1998/07/03 16:33:37
+--- linuxdoom-1.10/d_net.h	1998/07/03 16:33:37
 ***************
 *** 80,84 ****
   {
@@ -14,13 +14,13 @@ $NetBSD: patch-ab,v 1.1 1998/08/28 12:53:05 garbled Exp $
 !     int		id;
       
       // DOOM executes an int to execute commands.
-Index: doomtype.h
+Index: linuxdoom-1.10/doomtype.h
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/doomtype.h,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 doomtype.h
 *** 1.1.1.1	1998/07/03 16:32:16
---- doomtype.h	1998/07/15 21:12:05
+--- linuxdoom-1.10/doomtype.h	1998/07/15 21:12:05
 ***************
 *** 47,51 ****
   // Max pos 32-bit int.
@@ -37,13 +37,13 @@ diff -c -2 -r1.1.1.1 doomtype.h
   #endif
   
 --- 52,55 ----
-Index: info.h
+Index: linuxdoom-1.10/info.h
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/info.h,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 info.h
 *** 1.1.1.1	1998/07/03 16:32:20
---- info.h	1998/07/03 16:33:41
+--- linuxdoom-1.10/info.h	1998/07/03 16:33:41
 ***************
 *** 1148,1157 ****
   {
@@ -67,13 +67,13 @@ diff -c -2 -r1.1.1.1 info.h
 !   int			misc1, misc2;
   } state_t;
   
-Index: m_bbox.h
+Index: linuxdoom-1.10/m_bbox.h
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/m_bbox.h,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 m_bbox.h
 *** 1.1.1.1	1998/07/03 16:32:20
---- m_bbox.h	1998/07/03 16:33:42
+--- linuxdoom-1.10/m_bbox.h	1998/07/03 16:33:42
 ***************
 *** 24,28 ****
   #define __M_BBOX__
@@ -87,13 +87,13 @@ diff -c -2 -r1.1.1.1 m_bbox.h
 ! #include "doomtype.h"
   
   #include "m_fixed.h"
-Index: m_swap.h
+Index: linuxdoom-1.10/m_swap.h
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/m_swap.h,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 m_swap.h
 *** 1.1.1.1	1998/07/03 16:32:29
---- m_swap.h	1998/07/15 21:08:17
+--- linuxdoom-1.10/m_swap.h	1998/07/15 21:08:17
 ***************
 *** 34,40 ****
   #ifdef __BIG_ENDIAN__
@@ -111,13 +111,13 @@ diff -c -2 -r1.1.1.1 m_swap.h
 ! #define LONG(x)         ((int)SwapLONG((unsigned int) (x)))
   #else
   #define SHORT(x)	(x)
-Index: i_net.c
+Index: linuxdoom-1.10/i_net.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/i_net.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 i_net.c
 *** 1.1.1.1	1998/07/03 16:32:18
---- i_net.c	1998/07/15 21:11:38
+--- linuxdoom-1.10/i_net.c	1998/07/15 21:11:38
 ***************
 *** 51,69 ****
   
@@ -153,13 +153,13 @@ diff -c -2 -r1.1.1.1 i_net.c
 ! int	DOOMPORT =	(IPPORT_RESERVED +0x1d );
   
   int			sendsocket;
-Index: i_sound.c
+Index: linuxdoom-1.10/i_sound.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/i_sound.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 i_sound.c
 *** 1.1.1.1	1998/07/03 16:32:18
---- i_sound.c	1998/07/15 20:05:49
+--- linuxdoom-1.10/i_sound.c	1998/07/15 20:05:49
 ***************
 *** 42,47 ****
 --- 42,49 ----
@@ -171,13 +171,13 @@ diff -c -2 -r1.1.1.1 i_sound.c
 + #endif
   
   // Timer stuff. Experimental.
-Index: i_video.c
+Index: linuxdoom-1.10/i_video.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/i_video.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 i_video.c
 *** 1.1.1.1	1998/07/03 16:32:18
---- i_video.c	1998/07/15 20:40:59
+--- linuxdoom-1.10/i_video.c	1998/07/15 20:40:59
 ***************
 *** 37,41 ****
   // Had to dig up XShm.c for this one.
@@ -204,13 +204,13 @@ diff -c -2 -r1.1.1.1 i_video.c
 ! #include <errno.h>
   #include <signal.h>
   
-Index: m_menu.c
+Index: linuxdoom-1.10/m_menu.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/m_menu.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 m_menu.c
 *** 1.1.1.1	1998/07/03 16:32:21
---- m_menu.c	1998/07/03 16:33:58
+--- linuxdoom-1.10/m_menu.c	1998/07/03 16:33:58
 ***************
 *** 530,534 ****
   	    continue;
@@ -224,13 +224,13 @@ diff -c -2 -r1.1.1.1 m_menu.c
 ! 	count = read (handle, savegamestrings[i], SAVESTRINGSIZE);
   	close (handle);
   	LoadMenu[i].status = 1;
-Index: m_misc.c
+Index: linuxdoom-1.10/m_misc.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/m_misc.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 m_misc.c
 *** 1.1.1.1	1998/07/03 16:32:21
---- m_misc.c	1998/07/03 16:33:58
+--- linuxdoom-1.10/m_misc.c	1998/07/03 16:33:58
 ***************
 *** 227,231 ****
       char*	name;
@@ -290,13 +290,13 @@ diff -c -2 -r1.1.1.1 m_misc.c
 !     {"chatmacro9", (int *) &chat_macros[9], (long) HUSTR_CHATMACRO9 }
   
   };
-Index: m_swap.c
+Index: linuxdoom-1.10/m_swap.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/m_swap.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 m_swap.c
 *** 1.1.1.1	1998/07/03 16:32:31
---- m_swap.c	1998/07/15 20:56:48
+--- linuxdoom-1.10/m_swap.c	1998/07/15 20:56:48
 ***************
 *** 43,47 ****
   
@@ -310,13 +310,13 @@ diff -c -2 -r1.1.1.1 m_swap.c
 ! unsigned int SwapLONG( unsigned int x)
   {
       return
-Index: p_setup.c
+Index: linuxdoom-1.10/p_setup.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/p_setup.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 p_setup.c
 *** 1.1.1.1	1998/07/03 16:32:23
---- p_setup.c	1998/07/03 16:34:02
+--- linuxdoom-1.10/p_setup.c	1998/07/03 16:34:02
 ***************
 *** 534,538 ****
   	
@@ -330,13 +330,13 @@ diff -c -2 -r1.1.1.1 p_setup.c
 !     linebuffer = Z_Malloc (total*sizeof(line_t*), PU_LEVEL, 0);
       sector = sectors;
       for (i=0 ; i<numsectors ; i++, sector++)
-Index: r_data.c
+Index: linuxdoom-1.10/r_data.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/r_data.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 r_data.c
 *** 1.1.1.1	1998/07/03 16:32:24
---- r_data.c	1998/07/15 20:54:12
+--- linuxdoom-1.10/r_data.c	1998/07/15 20:54:12
 ***************
 *** 42,47 ****
   #include "r_sky.h"
@@ -394,13 +394,13 @@ diff -c -2 -r1.1.1.1 r_data.c
 !     colormaps = (byte *)( ((long)colormaps + 255)&~0xffL); 
       W_ReadLump (lump,colormaps); 
   }
-Index: r_draw.c
+Index: linuxdoom-1.10/r_draw.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/r_draw.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 r_draw.c
 *** 1.1.1.1	1998/07/03 16:32:24
---- r_draw.c	1998/07/03 16:34:04
+--- linuxdoom-1.10/r_draw.c	1998/07/03 16:34:04
 ***************
 *** 462,466 ****
   	
@@ -414,13 +414,13 @@ diff -c -2 -r1.1.1.1 r_draw.c
 !     translationtables = (byte *)(( (long)translationtables + 255 )& ~255L);
       
       // translate just the 16 green colors
-Index: w_wad.c
+Index: linuxdoom-1.10/w_wad.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/w_wad.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 w_wad.c
 *** 1.1.1.1	1998/07/03 16:32:27
---- w_wad.c	1998/07/15 20:22:25
+--- linuxdoom-1.10/w_wad.c	1998/07/15 20:22:25
 ***************
 *** 35,39 ****
 --- 35,43 ----
@@ -433,13 +433,13 @@ diff -c -2 -r1.1.1.1 w_wad.c
 + #endif
   #define O_BINARY		0
   #endif
-Index: z_zone.c
+Index: linuxdoom-1.10/z_zone.c
 ===================================================================
 RCS file: /ca1/div/cvsroot/extern/doom/z_zone.c,v
 retrieving revision 1.1.1.1
 diff -c -2 -r1.1.1.1 z_zone.c
 *** 1.1.1.1	1998/07/03 16:32:29
---- z_zone.c	1998/07/15 20:44:56
+--- linuxdoom-1.10/z_zone.c	1998/07/15 20:44:56
 ***************
 *** 193,198 ****
       memblock_t*	base;
diff --git a/games/xdoom/patches/patch-ac b/games/xdoom/patches/patch-ac
index 76d38b8e738..1a38f6c24cd 100644
--- a/games/xdoom/patches/patch-ac
+++ b/games/xdoom/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 1998/08/28 12:53:05 garbled Exp $
+$NetBSD: patch-ac,v 1.2 1998/09/06 16:37:44 hubertf Exp $
 --- d_main.c.orig	Fri Aug 28 04:27:47 1998
-+++ d_main.c	Fri Aug 28 04:28:42 1998
++++ linuxdoom-1.10/d_main.c	Fri Aug 28 04:28:42 1998
 @@ -577,7 +577,7 @@
      char *doomwaddir;
      doomwaddir = getenv("DOOMWADDIR");
diff --git a/games/xdoom/patches/patch-ad b/games/xdoom/patches/patch-ad
index 588bff70c40..83f7578647b 100644
--- a/games/xdoom/patches/patch-ad
+++ b/games/xdoom/patches/patch-ad
@@ -1,12 +1,16 @@
-$NetBSD: patch-ad,v 1.1 1998/08/28 12:53:05 garbled Exp $
---- i_sound.c.orig	Fri Aug 28 04:29:07 1998
-+++ i_sound.c	Fri Aug 28 04:30:33 1998
-@@ -747,7 +747,7 @@
+$NetBSD: patch-ad,v 1.2 1998/09/06 16:37:45 hubertf Exp $
+--- i_sound.c.orig	Sun Sep  6 17:42:40 1998
++++ linuxdoom-1.10/i_sound.c	Sun Sep  6 17:43:59 1998
+@@ -747,7 +747,11 @@
  	    getenv("DOOMWADDIR"),
  	    sndserver_filename);
    else
 -    sprintf(buffer, "%s", sndserver_filename);
 +    sprintf(buffer, "XXXPREFIXXXX/bin/%s", sndserver_filename);
++
++  /* sndserver won't find its wadfile if DOMMWADDIR isn't set - HF */
++  if(!getenv("DOOMWADDIR"))
++    setenv("DOOMWADDIR","XXXPREFIXXXX/share/doom",1);
    
    // start sound process
    if ( !access(buffer, X_OK) )
diff --git a/games/xdoom/patches/patch-ae b/games/xdoom/patches/patch-ae
new file mode 100644
index 00000000000..a5452b7bc42
--- /dev/null
+++ b/games/xdoom/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 1998/09/06 16:37:45 hubertf Exp $
+--- sndserv/linux.c.orig	Sun Sep  6 18:02:05 1998
++++ sndserv/linux.c	Sun Sep  6 18:02:31 1998
+@@ -39,8 +39,9 @@
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/ioctl.h>
+ 
+-#include <linux/soundcard.h>
++#include <soundcard.h>
+ 
+ #include "soundsrv.h"
+ 
diff --git a/games/xdoom/patches/patch-af b/games/xdoom/patches/patch-af
new file mode 100644
index 00000000000..9d0cebbb7bf
--- /dev/null
+++ b/games/xdoom/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 1998/09/06 16:37:45 hubertf Exp $
+--- sndserv/Makefile.orig	Sun Sep  6 18:03:07 1998
++++ sndserv/Makefile	Sun Sep  6 18:03:10 1998
+@@ -9,7 +9,7 @@
+ CC=gcc
+ CFLAGS=-O -DNORMALUNIX -DLINUX
+ LDFLAGS=
+-LIBS=-lm
++LIBS=-lm -lossaudio
+ 
+ O=linux
+ 
diff --git a/games/xdoom/pkg/PLIST b/games/xdoom/pkg/PLIST
index 118927af836..219ec236a7f 100644
--- a/games/xdoom/pkg/PLIST
+++ b/games/xdoom/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/28 12:53:06 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/09/06 16:37:45 hubertf Exp $
 bin/xdoom
+bin/sndserver
 share/doom/doom1.wad
 @dirrm share/doom