diff options
Diffstat (limited to 'games')
-rw-r--r-- | games/quake/distinfo | 6 | ||||
-rw-r--r-- | games/quake/patches/patch-ae | 28 | ||||
-rw-r--r-- | games/quake/patches/patch-ai | 11 |
3 files changed, 27 insertions, 18 deletions
diff --git a/games/quake/distinfo b/games/quake/distinfo index c2504ff56dc..e8a0aec9491 100644 --- a/games/quake/distinfo +++ b/games/quake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2009/08/30 05:17:44 hasso Exp $ +$NetBSD: distinfo,v 1.11 2011/09/14 19:19:37 marino Exp $ SHA1 (q1source.zip) = 1f607e549c6aa3921797e51b7d2038e95116c989 RMD160 (q1source.zip) = 57a750e8644116d0d07a273ea6ad0b6d3071c89f @@ -7,11 +7,11 @@ SHA1 (patch-aa) = 7b4f06a9650a83c221a9c16b69fdaf107ea025c4 SHA1 (patch-ab) = 164aa9d8fbaf19b16aec17ce99cd632ee1986c8b SHA1 (patch-ac) = f7dc2284fd997a0cc75644d0a19a4747eb138b53 SHA1 (patch-ad) = 187ba247c14324419383624b3dec054a098f0055 -SHA1 (patch-ae) = a32b0a63fc2b9804f9e60b1c39af31dd460cf777 +SHA1 (patch-ae) = 6164ee9bfaf748f241e5b1c763a0ffa681d45dc9 SHA1 (patch-af) = 57d5d0d88dcd745517b24bd4bdc9ceef494ef3a6 SHA1 (patch-ag) = c56b1704416427a2ef733ca0cbf2436ff22b4b09 SHA1 (patch-ah) = d7ab5fd7f7f834b254a068514ae473c35a43fef4 -SHA1 (patch-ai) = 3ffc58567046e83848a457bc2f7b8c1edcc1dc27 +SHA1 (patch-ai) = 81e9fd2537c1cf1c73be9790f2f6dcf6445d09c3 SHA1 (patch-aj) = 5509d63f7856bc4760244a3d25c1984d16473e96 SHA1 (patch-ak) = 44e5305375e41277e902980f7fd398fb1fcbeba8 SHA1 (patch-al) = 1e40eb69839753348e023bc31f01331b6d4f51ef diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae index 3a242eb357f..a842874df18 100644 --- a/games/quake/patches/patch-ae +++ b/games/quake/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.9 2009/08/29 19:26:01 wiz Exp $ +$NetBSD: patch-ae,v 1.10 2011/09/14 19:19:37 marino Exp $ ---- QW/Makefile.Linux.orig Wed Apr 21 20:16:24 1999 +--- QW/Makefile.Linux.orig 1999-04-21 18:16:24.000000000 +0000 +++ QW/Makefile.Linux -@@ -27,41 +27,51 @@ +@@ -27,41 +27,57 @@ ARCH=i386 RPMARCH=i386 endif @@ -30,13 +30,21 @@ $NetBSD: patch-ae,v 1.9 2009/08/29 19:26:01 wiz Exp $ -fomit-frame-pointer -fexpensive-optimizations else -RELEASE_CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \ +- -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ +- -malign-jumps=2 -malign-functions=2 +# Optimizer bug?!?!? +#RELEASE_CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \ +# -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ +# -malign-jumps=2 -malign-functions=2 -+RELEASE_CFLAGS=$(BASE_CFLAGS) -m486 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ - -malign-jumps=2 -malign-functions=2 ++RELEASE_CFLAGS=$(BASE_CFLAGS) \ ++ -mtune=i486 \ ++ -ffast-math \ ++ -funroll-loops \ ++ -fomit-frame-pointer \ ++ -fexpensive-optimizations \ ++ -falign-loops=2 \ ++ -falign-jumps=2 \ ++ -falign-functions=2 endif -GLCFLAGS=-DGLQUAKE -I/usr/local/src/Mesa-3.0/include -I/usr/include/glide +GLCFLAGS=-DGLQUAKE -I${MESA_DIR}/include -I/usr/include/glide @@ -69,7 +77,7 @@ $NetBSD: patch-ae,v 1.9 2009/08/29 19:26:01 wiz Exp $ ############################################################################# # SETUP AND BUILD -@@ -71,7 +81,7 @@ +@@ -71,7 +87,7 @@ ifeq ($(ARCH),axp) TARGETS=$(BUILDDIR)/qwsv #$(BUILDDIR)/qwcl.x11 else @@ -78,7 +86,7 @@ $NetBSD: patch-ae,v 1.9 2009/08/29 19:26:01 wiz Exp $ endif build_debug: -@@ -485,7 +495,7 @@ +@@ -485,7 +501,7 @@ $(BUILDDIR)/client/wad.o : $( $(BUILDDIR)/client/zone.o : $(CLIENT_DIR)/zone.c $(DO_CC) @@ -87,7 +95,7 @@ $NetBSD: patch-ae,v 1.9 2009/08/29 19:26:01 wiz Exp $ $(DO_CC) $(BUILDDIR)/client/sys_linux.o : $(CLIENT_DIR)/sys_linux.c -@@ -609,7 +619,7 @@ +@@ -609,7 +625,7 @@ GLQWCL_OBJS = \ $(BUILDDIR)/glclient/math.o \ $(BUILDDIR)/glclient/snd_mixa.o \ $(BUILDDIR)/glclient/sys_dosa.o @@ -96,7 +104,7 @@ $NetBSD: patch-ae,v 1.9 2009/08/29 19:26:01 wiz Exp $ GLQWCL_SVGA_OBJS = $(BUILDDIR)/glclient/gl_vidlinux.o GLQWCL_X11_OBJS = $(BUILDDIR)/glclient/gl_vidlinuxglx.o -@@ -715,7 +725,7 @@ +@@ -715,7 +731,7 @@ $(BUILDDIR)/glclient/wad.o : $ $(BUILDDIR)/glclient/zone.o : $(CLIENT_DIR)/zone.c $(DO_GL_CC) diff --git a/games/quake/patches/patch-ai b/games/quake/patches/patch-ai index a40444ebb38..619332cabb4 100644 --- a/games/quake/patches/patch-ai +++ b/games/quake/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.9 2009/08/30 05:17:44 hasso Exp $ +$NetBSD: patch-ai,v 1.10 2011/09/14 19:19:37 marino Exp $ ---- WinQuake/Makefile.linuxi386.orig Tue Apr 27 17:51:18 1999 +--- WinQuake/Makefile.linuxi386.orig 1999-04-27 15:51:18.000000000 +0000 +++ WinQuake/Makefile.linuxi386 -@@ -25,29 +25,31 @@ +@@ -25,29 +25,31 @@ ARCH=i386 endif NOARCH=noarch @@ -25,8 +25,9 @@ $NetBSD: patch-ai,v 1.9 2009/08/30 05:17:44 hasso Exp $ +#CC=$(EGCS) -BASE_CFLAGS=-Dstricmp=strcasecmp +-RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ +BASE_CFLAGS=-Dstricmp=strcasecmp -I${X11BASE}/include ${CFLAGS} - RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ ++RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mtune=pentiumpro -O6 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations DEBUG_CFLAGS=$(BASE_CFLAGS) -g -LDFLAGS=-lm @@ -45,7 +46,7 @@ $NetBSD: patch-ai,v 1.9 2009/08/30 05:17:44 hasso Exp $ GLCFLAGS=-DGLQUAKE -I$(MESA_DIR)/include -I/usr/include/glide DO_CC=$(CC) $(CFLAGS) -o $@ -c $< -@@ -57,19 +59,28 @@ +@@ -57,19 +59,28 @@ DO_GL_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(G DO_X11_CC=$(CC) $(CFLAGS) $(XCFLAGS) -o $@ -c $< DO_X11_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(XCFLAGS) -o $@ -c $< DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $< |