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: Mon, 17 Jan 2022 15:10:15 +0000

Module Name:    pkgsrc
Committed By:   micha
Date:           Mon Jan 17 15:10:15 UTC 2022

Modified Files:
        pkgsrc/games/doomlegacy: Makefile PLIST distinfo
Removed Files:
        pkgsrc/games/doomlegacy/files: p_blockmap.c p_blockmap.h p_extnodes.c
            p_extnodes.h
        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.10

FEATURES 1.48.10

  • Support for DeepBSP V4 extended nodes (based on crispy doom). Also ZDoom
    extended nodes (based on code from woof 1.2.0), supporting uncompressed,
    and compressed nodes (when zlib is present). Allows playing several wads,
    such as Avactor, and Lost Civilization, that are otherwise playable by
    DoomLegacy, but use extended nodes for several of their maps. Code provided
    by Michael Bäuerle (FR_0095).
  • Added the blockmap generation code provided by Michael Bäuerle (FR_0096).
    Some of the code is borrowed from crispy doom, altered a bit by Michael
    Bäuerle to suit DoomLegacy, and then totally mangled by WJ.
    A blockmap control has been put into the menu.
      □ Vanilla: Load the blockmap, preserves blockmap tricks.
      □ Large: On large blockmaps (error prone), Generate the blockmap instead.
      □ Generate: Always Generate a blockmap.
      □ Auto: Try to Load the blockmap, upon significant errors then Generate a
        blockmap.
  • The hardware sky draw (OpenGL, etc.) now uses the extended textures. The
    scaling and alignment of the sky in hardware draw has been made consistent
    with software draw. The sky movement from head turning is greatly reduced.
    There is still some horizontal wander.

    The hardware sky still does not change when the player is Invulnerable. The
    hardware draw sky does not support the necessary multiple colormaps right
    now.
  • A dehacked thing translation command line switch, -dehthing. This selects
    the dehacked translation for thing numbers in the range 138 to 150. This
    overrides the Automatic translation detection.
      □ legacy : DoomLegacy untranslated
      □ boom : translate things according to Boom
      □ prboom : Boom and Beta things
      □ ee : Eternity Engine things
  • A separate supplementary wad is provided that has dog sprites and sounds.
    Specified before a wad, it provides default dog sprites and sounds.
    Specified after a wad, it replaces the dog sprites in a wad.
  • More ports now allow a second mouse. This allows using PC, mousesystems,
    and PS2 type mice. The ports that have the second mouse support are SDL,
    WIN32, and X11.
  • The Linux X11 port got a total rewrite of sfx sound. It previously was only
    supporting OSS sound, and ESD sound. Can now select between OSS, ALSA, ESD,
    PulseAudio, and JACK sound devices using the sound menu. For music, can now
    select between MIDI, TiMidity, FluidSynth, external MIDI, FM_Synth, and
    AWE32_Synth, using the sound menu. This depends upon which support got
    compiled into the program, as selected in the make_options file.

    Many of the options are untested. The last two Synth options depend on
    older specific sound cards, and will not be included in released binaries.
    I have not managed to get a FluidSynth installation to work, I don't have
    an external MIDI device to test with, and JACK wants to take over the
    entire sound system.

BUG FIXES 1.48.10

  • Added failure detection for setting drawmode from config file. If the
    config file drawmode fails then use a window at native bpp. This used to
    fail ungracefully.
  • Improved Gcc10 compilation, eliminating most of the nuisance messages.
    Fixed usages of snprintf, and strncpy. Fixed bug 0671.
  • The Clang compiler caught some mistakes. The old code probably did work.
    Fixed bug 0672.
  • Fixed where the program is stuck in client mode. Once having tried to
    connect as client, the program would not go back to server mode, not even
    when starting a netgame as server. A symptom was the player wait count
    being initialized to 99. Fixed to set server mode. Fixes bug 0677.
  • Players were kicked during netgame when their blood splat setting was
    different than the server. As it was desireable to allow players to turn
    off blood splats independently of the server setting, this was fixed by
    making the off code call P_Random appropriately. This also fixes a demo
    consistency error. Fixes bug 0678.
  • Changed the netgame repair function to correctly report differences in
    random number settings for the server. The message syntax was only
    appropriate for the client, displaying reversed server/client values at the
    server.
  • Adding extended nodes fixed several bugs. Fixes bug #657, due to DeepBSP V4
    extended nodes. Fixes the segfault in Eviternity.wad Map15 and Map32, due
    to use of uncompressed ZDoom extended nodes.
  • Fixed dehacked code to read Avactor.wad dehacked lump. Increased the
    dehacked buffer length to 1028. Made all the string comparisons caseless.
    Adopted some logic from PrBoom and Eternity regarding exiting sections on a
    blank line. Detect "//" lines as comments.
  • Fixed the hardware draw to clip lights at 0..255. Some wad editors put in a
    default light value of 256. This fixes some wads, like Avactor.wad, which
    has light values of 256 for some sectors. These would show up as black
    sectors. Most ports allow the light field to exceed 255, allowing some
    lighting tricks (that few wads take advantage of).
  • In Avactor.wad, there are an excessive number of BSP partition lines that
    miss the subsector. In this case the hardware draw BSP must determine if
    the subsector poly is to the right, or to the left of the divide line. This
    must match the BSP partitioning, as those poly will be assigned to the
    front sector, and back sector. Sometimes it was testing a vertex on the
    divline, leading to the poly being assigned to the wrong subsector. This
    fixes a missing floor in Avactor.wad (Map04, sector 1757).
  • Fixed some bad subsector draws for hardware-draw in Avactor.wad (Map05
    sector 1502). These were using the wrong sector to draw the subsector. For
    the polygons that do not have a linedef as a side, there must be a search
    of all linedefs to find one that indentifies the sector that this subsector
    is within. The test needed to be more robust for large maps.
  • Lost Civilization uses some masked textures on upper textures and single
    sided walls. This is not entirely valid usage, but it happens. The software
    render draws black in the missing portions of the texture. With hardware
    render, OpenGL, this shows sky through the wall. Fixed the hardware render
    to also draw black in this usage.
  • Fixed the menu selected extra dogs, to be spawned using the correct type
    code. This fix was revised three times, as more problems with dehacked dogs
    arose. Fixes bug 0681.
  • Fixed the rocket in Valiant.wad. It uses dehacked thing numbers from Beta
    versions, that are valid in PrBoom, but in Doom Legacy they match thing
    numbers for Dogs, smoke, and other Legacy specific things.

    Implemented dehacked detection that translates these to more appropriate
    DoomLegacy things. This affects dehacked things in Lost Civilization,
    Avactor, Valiant, and especially antaxyz.
  • Always include the missing sprite detect, from Debug. Often the dog sprite
    is missing from the wad.
  • Made Voodoo card support optional. The base code is no longer tied to
    support for Glide.
  • Fix Load savegame menu controls to allow ESCAPE from the Load savegame
    after changing to another directory.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/doomlegacy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/doomlegacy/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/doomlegacy/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/games/doomlegacy/files/p_blockmap.c \
    pkgsrc/games/doomlegacy/files/p_blockmap.h \
    pkgsrc/games/doomlegacy/files/p_extnodes.c \
    pkgsrc/games/doomlegacy/files/p_extnodes.h
cvs rdiff -u -r1.4 -r0 pkgsrc/games/doomlegacy/patches/patch-src_Makefile \
    pkgsrc/games/doomlegacy/patches/patch-src_p__local.h \
    pkgsrc/games/doomlegacy/patches/patch-src_p__setup.c
cvs rdiff -u -r1.2 -r0 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
cvs rdiff -u -r1.3 -r0 pkgsrc/games/doomlegacy/patches/patch-src_r__defs.h

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.12 pkgsrc/games/doomlegacy/Makefile:1.13
--- pkgsrc/games/doomlegacy/Makefile:1.12       Mon Jan 18 09:41:07 2021
+++ pkgsrc/games/doomlegacy/Makefile    Mon Jan 17 15:10:15 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2021/01/18 09:41:07 micha Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/17 15:10:15 micha Exp $
 
-VERS=                  1.48.8
+VERS=                  1.48.10
 PKGNAME=               doomlegacy-${VERS}
-PKGREVISION=           1
 CATEGORIES=            games
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=doomlegacy/}
-DISTNAME=              ${PKGNAME_NOREV:S/-/_/}_source
+DISTNAME=              ${PKGNAME_NOREV:S/-/_/}_source_1617
 DISTFILES=             ${DEFAULT_DISTFILES} doomlegacy_${VERS}_common.zip
 EXTRACT_SUFX=          .tar.bz2
 
@@ -49,10 +48,12 @@ CFLAGS+=            -D__BIG_ENDIAN__
 CFLAGS+=               -DHAVE_ZLIB
 LDFLAGS+=              -lz
 
+# No longer matches automatically since SVN revision was appended to distfile
+WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV:S/-/_/}_source
+
 # DOOMWADDIR is intentionally shared with other Doom packages
 DOOMWADDIR=            share/doom
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man6 share/doc/doomlegacy ${DOOMWADDIR}
-
 # Honor environment
 SUBST_CLASSES+=                makeopt
 SUBST_STAGE.makeopt=   do-configure
@@ -82,10 +83,6 @@ pre-configure:
        ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
        ${CP} ${FILESDIR}/doomlegacy.sh ${WRKDIR}
        ${CP} ${FILESDIR}/doomlegacy.6.in ${WRKDIR}
-       ${CP} ${FILESDIR}/p_blockmap.c ${WRKSRC}/src
-       ${CP} ${FILESDIR}/p_blockmap.h ${WRKSRC}/src
-       ${CP} ${FILESDIR}/p_extnodes.c ${WRKSRC}/src
-       ${CP} ${FILESDIR}/p_extnodes.h ${WRKSRC}/src
        cd ${WRKSRC} && ${CP} make_options_nix make_options
 
 # Process start script and manpage templates
@@ -104,6 +101,8 @@ do-install:
                ${DESTDIR}${PREFIX}/bin/doomlegacy.bin
        ${INSTALL_SCRIPT} ${WRKDIR}/doomlegacy                          \
                ${DESTDIR}${PREFIX}/bin/doomlegacy
+       ${INSTALL_DATA} ${WRKDIR}/doomlegacy_${VERS}/dogs.wad           \
+               ${DESTDIR}${PREFIX}/${DOOMWADDIR}/dogs.wad
        ${INSTALL_DATA} ${WRKDIR}/doomlegacy_${VERS}/legacy.wad         \
                ${DESTDIR}${PREFIX}/${DOOMWADDIR}/legacy.wad
        cd ${WRKSRC} &&                                                 \

Index: pkgsrc/games/doomlegacy/PLIST
diff -u pkgsrc/games/doomlegacy/PLIST:1.2 pkgsrc/games/doomlegacy/PLIST:1.3
--- pkgsrc/games/doomlegacy/PLIST:1.2   Tue May 19 11:20:16 2020
+++ pkgsrc/games/doomlegacy/PLIST       Mon Jan 17 15:10:15 2022
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2020/05/19 11:20:16 micha Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/01/17 15:10:15 micha Exp $
 bin/doomlegacy
 bin/doomlegacy.bin
 man/man6/doomlegacy.6
 share/doc/doomlegacy/INSTALL.pkgsrc
 share/doc/doomlegacy/legacy.css
 share/doc/doomlegacy/whatsnew.html
+share/doom/dogs.wad
 share/doom/legacy.wad

Index: pkgsrc/games/doomlegacy/distinfo
diff -u pkgsrc/games/doomlegacy/distinfo:1.11 pkgsrc/games/doomlegacy/distinfo:1.12
--- pkgsrc/games/doomlegacy/distinfo:1.11       Tue Oct 26 10:43:54 2021
+++ pkgsrc/games/doomlegacy/distinfo    Mon Jan 17 15:10:15 2022
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:43:54 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/01/17 15:10:15 micha Exp $
 
-BLAKE2s (doomlegacy_1.48.8_common.zip) = b9ed06a96b64735666335d1c9b16c8053f8f7498298f5b30d46a005474e16a3a
-SHA512 (doomlegacy_1.48.8_common.zip) = 4b93aed03bcfd9eb0dd22f0b9231e93e63ee2cc0eee6a3a9854def384c4c290dbdb586eb8d888392c53d8a5d549718eb7b4f55cecb1c4924c03b18125876b292
-Size (doomlegacy_1.48.8_common.zip) = 1011350 bytes
-BLAKE2s (doomlegacy_1.48.8_source.tar.bz2) = fed19ed08990f4b6acc384504ce23216723a5c525bc8a051cfb172e3e09c3232
-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) = ad6c770b95e87fb06e34ec7643e98f59d41e71f4
-SHA1 (patch-src_p__setup.c) = f478975acbc64627d4b2727fa77d1b1252ffc719
-SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543
+BLAKE2s (doomlegacy_1.48.10_common.zip) = e61a5d26d9e160cbe35b6fbf75433155567f914a1d6d636ea98f1c72ed2bc7d3
+SHA512 (doomlegacy_1.48.10_common.zip) = f319420660fe3b25458356d6818162b1ccabb1fbe549745ea1841d8f5b328904bbf1e298f969e8bedd9e071f274a77aedbe83a610c34367bdc2e162a7ad77701
+Size (doomlegacy_1.48.10_common.zip) = 1050867 bytes
+BLAKE2s (doomlegacy_1.48.10_source_1617.tar.bz2) = 603834f0062b71ad3cb05a10604a8448a4e5d22e4cc9d3c3b46e61f9b1ce9160
+SHA512 (doomlegacy_1.48.10_source_1617.tar.bz2) = 3dd13443218623ec0d512f8f59e1f308216b53a832c50438d0f6cdbe06ca06f2c213a3b2b7b2ca49d4dc71d73330374d35b00d77647023d99a8940a35e72efde
+Size (doomlegacy_1.48.10_source_1617.tar.bz2) = 2572260 bytes

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

Home | Main Index | Thread Index | Old Index