From 4cb1db3b108df027abaab9b13e51757ade8f2e2f Mon Sep 17 00:00:00 2001 From: jolan Date: Tue, 17 Oct 2006 01:58:41 +0000 Subject: [PATCH] update to 2.4.6 --- games/prboom/Makefile | 4 ++-- games/prboom/distinfo | 8 ++++---- games/prboom/patches/patch-src_Makefile_in | 12 ++++++------ games/prboom/patches/patch-src_r_draw_c | 21 --------------------- 4 files changed, 12 insertions(+), 33 deletions(-) delete mode 100644 games/prboom/patches/patch-src_r_draw_c diff --git a/games/prboom/Makefile b/games/prboom/Makefile index 351f5b8788c..bec51ae9ab9 100644 --- a/games/prboom/Makefile +++ b/games/prboom/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.9 2006/09/22 05:54:38 jsg Exp $ +# $OpenBSD: Makefile,v 1.10 2006/10/17 01:58:41 jolan Exp $ COMMENT= "enhanced clone of Id Software's Doom game; multiplayer" -DISTNAME= prboom-2.4.5 +DISTNAME= prboom-2.4.6 CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/} diff --git a/games/prboom/distinfo b/games/prboom/distinfo index 3cce501276a..12e1ff5846e 100644 --- a/games/prboom/distinfo +++ b/games/prboom/distinfo @@ -1,4 +1,4 @@ -MD5 (prboom-2.4.5.tar.gz) = 24381017240a9eda5da21af0ca046228 -RMD160 (prboom-2.4.5.tar.gz) = 7495750f0ed35e96dd8ea8a1546dcf0cfc1bdf89 -SHA1 (prboom-2.4.5.tar.gz) = 732305dd21770e38103340e5af824c303fd8212b -SIZE (prboom-2.4.5.tar.gz) = 970658 +MD5 (prboom-2.4.6.tar.gz) = 0f60f3ad6a8dad5b2c6d4360f181ac22 +RMD160 (prboom-2.4.6.tar.gz) = 07370e5dc42c938b275cb0c1bb1e50dd0ce096d5 +SHA1 (prboom-2.4.6.tar.gz) = 00486df7aaf72c164767adeaa01c083401c44b30 +SIZE (prboom-2.4.6.tar.gz) = 997997 diff --git a/games/prboom/patches/patch-src_Makefile_in b/games/prboom/patches/patch-src_Makefile_in index e1859e0cf62..a8a9b91f891 100644 --- a/games/prboom/patches/patch-src_Makefile_in +++ b/games/prboom/patches/patch-src_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_Makefile_in,v 1.5 2006/09/22 05:54:38 jsg Exp $ ---- src/Makefile.in.orig Fri Sep 22 13:15:09 2006 -+++ src/Makefile.in Fri Sep 22 13:15:28 2006 -@@ -245,7 +245,7 @@ target_cpu = @target_cpu@ +$OpenBSD: patch-src_Makefile_in,v 1.6 2006/10/17 01:58:41 jolan Exp $ +--- src/Makefile.in.orig Sat Oct 14 12:48:40 2006 ++++ src/Makefile.in Mon Oct 16 20:48:01 2006 +@@ -246,7 +246,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ SUBDIRS = SDL POSIX MAC -gamesdir = $(prefix)/games +gamesdir = $(prefix)/bin - prboom_game_server_SOURCES = d_server.c i_udp_sdl.c protocol.h - prboom_game_server_LDADD = POSIX/libposixdoom.a @NET_LIBS@ @SDL_LIBS@ + prboom_game_server_SOURCES = d_server.c protocol.h + prboom_game_server_LDADD = POSIX/libposixdoom.a SDL/i_network.o @NET_LIBS@ @SDL_LIBS@ COMMON_SRC = \ diff --git a/games/prboom/patches/patch-src_r_draw_c b/games/prboom/patches/patch-src_r_draw_c deleted file mode 100644 index 1d610f48518..00000000000 --- a/games/prboom/patches/patch-src_r_draw_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_r_draw_c,v 1.2 2006/09/22 05:54:38 jsg Exp $ ---- src/r_draw.c.orig Thu Aug 10 04:57:58 2006 -+++ src/r_draw.c Fri Sep 22 13:22:38 2006 -@@ -739,7 +739,16 @@ void R_DrawTLColumn (void) - register const byte *source = dcvars.source; - register const lighttable_t *colormap = dcvars.colormap; - register unsigned heightmask = dcvars.texheight-1; // CPhipps - specify type -- if (dcvars.texheight & heightmask) // not a power of 2 -- killough -+ if (dcvars.texheight == 0) -+ { -+ /* cea - another special case */ -+ while (count--) { -+ *dest = tranmap[(*dest<<8)+colormap[source[frac>>FRACBITS]]]; // phares -+ dest += SCREENWIDTH; -+ frac += fracstep; -+ } -+ } -+ else if (dcvars.texheight & heightmask) // not a power of 2 -- killough - { - heightmask++; - heightmask <<= FRACBITS;