CVS commit: pkgsrc/games/doomlegacy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/doomlegacy
From: "Michael Baeuerle" <micha%netbsd.org@localhost>
Date: Wed, 21 Oct 2020 11:43:31 +0000

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed Oct 21 11:43:31 UTC 2020

Modified Files:
        pkgsrc/games/doomlegacy: Makefile distinfo
        pkgsrc/games/doomlegacy/files: doomlegacy.6.in
        pkgsrc/games/doomlegacy/patches: patch-src_Makefile patch-src_am__map.c
            patch-src_doomdata.h patch-src_dstrings.c patch-src_p__local.h
            patch-src_p__setup.c patch-src_r__defs.h

Log Message:
games/doomlegacy: Update to 1.48.6

Update pkgsrc patches and remove the ones that were merged upstream.

Doom Legacy Changelog

1.48.6 SVN1550 (2020-09-09)

FEATURES 1.48.6

  * DoomLegacy can read zip archives (Linux Only, enabled by compile option
    ZIPWAD). When an load file is a zip archive, all loadable files within the
    archive are loaded. When searching for a known file, zip archives of the
    same name (but with .zip) are also searched.
    This uses library libzip. When built with compile option ZIPWAD_OPTIONAL,
    DoomLegacy detects if the libzip library is present on the user machine.
    This allows DoomLegacy to run without the feature, when the user does not
    have libzip.
    A libzip before version 1.2 does not have a seek function. A compile
    option will provide our own zip_seek function, so libzip 1.0 can be used.
  * Recorded Demos now include both the Version and Revision numbers, so
    revision specific behaviors can be enabled. DoomLegacy 1.48.6 has modified
    its native demo format, which is revision specific. Older demo formats are
    still playable.
  * Recognize and handle DeePsea Tall patches. Enabled with compile option
    DEEPSEA_TALL_PATCH. Michael Bauerle submitted the orignial patch, derived
    from crispy doom.

BUG FIXES 1.48.6

  * DoomLegacy and PrBoom monster infighting does not have missile
    invulnerability between monsters of the same species. Some other ports
    (Boom, MBF, Eternity engine) do not have the infight test, so their
    monsters are always invulnerable to missiles from their own species.
    Added another item to the infight control to select the behavior.
    Implements "Full Infight" setting with missile damage (Legacy, PrBoom).
    Implements other infight settings without missile damage (Boom, MBF,
    Eternity).
    Fixes BUG 0664.

    Added MBF infight logic, thats stops monsters from firing on friends.
  * Legacy demo would fail to start due to blocking the textcmd that loads the
    map.

    The Legacy 1.48.4 demo was recorded with player 0 issuing the map textcmd.
    Player 0 was not in the game yet, and this was detected as a textcmd from
    a non-existant player, which got caught by new security code. For textcmd
    issued before player 0 is in the game, the demo needs to use SERVER_PID.
    Fixed demo read to redirect player 0 demo textcmd to SERVER_PID.

    DoomLegacy 1.48 has a single long combined textbuf, containing the textcmd
    from all players. Within the combined textbuf, there are individual
    textcmd marked with the player id. Individual textcmd are still limited to
    255 chars as in an ordinary textbuf. The DoomLegacy 1.48.6 demo format has
    been changed to store the entire combined textbuf buffer into the player 0
    slot.
    This is simpler for recording and playback, has the same effect, and
    allows SERVER_PID textcmd, which the previous demo format did not.

    The commands to create a player (and other server actions) are now issued
    by SERVER_PID, where in older demos they were issued by player 0, before
    player 0 existed. DoomLegacy 1.48 has better protection against malicious
    network traffic than previous versions, and checking textcmd validity is
    part of the security protection. This fixes demo playback to work with the
    security checking.

    Changed the SERVER_PID to 250 now, for future expansion of players.

    This fixes bug 0665.
  * Fixed the moonwalk bug, where monsters would sometimes walk backward. This
    was due to a bad translation of an everything-in-one-expression to more
    maintainable code.
  * Make an oof sound when hit a 2s line, just like when hit a 1s line.
    Adopted from PrBoom, a Killough enhancement.
  * Make optional, and disabled, some old development hacks.
    Option DEVPARM_LOADING:
    Loaded development wads from a special directory. This used switches
    -wart, -devgame (even older -shdev, -regdev, -comdev).
    Option WADFILE_RELOAD:
    If a filename started with a tilde "~", it was taken as an indication to
    reload the file on every lump access. This was to enable leaving doom
    running while changing wad files.
    Option LOADING_DISK_ICON:
    Not implemented in any port anyway.
  * The Full Graphics startup was fragile, requiring constant fixing. Video
    startup now changes directly to the config modes, which is faster and
    cleaner. Removed some antiquated code and interactions, adopting an
    interface that puts the main code in control.
  * Fixed the violet line, trees, and tall sprites of "Lost civilization" wad.
    This required being able to save the same texture as both a transparent
    patch texture, for drawing hanging vines, and as a picture format texture,
    for drawing tiled walls. This fixes Bug 0663.
  * The fast drawing of wall textures required them to be a power-of-2 in
    width, so they could be tiled. To handle the case where it is not a
    power-of-2 in width, it now uses a slower masked draw similar to that in
    PrBoom, which also handles a negative offset. This fixes the large tree in
    "Lost civilization".
  * Fixed some old code to use POSIX fcntl, which allows it to compile on
    SunOS. Patches submitted by Michael Bauerle. Fixes Bug 0666.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/doomlegacy/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/doomlegacy/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/doomlegacy/files/doomlegacy.6.in
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/doomlegacy/patches/patch-src_Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/doomlegacy/patches/patch-src_am__map.c \
    pkgsrc/games/doomlegacy/patches/patch-src_doomdata.h \
    pkgsrc/games/doomlegacy/patches/patch-src_dstrings.c \
    pkgsrc/games/doomlegacy/patches/patch-src_r__defs.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/doomlegacy/patches/patch-src_p__local.h \
    pkgsrc/games/doomlegacy/patches/patch-src_p__setup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/doomlegacy/Makefile
diff -u pkgsrc/games/doomlegacy/Makefile:1.9 pkgsrc/games/doomlegacy/Makefile:1.10
--- pkgsrc/games/doomlegacy/Makefile:1.9        Fri Jun 19 09:52:22 2020
+++ pkgsrc/games/doomlegacy/Makefile    Wed Oct 21 11:43:31 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2020/06/19 09:52:22 micha Exp $
+# $NetBSD: Makefile,v 1.10 2020/10/21 11:43:31 micha Exp $
 
-VERS=                  1.48.4
+VERS=                  1.48.6
 PKGNAME=               doomlegacy-${VERS}
-PKGREVISION=           3
 CATEGORIES=            games
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=doomlegacy/}
 DISTNAME=              ${PKGNAME_NOREV:S/-/_/}_source
@@ -58,7 +57,9 @@ SUBST_CLASSES+=               makeopt
 SUBST_STAGE.makeopt=   do-configure
 SUBST_MESSAGE.makeopt= Preparing make_options file ...
 SUBST_FILES.makeopt=   make_options
-SUBST_SED.makeopt=     -e 's,\#COMP_ENVIRONMENT,COMP_ENVIRONMENT,'
+SUBST_SED.makeopt=     -e 's,\#[ ]*COMP_ENVIRONMENT,COMP_ENVIRONMENT,'
+SUBST_SED.makeopt+=    -e 's,HAVE_LIBZIP,\# HAVE_LIBZIP,'
+SUBST_SED.makeopt+=    -e 's,HAVE_DLOPEN,\# HAVE_DLOPEN,'
 
 # Configure defaults for LEGACYWADDIR and DOOMWADDIR
 SUBST_CLASSES+=                doomdef

Index: pkgsrc/games/doomlegacy/distinfo
diff -u pkgsrc/games/doomlegacy/distinfo:1.7 pkgsrc/games/doomlegacy/distinfo:1.8
--- pkgsrc/games/doomlegacy/distinfo:1.7        Thu Jun 18 10:14:54 2020
+++ pkgsrc/games/doomlegacy/distinfo    Wed Oct 21 11:43:31 2020
@@ -1,20 +1,17 @@
-$NetBSD: distinfo,v 1.7 2020/06/18 10:14:54 micha Exp $
+$NetBSD: distinfo,v 1.8 2020/10/21 11:43:31 micha Exp $
 
-SHA1 (doomlegacy_1.48.4_common.zip) = 14aed4c0091e8c61f46a2303f9316659ab6c0483
-RMD160 (doomlegacy_1.48.4_common.zip) = cca61af6bdda1003032ee117129e07596c8bbfcf
-SHA512 (doomlegacy_1.48.4_common.zip) = f41830b6d3ba7f30d020e887193fedf502d9b0b260bb53f78e888ce4985dfc2a8b744b5add86813e135c9a0ed65c9be42da64437976b7a85992bcc45bbeeb462
-Size (doomlegacy_1.48.4_common.zip) = 1004978 bytes
-SHA1 (doomlegacy_1.48.4_source.tar.bz2) = f787c653ac4d097de702c72c9b30aed9b4b308a1
-RMD160 (doomlegacy_1.48.4_source.tar.bz2) = 1e2a435e28f84a1578041feec4b98770774b2287
-SHA512 (doomlegacy_1.48.4_source.tar.bz2) = a63a38135f902b7ddfedfbc117ccf9446dba5b1da918189de560722b4fe2afae5f5a0493f9571b5817f95aed96f52fecd32d46c101da5141596cf062d55cec57
-Size (doomlegacy_1.48.4_source.tar.bz2) = 2410187 bytes
-SHA1 (patch-src_Makefile) = 65a6380a5d117333f95a8265b55869244002587c
-SHA1 (patch-src_am__map.c) = 647bcba2374cfa7038646e0c053636b43caaf33a
-SHA1 (patch-src_doomdata.h) = 2fd95b5db154b05ba88597b20c45146339db4622
-SHA1 (patch-src_dstrings.c) = e1fc8bdcb83efa18690d95c56e3ea7c94a388a50
-SHA1 (patch-src_i__tcp.c) = 13c8bd14cae31b078154f4ef0d2353cf089234b8
-SHA1 (patch-src_mserv.c) = 685ca5028740428ef2579025ca8673d8da526ebe
+SHA1 (doomlegacy_1.48.6_common.zip) = 24662975b4f4d5fa0e4e09747029014159dcfe81
+RMD160 (doomlegacy_1.48.6_common.zip) = d5c0e8edc763d92e84494766f14c3ff995a60965
+SHA512 (doomlegacy_1.48.6_common.zip) = 92ab453df6c48397f1228e922e04d5426f445c87683265f6ee5543662631eeaf1696d2681c1d3015b2821a644241c1c691d1a6c7ba6abacf07eb4fce050e020f
+Size (doomlegacy_1.48.6_common.zip) = 1007223 bytes
+SHA1 (doomlegacy_1.48.6_source.tar.bz2) = e9bd0502bce476126cf43d8634119fa57b4c355b
+RMD160 (doomlegacy_1.48.6_source.tar.bz2) = 0885b29ad5c31bcb1b528feb3c227e6f63b495c3
+SHA512 (doomlegacy_1.48.6_source.tar.bz2) = af9bcc4ff188286c7551ca676e8195b8f51c47b27496bee43968cf37cfa731b137f1f9b136f1eb447da614919ab76df1faa61b9bb06d3d80144a683c2458e392
+Size (doomlegacy_1.48.6_source.tar.bz2) = 2434127 bytes
+SHA1 (patch-src_Makefile) = 34c323bdd96787cb6afe0be5dc99b129ab8f1552
+SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
+SHA1 (patch-src_doomdata.h) = 8c3186dafbf11a8a75262a06755dd9807cb58612
+SHA1 (patch-src_dstrings.c) = 16e50ac649f76d415b820a0e5093d15af3180e6d
 SHA1 (patch-src_p__local.h) = e429f2ce5d60dd538bc5e796847b53ae72604b33
-SHA1 (patch-src_p__setup.c) = c3766f924b05655b8d9d17d4686dde9a83239e0a
-SHA1 (patch-src_r__defs.h) = 9211ae6db72f0288f38449b18c8c252f42686405
-SHA1 (patch-src_t__prepro.h) = 768fc3a87665a75a85ff4ff88b53091b13eab55e
+SHA1 (patch-src_p__setup.c) = e8a7c77f29bcf0e73f08864e932dd021e6652a3a
+SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543

Index: pkgsrc/games/doomlegacy/files/doomlegacy.6.in
diff -u pkgsrc/games/doomlegacy/files/doomlegacy.6.in:1.1 pkgsrc/games/doomlegacy/files/doomlegacy.6.in:1.2
--- pkgsrc/games/doomlegacy/files/doomlegacy.6.in:1.1   Tue May 19 11:20:16 2020
+++ pkgsrc/games/doomlegacy/files/doomlegacy.6.in       Wed Oct 21 11:43:31 2020
@@ -89,7 +89,7 @@ Ignore BLOCKMAP lump in WAD file and cre
 Try this option if you encounter problems with collision detection
 (e.g. able to walk through a fence or unable to activate a switch).
 .PP
-Only available with pkgsrc blockmap patch.
+[Only available with pkgsrc blockmap patch]
 .RE
 .TP 25
 .BI -deh " file [file ...]

Index: pkgsrc/games/doomlegacy/patches/patch-src_Makefile
diff -u pkgsrc/games/doomlegacy/patches/patch-src_Makefile:1.3 pkgsrc/games/doomlegacy/patches/patch-src_Makefile:1.4
--- pkgsrc/games/doomlegacy/patches/patch-src_Makefile:1.3      Wed May 20 16:04:12 2020
+++ pkgsrc/games/doomlegacy/patches/patch-src_Makefile  Wed Oct 21 11:43:31 2020
@@ -1,15 +1,14 @@
-$NetBSD: patch-src_Makefile,v 1.3 2020/05/20 16:04:12 micha Exp $
+$NetBSD: patch-src_Makefile,v 1.4 2020/10/21 11:43:31 micha Exp $
 
-Add object file for import of extended nodes.
-Upstream feature request:
-https://sourceforge.net/p/doomlegacy/feature-requests/95/
+Add object file for import of extended nodes and internal blockmap creation.
 
-Add support to internally create blockmap.
+Created upstream feature requests:
+https://sourceforge.net/p/doomlegacy/feature-requests/95/
 https://sourceforge.net/p/doomlegacy/feature-requests/96/
 
 --- src/Makefile.orig  2020-05-11 09:40:36.000000000 +0000
 +++ src/Makefile
-@@ -1070,7 +1070,8 @@ screen.o v_video.o \
+@@ -1086,7 +1086,8 @@ screen.o v_video.o \
  r_draw.o r_plane.o r_segs.o r_sky.o r_things.o r_splats.o \
  r_bsp.o r_data.o r_main.o \
  z_zone.o \

Index: pkgsrc/games/doomlegacy/patches/patch-src_am__map.c
diff -u pkgsrc/games/doomlegacy/patches/patch-src_am__map.c:1.1 pkgsrc/games/doomlegacy/patches/patch-src_am__map.c:1.2
--- pkgsrc/games/doomlegacy/patches/patch-src_am__map.c:1.1     Mon Jun 17 13:53:22 2019
+++ pkgsrc/games/doomlegacy/patches/patch-src_am__map.c Wed Oct 21 11:43:31 2020
@@ -1,7 +1,11 @@
-$NetBSD: patch-src_am__map.c,v 1.1 2019/06/17 13:53:22 micha Exp $
+$NetBSD: patch-src_am__map.c,v 1.2 2020/10/21 11:43:31 micha Exp $
 
 Set automap "zoom in" key to '+'.
 
+This patch was rejected upstream, because it works for my german keyboard
+but not for any other layout (patch is as broken as the original code).
+https://sourceforge.net/p/doomlegacy/feature-requests/90/
+
 --- src/am_map.c.orig  2018-07-16 09:17:06.000000000 +0000
 +++ src/am_map.c
 @@ -118,7 +118,9 @@ static byte DWHITE      =    (256-47);
Index: pkgsrc/games/doomlegacy/patches/patch-src_doomdata.h
diff -u pkgsrc/games/doomlegacy/patches/patch-src_doomdata.h:1.1 pkgsrc/games/doomlegacy/patches/patch-src_doomdata.h:1.2
--- pkgsrc/games/doomlegacy/patches/patch-src_doomdata.h:1.1    Tue May 19 11:20:16 2020
+++ pkgsrc/games/doomlegacy/patches/patch-src_doomdata.h        Wed Oct 21 11:43:31 2020
@@ -1,7 +1,8 @@
-$NetBSD: patch-src_doomdata.h,v 1.1 2020/05/19 11:20:16 micha Exp $
+$NetBSD: patch-src_doomdata.h,v 1.2 2020/10/21 11:43:31 micha Exp $
 
 Refer to subsectors with 32-Bit values (required for extended nodes).
-Upstream feature request:
+
+Created upstream feature request:
 https://sourceforge.net/p/doomlegacy/feature-requests/95/
 
 --- src/doomdata.h.orig        2020-04-20 10:32:30.000000000 +0000
Index: pkgsrc/games/doomlegacy/patches/patch-src_dstrings.c
diff -u pkgsrc/games/doomlegacy/patches/patch-src_dstrings.c:1.1 pkgsrc/games/doomlegacy/patches/patch-src_dstrings.c:1.2
--- pkgsrc/games/doomlegacy/patches/patch-src_dstrings.c:1.1    Tue May 19 11:20:16 2020
+++ pkgsrc/games/doomlegacy/patches/patch-src_dstrings.c        Wed Oct 21 11:43:31 2020
@@ -1,18 +1,19 @@
-$NetBSD: patch-src_dstrings.c,v 1.1 2020/05/19 11:20:16 micha Exp $
+$NetBSD: patch-src_dstrings.c,v 1.2 2020/10/21 11:43:31 micha Exp $
 
 Print note that this is a patched version to terminal.
 
---- src/dstrings.c.orig        2020-05-15 09:47:31.000000000 +0000
+--- src/dstrings.c.orig        2020-07-07 09:01:41.000000000 +0000
 +++ src/dstrings.c
-@@ -542,6 +542,11 @@ char *text[NUMTEXT] = {
+@@ -542,6 +542,12 @@ char *text[NUMTEXT] = {
      "get a copy of the original game, call 1-800-IDGAMES or see the readme file.\n"
      "        You will not receive technical support for modified games.\n"
      "                      press enter to continue\n"
 +    "===========================================================================\n"
 +    "===========================================================================\n"
-+    "Note for pkgsrc: This version uses patches for additional features:\n"
++    "Note for pkgsrc: This version uses pkgsrc patches for additional features:\n"
 +    "- Support for extended nodes (DeeP V4 and ZDoom, Feature request #95)\n"
-+    "- Support for \"-blockmap\" command line option (create blockmap internally)\n"
++    "- Support for \"-blockmap\" command line option (create blockmap internally,\n"
++    "  Feature request #96)\n"
      "===========================================================================\n",
  
    // SHAREWARE
Index: pkgsrc/games/doomlegacy/patches/patch-src_r__defs.h
diff -u pkgsrc/games/doomlegacy/patches/patch-src_r__defs.h:1.1 pkgsrc/games/doomlegacy/patches/patch-src_r__defs.h:1.2
--- pkgsrc/games/doomlegacy/patches/patch-src_r__defs.h:1.1     Tue May 19 11:20:16 2020
+++ pkgsrc/games/doomlegacy/patches/patch-src_r__defs.h Wed Oct 21 11:43:31 2020
@@ -1,7 +1,8 @@
-$NetBSD: patch-src_r__defs.h,v 1.1 2020/05/19 11:20:16 micha Exp $
+$NetBSD: patch-src_r__defs.h,v 1.2 2020/10/21 11:43:31 micha Exp $
 
 Refer to segments and subsectors with 32-Bit values.
-Upstream feature request:
+
+Created upstream feature request:
 https://sourceforge.net/p/doomlegacy/feature-requests/95/
 
 --- src/r_defs.h.orig  2020-04-20 10:32:32.000000000 +0000

Index: pkgsrc/games/doomlegacy/patches/patch-src_p__local.h
diff -u pkgsrc/games/doomlegacy/patches/patch-src_p__local.h:1.2 pkgsrc/games/doomlegacy/patches/patch-src_p__local.h:1.3
--- pkgsrc/games/doomlegacy/patches/patch-src_p__local.h:1.2    Wed May 20 16:04:12 2020
+++ pkgsrc/games/doomlegacy/patches/patch-src_p__local.h        Wed Oct 21 11:43:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_p__local.h,v 1.2 2020/05/20 16:04:12 micha Exp $
+$NetBSD: patch-src_p__local.h,v 1.3 2020/10/21 11:43:31 micha Exp $
 
 Add support to internally create blockmap.
 https://sourceforge.net/p/doomlegacy/feature-requests/96/
Index: pkgsrc/games/doomlegacy/patches/patch-src_p__setup.c
diff -u pkgsrc/games/doomlegacy/patches/patch-src_p__setup.c:1.2 pkgsrc/games/doomlegacy/patches/patch-src_p__setup.c:1.3
--- pkgsrc/games/doomlegacy/patches/patch-src_p__setup.c:1.2    Wed May 20 16:04:12 2020
+++ pkgsrc/games/doomlegacy/patches/patch-src_p__setup.c        Wed Oct 21 11:43:31 2020
@@ -1,10 +1,9 @@
-$NetBSD: patch-src_p__setup.c,v 1.2 2020/05/20 16:04:12 micha Exp $
+$NetBSD: patch-src_p__setup.c,v 1.3 2020/10/21 11:43:31 micha Exp $
 
-Add support for DeeP and ZDoom extended nodes.
-Upstream feature request:
-https://sourceforge.net/p/doomlegacy/feature-requests/95/
+Add support for extended nodes and internal blockmap creation.
 
-Add support to internally create blockmap.
+Created upstream feature requests:
+https://sourceforge.net/p/doomlegacy/feature-requests/95/
 https://sourceforge.net/p/doomlegacy/feature-requests/96/
 
 --- src/p_setup.c.orig 2020-05-11 09:40:34.000000000 +0000
@@ -70,7 +69,7 @@ https://sourceforge.net/p/doomlegacy/fea
              for (k=0 ; k<4 ; k++)
                  no->bbox[j][k] = LE_SWAP16(mn->bbox[j][k])<<FRACBITS;
          }
-@@ -1840,6 +1860,7 @@ boolean P_SetupLevel (int      to_episod
+@@ -1851,6 +1871,7 @@ boolean P_SetupLevel (int      to_episod
      const char  *errstr;
      char  *sl_mapname = NULL;
      int   i;
@@ -78,7 +77,7 @@ https://sourceforge.net/p/doomlegacy/fea
  
      GenPrintf( (verbose? (EMSG_ver|EMSG_now) : (EMSG_console|EMSG_now)),
                 "Setup Level\n" );
-@@ -1985,18 +2006,69 @@ boolean P_SetupLevel (int      to_episod
+@@ -1999,18 +2020,69 @@ boolean P_SetupLevel (int      to_episod
          goto load_reject;
      }

Prev by Date: CVS commit: pkgsrc/devel/bison
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/bison
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index