[pkgsrc/trunk]: pkgsrc/games/doomlegacy games/doomlegacy: Update to 1.48.8

[micha <micha%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/626ed16c0773
branches:  trunk
changeset: 444310:626ed16c0773
user:      micha <micha%pkgsrc.org@localhost>
date:      Mon Jan 04 16:40:59 2021 +0000

description:
games/doomlegacy: Update to 1.48.8

Doom Legacy Changelog

1.48.8 SVN1568 (2020-12-19)

FEATURES 1.48.8

  * Sky generation has gotten a Vanilla setting. Sky drawing (software
    draw) now puts a solid texture above and below the sky, and no
    longer tiles the sky. The OpenGL sky draw has separate sky draw
    behavior.
  * The mouse2 serial support has been expanded to handle PC mice,
    MouseSystems mice, and PS/2 mice, for SDL and Win32 ports. The PC
    and MS mice have been tested. If anyone has found a way to route a
    PS/2 mouse, possibly on USB, to a serial port input, please let us
    know.

BUG FIXES 1.48.8

  * A savegame buffer overflow was fixed. An overflow prevention test
    had been misplaced. such that it could be avoided in some
    conditions. Fixes BUG 0667.
  * Cleaned out some of the accumulated cruft in sky drawing. Fixed sky
    tiling, and then made changes to prevent sky tiling.
  * Changed the software mode sky drawing to TM_picture format. This
    eliminates the line artifacts that were drawn above and below the
    sky, and restores the vertical alignment.
  * Limited the software sky drawing to the texture, so to not tile the
    sky draw. Created a skytop_flat for above the sky, and a ground_flat
    for below the sky. These are drawn when the viewed sky exceeds the
    bounds of the sky texture. For now, these flats are created as solid
    textures. Hardware draw has a separate sky draw behavior.
  * In the case of 200 or 240 sized sky textures (Heretic and Legacy
    substitutes), fixed the texture sky height so that the correct size
    TM_picture is created. Fixes BUG 0668.
  * Changed the freedoom wad names, avoiding doom wad names as that was
    conflicting with doom2 gamemode. Freedoom: "freedoom2.wad",
    "freedoom.wad", and "fdoom2.wad". Ultimate freedoom:
    "freedoom1.wad", "freedu.wad", "fdoomu.wad".
  * Fixed BUG 0670, Monsters mysteriously disappearing, moving large
    distances into the void space.
    This bug was introduced in the moonwalk patch (SVN 1540) by copying
    the opposite direction calculation code from PrBoom. This was done
    in an effort to reduce differences that might lead to bugs. It
    replaced a table lookup implementation. However, the PrBoom
    calculation must be guarded against the value DI_NODIR, which the
    table implementation could handle inherently. Without that
    protection, an olddir of DI_NODIR introduced a direction of 12 into
    the logic, which can only handle directions of 0..7, with NODIR=8.
    Several times a game that 12 value would survive long enough to get
    used, which would be expressed as a wild walk movement.
  * Improved the large blockmap handling to deal with more issues of
    blockmap overflow in the presence of zennode blockmap compression.
    It can now handle more maps of the Lost Civilization wad, although
    some other issues are still present.
  * The mouse2 support was found to be disabled and missing for the SDL
    port. It has been fixed, and expanded to handle PC mice,
    MouseSystems mice, and PS/2 mice, for SDL Linux, SDL Windows, and
    Win32 ports. Fixes BUG 0669.
  * Made LOGMESSAGES work again, which writes debugging logs. Release
    binaries do not have this code. If DoomLegacy is compiled with
    LOGMESSAGES enabled (doomdef.h file), a log.txt file will be
    produced. This is currently enabled when compiled with DEBUG.
  * Fixed the overlapped string copies detected by GCC 10.
    Fixes BUG 0671, Michael Bäuerle.
  * Reduced warnings when compiling with GCC 10. This was mostly due to
    signed char being used as an index, which may cause problems on some
    platforms. Fixes BUG 0671.

diffstat:

 games/doomlegacy/Makefile                     |   6 ++++--
 games/doomlegacy/distinfo                     |  22 +++++++++++-----------
 games/doomlegacy/patches/patch-src_p__local.h |   6 +++---
 games/doomlegacy/patches/patch-src_p__setup.c |  25 ++++++++++++++-----------
 games/doomlegacy/patches/patch-src_r__defs.h  |   2 +-
 5 files changed, 33 insertions(+), 28 deletions(-)

diffs (156 lines):

diff -r 9e1c01348d0f -r 626ed16c0773 games/doomlegacy/Makefile
--- a/games/doomlegacy/Makefile Mon Jan 04 16:39:15 2021 +0000
+++ b/games/doomlegacy/Makefile Mon Jan 04 16:40:59 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/10/21 11:43:31 micha Exp $
+# $NetBSD: Makefile,v 1.11 2021/01/04 16:40:59 micha Exp $
 
-VERS=                  1.48.6
+VERS=                  1.48.8
 PKGNAME=               doomlegacy-${VERS}
 CATEGORIES=            games
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=doomlegacy/}
@@ -60,6 +60,8 @@
 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,'
+SUBST_SED.makeopt+=    -e 's,\# ARCH=-march=native,ARCH=-march=native,'
+SUBST_SED.makeopt+=    -e 's,ARCH=-march=i686,\# ARCH=-march=native,'
 
 # Configure defaults for LEGACYWADDIR and DOOMWADDIR
 SUBST_CLASSES+=                doomdef
diff -r 9e1c01348d0f -r 626ed16c0773 games/doomlegacy/distinfo
--- a/games/doomlegacy/distinfo Mon Jan 04 16:39:15 2021 +0000
+++ b/games/doomlegacy/distinfo Mon Jan 04 16:40:59 2021 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.8 2020/10/21 11:43:31 micha Exp $
+$NetBSD: distinfo,v 1.9 2021/01/04 16:40:59 micha Exp $
 
-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 (doomlegacy_1.48.8_common.zip) = 536f387824d50208e7494547afd21a92a6ef877d
+RMD160 (doomlegacy_1.48.8_common.zip) = 7fa66010f384411972f052ecf3676ce22d43f267
+SHA512 (doomlegacy_1.48.8_common.zip) = 4b93aed03bcfd9eb0dd22f0b9231e93e63ee2cc0eee6a3a9854def384c4c290dbdb586eb8d888392c53d8a5d549718eb7b4f55cecb1c4924c03b18125876b292
+Size (doomlegacy_1.48.8_common.zip) = 1011350 bytes
+SHA1 (doomlegacy_1.48.8_source.tar.bz2) = d75a65b62ae30de21f22e112b3a87bb8035597ad
+RMD160 (doomlegacy_1.48.8_source.tar.bz2) = e5db4a6ea05ecd7678c70bcf57843bb9edc69526
+SHA512 (doomlegacy_1.48.8_source.tar.bz2) = 10dfe5ac20715b3c8ca2305f28d28bd5eada42a13a3aadad23bbf9b691e988561f26b61267816867b69e2854f86cc5c4ec876a4cb10fda157f971a4014db55ec
+Size (doomlegacy_1.48.8_source.tar.bz2) = 2451682 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) = e8a7c77f29bcf0e73f08864e932dd021e6652a3a
+SHA1 (patch-src_p__local.h) = ad6c770b95e87fb06e34ec7643e98f59d41e71f4
+SHA1 (patch-src_p__setup.c) = f478975acbc64627d4b2727fa77d1b1252ffc719
 SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543
diff -r 9e1c01348d0f -r 626ed16c0773 games/doomlegacy/patches/patch-src_p__local.h
--- a/games/doomlegacy/patches/patch-src_p__local.h     Mon Jan 04 16:39:15 2021 +0000
+++ b/games/doomlegacy/patches/patch-src_p__local.h     Mon Jan 04 16:40:59 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_p__local.h,v 1.3 2020/10/21 11:43:31 micha Exp $
+$NetBSD: patch-src_p__local.h,v 1.4 2021/01/04 16:40:59 micha Exp $
 
 Add support to internally create blockmap.
 https://sourceforge.net/p/doomlegacy/feature-requests/96/
@@ -14,6 +14,6 @@
 +// [MB] 2020-05-13: Fix comments (blockmapindex points to offset part of lump)
 +extern uint32_t*        blockmaphead;   // Big blockmap, SSNTails
 +extern uint32_t*        blockmapindex;  // offsets in blockmap are from here
- extern int              bmapwidth;
- extern int              bmapheight;     // in mapblocks
+ extern unsigned int     bmapwidth;
+ extern unsigned int     bmapheight;     // in mapblocks
  extern fixed_t          bmaporgx;
diff -r 9e1c01348d0f -r 626ed16c0773 games/doomlegacy/patches/patch-src_p__setup.c
--- a/games/doomlegacy/patches/patch-src_p__setup.c     Mon Jan 04 16:39:15 2021 +0000
+++ b/games/doomlegacy/patches/patch-src_p__setup.c     Mon Jan 04 16:40:59 2021 +0000
@@ -1,9 +1,11 @@
-$NetBSD: patch-src_p__setup.c,v 1.3 2020/10/21 11:43:31 micha Exp $
+$NetBSD: patch-src_p__setup.c,v 1.4 2021/01/04 16:40:59 micha Exp $
+
+Add support for DeeP and ZDoom extended nodes.
 
-Add support for extended nodes and internal blockmap creation.
+Created upstream feature request:
+https://sourceforge.net/p/doomlegacy/feature-requests/95/
 
-Created upstream feature requests:
-https://sourceforge.net/p/doomlegacy/feature-requests/95/
+Add support to internally create blockmap.
 https://sourceforge.net/p/doomlegacy/feature-requests/96/
 
 --- src/p_setup.c.orig 2020-05-11 09:40:34.000000000 +0000
@@ -18,15 +20,15 @@
  #include "p_local.h"
  #include "p_tick.h"
    // think
-@@ -251,14 +254,15 @@ typedef struct mapdata_s {
+@@ -253,15 +256,16 @@ typedef struct mapdata_s {
  // Created from axis aligned bounding box of the map, a rectangular array of
  // blocks of size ...
  // Used to speed up collision detection by spatial subdivision in 2D.
 +// [MB] 2020-05-13: Fix comments (blockmapindex points to offset part of lump)
  //
  // Blockmap size.
- int             bmapwidth;
- int             bmapheight;     // size in mapblocks
+ unsigned int    bmapwidth;
+ unsigned int    bmapheight;     // size in mapblocks
  
 -uint32_t *      blockmapindex;       // for large maps, wad is 16bit
 -// offsets in blockmap are from here
@@ -36,8 +38,9 @@
 +                                // (offsets in blockmap are from here)
  
  // origin of block map
+ // The bottom left corner of the most SW block.
  fixed_t         bmaporgx;
-@@ -282,6 +286,7 @@ mapthing_t  *   playerstarts[MAXPLAYERS]
+@@ -285,6 +289,7 @@ mapthing_t  *   playerstarts[MAXPLAYERS]
  
  #if 0
  // [WDJ] Checks from PrBoom.
@@ -45,7 +48,7 @@
  
  // figgi 08/21/00 -- constants and globals for glBsp support
  #define gNd2  0x32644E67
-@@ -793,7 +798,22 @@ void P_LoadNodes (int lump)
+@@ -796,7 +801,22 @@ void P_LoadNodes (int lump)
          no->dy = LE_SWAP16(mn->dy)<<FRACBITS;
          for (j=0 ; j<2 ; j++)
          {
@@ -69,7 +72,7 @@
              for (k=0 ; k<4 ; k++)
                  no->bbox[j][k] = LE_SWAP16(mn->bbox[j][k])<<FRACBITS;
          }
-@@ -1851,6 +1871,7 @@ boolean P_SetupLevel (int      to_episod
+@@ -1968,6 +1988,7 @@ boolean P_SetupLevel (int      to_episod
      const char  *errstr;
      char  *sl_mapname = NULL;
      int   i;
@@ -77,7 +80,7 @@
  
      GenPrintf( (verbose? (EMSG_ver|EMSG_now) : (EMSG_console|EMSG_now)),
                 "Setup Level\n" );
-@@ -1999,18 +2020,69 @@ boolean P_SetupLevel (int      to_episod
+@@ -2116,18 +2137,69 @@ boolean P_SetupLevel (int      to_episod
          goto load_reject;
      }
  
diff -r 9e1c01348d0f -r 626ed16c0773 games/doomlegacy/patches/patch-src_r__defs.h
--- a/games/doomlegacy/patches/patch-src_r__defs.h      Mon Jan 04 16:39:15 2021 +0000
+++ b/games/doomlegacy/patches/patch-src_r__defs.h      Mon Jan 04 16:40:59 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_r__defs.h,v 1.2 2020/10/21 11:43:31 micha Exp $
+$NetBSD: patch-src_r__defs.h,v 1.3 2021/01/04 16:40:59 micha Exp $
 
 Refer to segments and subsectors with 32-Bit values.