From 2e2993d81ee87eb1988034d90769dfa0309d6f5b Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 13 Jan 2000 00:35:04 +0000 Subject: does compile client now on 1.4.1/i386/a.out, but still untested for lack of shareware WADs currently --- games/quake/Makefile | 4 +-- games/quake/files/patch-sum | 8 +++-- games/quake/patches/patch-aa | 86 ++++++++++++++++++++++++++++++++++++++++++-- games/quake/patches/patch-ab | 13 +++++++ games/quake/patches/patch-ac | 16 +++++++++ games/quake/patches/patch-ad | 14 ++++++++ games/quake/patches/patch-ae | 12 +++++++ 7 files changed, 147 insertions(+), 6 deletions(-) create mode 100644 games/quake/patches/patch-ab create mode 100644 games/quake/patches/patch-ac create mode 100644 games/quake/patches/patch-ad create mode 100644 games/quake/patches/patch-ae (limited to 'games') diff --git a/games/quake/Makefile b/games/quake/Makefile index 828da4b8151..7421423dce8 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/12/28 14:20:41 tron Exp $ +# $NetBSD: Makefile,v 1.2 2000/01/13 00:35:04 wiz Exp $ DISTNAME= q1source PKGNAME= quake-2.30 @@ -16,7 +16,7 @@ DEPENDS+= Mesa-*:../../graphics/Mesa USE_GMAKE= yes -BROKEN= more patches are needed to make it build. +BROKEN= untested, only compiles on a.out for now EXTRACT_CMD= ${UNZIP} -q ${DISTDIR}/${EXTRACT_ONLY} MAKE_ENV+= MAINDIR=${WRKSRC} diff --git a/games/quake/files/patch-sum b/games/quake/files/patch-sum index 531f44ed519..d2ada4df646 100644 --- a/games/quake/files/patch-sum +++ b/games/quake/files/patch-sum @@ -1,3 +1,7 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/12/28 14:20:41 tron Exp $ +$NetBSD: patch-sum,v 1.2 2000/01/13 00:35:05 wiz Exp $ -MD5 (patch-aa) = 2774e46a35aae2a6e568c86231c927c9 +MD5 (patch-aa) = 2ad2bccf016e39d2928159e7092d066a +MD5 (patch-ab) = 03a47b0964a42164cbbdd7b8ba5229f0 +MD5 (patch-ac) = 36885bcf121b8d622a3a688241bc47de +MD5 (patch-ad) = b916ba6ef25b49062ac915a73a9435a9 +MD5 (patch-ae) = 4d041b8bdf2862e4e9df6ee096529db2 diff --git a/games/quake/patches/patch-aa b/games/quake/patches/patch-aa index 4638219d0e4..0c60d094de6 100644 --- a/games/quake/patches/patch-aa +++ b/games/quake/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/12/28 14:20:42 tron Exp $ +$NetBSD: patch-aa,v 1.2 2000/01/13 00:35:05 wiz Exp $ --- Makefile.Linux.orig Wed Apr 21 20:16:24 1999 -+++ Makefile.Linux Tue Dec 28 12:01:52 1999 ++++ Makefile.Linux Thu Jan 13 01:05:47 2000 @@ -27,8 +27,6 @@ RPMARCH=i386 endif @@ -11,3 +11,85 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 14:20:42 tron Exp $ 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) + + $(BUILDDIR)/glclient/sys_linux.o : $(CLIENT_DIR)/sys_linux.c diff --git a/games/quake/patches/patch-ab b/games/quake/patches/patch-ab new file mode 100644 index 00000000000..7222bc70e84 --- /dev/null +++ b/games/quake/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2000/01/13 00:35:05 wiz Exp $ + +--- server/sys_unix.c.orig Thu Jan 13 00:13:37 2000 ++++ server/sys_unix.c Thu Jan 13 00:13:58 2000 +@@ -24,7 +24,7 @@ + #include + #endif + +-#if defined(__linux__) || defined(sun) ++#if defined(__linux__) || defined(sun) || defined(__NetBSD__) + #include + #include + #include diff --git a/games/quake/patches/patch-ac b/games/quake/patches/patch-ac new file mode 100644 index 00000000000..7d4914a1bd8 --- /dev/null +++ b/games/quake/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1 2000/01/13 00:35:06 wiz Exp $ + +--- client/snd_linux.c.orig Mon Jul 7 20:08:00 1997 ++++ client/snd_linux.c Thu Jan 13 00:29:11 2000 +@@ -6,7 +6,11 @@ + #include + #include + #include ++#ifdef __NetBSD__ ++#include ++#else + #include ++#endif + #include + #include "quakedef.h" + diff --git a/games/quake/patches/patch-ad b/games/quake/patches/patch-ad new file mode 100644 index 00000000000..3ebbd852c2d --- /dev/null +++ b/games/quake/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.1 2000/01/13 00:35:06 wiz Exp $ + +--- client/cd_null.c~ Mon Jul 7 20:08:00 1997 ++++ client/cd_null.c Thu Jan 13 00:59:02 2000 +@@ -9,6 +9,9 @@ + { + } + ++void CDAudio_Pause(void) ++{ ++} + + void CDAudio_Resume(void) + { diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae new file mode 100644 index 00000000000..7de0754d02a --- /dev/null +++ b/games/quake/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1 2000/01/13 00:35:06 wiz Exp $ + +--- client/gl_vidlinuxglx.c~ Tue Dec 21 18:45:54 1999 ++++ client/gl_vidlinuxglx.c Thu Jan 13 01:02:59 2000 +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + #include + #include -- cgit v1.2.3