pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/doomlegacy
Module Name: pkgsrc
Committed By: micha
Date: Mon Dec 19 11:53:59 UTC 2022
Modified Files:
pkgsrc/games/doomlegacy: Makefile distinfo
pkgsrc/games/doomlegacy/files: doomlegacy.6.in
Log Message:
games/doomlegacy: Update to 1.48.12
Updated man page for pkgsrc.
Disabled SVN usage for build.
FEATURES 1.48.12
* Added SDL2 support, as a compile option. This provides video, sound, and
keyboard alterations for the SDL2 library calls.
The source code still supports SDL1. This supports target machines that are
not supported by SDL2. At this point, for some things like MIDI music, we
have not yet found optimal SDL2 solutions.
* Add a control to select music type, with an automatic mode. Add automatic
music type selection and playing. This works better with SDL1 than SDL2.
SDL2 will always use Fluidsynth for MIDI. It even builds a copy of
Fluidsynth into SDL2.
* Added controls to adjust monster health, health pickup, armor pickup, and
ammo pickup. This allows adjusting play of an overly difficult map such as
one with multiple cyberdemons, such as when you have only three players on
your coop team and one is a newbie, or just adjusting a map weak in ammo.
The user can also increase difficulty when feeling cocky.
BUG FIXES 1.48.12
* Mingw32 does not have strcasestr. Had to write one for Mingw32 and Watcom.
* Fixed a segfault in biowar.wad Map08 with OpenGL. It would segfault when a
texture being drawn in cache, had one patch extending lower than the
texture bottom. The cache write now tests against the cache limits, and not
the source.
* Fixed X11 musserver quitting whenever trying any device other than TiMidity.
Made the FluidSynth MIDI detection work. Included the DEBUG options.
Fixed a HAVE_ZLIB test that would error when compiling for X11.
* Fixed where Player picks up clip when already has full ammo. A bug was
introduced in patch w105_22_playermsg, svn 1225. This resulted in the clip
being used up, even when the player already has max ammo.
* Rewrote the flat animation, to load all flats of an animation. A long time
ago the flats were optimized by only loading the flats that appeared in the
level map. This is incompatible with flat animation, as the animation
requires flats that may not have appeared otherwise. This results in the
animation not working for some flats that should be animated (doom2 map17).
Updates the flat animation again when levelflats has moved during the
update. Removed the old animation code that checked all flats in the wad.
* Fix the existing MIDI, MP3, and OGG music playing. Fix MP3 music playing,
so that it does not try to play it as MUS. Detect the music type upon
replay too.
* VISPLANE_DYNAMIC_COVER. Replaced arrays of [MAXVIDWIDTH] in visplane with
dynamically allocated arrays of the current video width. This reduces each
visplane from 6464 bytes to 3268 bytes. This will allow MAXVIDWIDTH to be
increased, to allow larger screen sizes, without affecting the memory usage
for everybody.
* Transition to new software renderer, to fix sprites that are drawn in
conflict with 3d floors.
* Removed drawnodes code. Sprites could not be sorted into the drawnodes to
satify all the conflicts that occur. Instead of trying to save all the
sprite conflicts in one sprite structure (like a drawnode), the sprite is
split and clipped until all parts of it have been drawn (or masked).
* Replaced openings code (from PrBoom) with pool16 code, which does not have
to adjust existing pointers when expanding the pool.
* Fix to sprite draw, so that flipped sprites drawing is independent of the
sprite x1 position. This fixes draw errors of some flipped sprites.
* Fixed the OpenGL dynamic lights, where wall textures would distort when a
fireball or rocket would pass by. This affected walls under a 3d floor,
when it experienced a dynamic light.
* Fixed a zip seek error that only affected some zip files. Opening a zip
archive when there already was a zip file open, required that the zip file
be closed, or its file position will be different than our recorded
position. This fixes bug when loading cyberarena3.zip.
* Protect against NULL line ptr in some light functions. This mitigates a
segfault in cyberarena3.zip, that was not reproducible.
* Fixed compile errors in dynamic load of zlib, and libzip. Detect version
of libzip from header file. Remove version of libzip from make_options.
* Add SDL_DIR to the compile make_options, because compile on win/mingw32
cannot reliabily find SDL/include otherwise, and it is better than having
end users editing the Makefile. SDL installs with sdl-config are not
affected, and most users do not need to specify it.
* Fixed the new SDL sound code to compile with SDL Mixer 1.2.8, SDL Mixer
1.2.10, SDL Mixer 1.2.12, and SDL2 Mixer. This is detected at compile.
The SDL Mixer 1.2.8 does NOT have MIX_INIT, but the SDL Mixer 1.2.10 does,
and SDL2 does too. The MIX_INIT provides some device detection and
reporting to the user what was found.
* Still supports compiling for SDL Mixer older than 1.2.8, but those do not
have RWOPS, and thus music playing with that Mixer will then use the
hard-drive. This is detected and determined at compile-time, and running
with a newer SDL Mixer will not affect that compile decision.
* The user must have a compatible SDL Mixer installed (same or better).
Newer SDL installs have bug fixes (especially on win), and may be
customized to the users machine, so this is up to the user.
* Changes to support compiling on Mac OS X (Darwin). Uses App folder.
Based on support from Gibbon.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/doomlegacy/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/doomlegacy/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/doomlegacy/files/doomlegacy.6.in
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.14 pkgsrc/games/doomlegacy/Makefile:1.15
--- pkgsrc/games/doomlegacy/Makefile:1.14 Mon Nov 21 18:20:41 2022
+++ pkgsrc/games/doomlegacy/Makefile Mon Dec 19 11:53:59 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2022/11/21 18:20:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2022/12/19 11:53:59 micha Exp $
-VERS= 1.48.10
+VERS= 1.48.12
PKGNAME= doomlegacy-${VERS}
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=doomlegacy/}
-DISTNAME= ${PKGNAME_NOREV:S/-/_/}_source_1617
+DISTNAME= ${PKGNAME_NOREV:S/-/_/}_source
DISTFILES= ${DEFAULT_DISTFILES} doomlegacy_${VERS}_common.zip
EXTRACT_SUFX= .tar.bz2
@@ -44,18 +44,16 @@ LDFLAGS.SunOS+= -lresolv -lsocket -lnsl
CFLAGS+= -D__BIG_ENDIAN__
.endif
-# Required by extended node patch for ZDoom compressed node format
+# Required for compressed ZDoom extended node format ("ZNOD" signature)
CFLAGS+= -DHAVE_ZLIB
LDFLAGS+= -lz
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--warn-common
-# 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
@@ -74,6 +72,13 @@ SUBST_FILES.doomdef= src/doomdef.h
SUBST_SED.doomdef= -e 's,LEGACYWADDIR "/usr/local/share/games/doomlegacy",LEGACYWADDIR "${PREFIX}/${DOOMWADDIR}",g'
SUBST_SED.doomdef+= -e 's,DEFWADS01 "~/games/doomlegacy/wads",DEFWADS01 "${PREFIX}/${DOOMWADDIR}",'
+# Disable SVN usage for build
+SUBST_CLASSES+= svn
+SUBST_STAGE.svn= do-configure
+SUBST_MESSAGE.svn= Disable SVN usage ...
+SUBST_FILES.svn= Makefile src/Makefile
+SUBST_SED.svn= -e 's,SVN_ENABLE=1,,g'
+
# Process INSTALL.pkgsrc
SUBST_CLASSES+= install
SUBST_STAGE.install= do-configure
@@ -103,9 +108,9 @@ do-install:
${DESTDIR}${PREFIX}/bin/doomlegacy.bin
${INSTALL_SCRIPT} ${WRKDIR}/doomlegacy \
${DESTDIR}${PREFIX}/bin/doomlegacy
- ${INSTALL_DATA} ${WRKDIR}/doomlegacy_${VERS}/dogs.wad \
+ ${INSTALL_DATA} ${WRKDIR}/doomlegacy_${VERS}_common/dogs.wad \
${DESTDIR}${PREFIX}/${DOOMWADDIR}/dogs.wad
- ${INSTALL_DATA} ${WRKDIR}/doomlegacy_${VERS}/legacy.wad \
+ ${INSTALL_DATA} ${WRKDIR}/doomlegacy_${VERS}_common/legacy.wad \
${DESTDIR}${PREFIX}/${DOOMWADDIR}/legacy.wad
cd ${WRKSRC} && \
${INSTALL_DATA} docs/legacy.css docs/whatsnew.html \
Index: pkgsrc/games/doomlegacy/distinfo
diff -u pkgsrc/games/doomlegacy/distinfo:1.12 pkgsrc/games/doomlegacy/distinfo:1.13
--- pkgsrc/games/doomlegacy/distinfo:1.12 Mon Jan 17 15:10:15 2022
+++ pkgsrc/games/doomlegacy/distinfo Mon Dec 19 11:53:59 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2022/01/17 15:10:15 micha Exp $
+$NetBSD: distinfo,v 1.13 2022/12/19 11:53:59 micha Exp $
-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
+BLAKE2s (doomlegacy_1.48.12_common.zip) = de8830301f433bc091804e8eaa0452fc574b99bc1d7e0021a71ba81aa6d90b76
+SHA512 (doomlegacy_1.48.12_common.zip) = 955dd60058a4676c5d16b8058754ed9a5e33fe36d7605ed09518ce7c8c675ca6345f793db40f0328e8c78bfbe707880970f442b3a0c355c507ae7cf8a5f908be
+Size (doomlegacy_1.48.12_common.zip) = 1055689 bytes
+BLAKE2s (doomlegacy_1.48.12_source.tar.bz2) = 6e874de37d08bd0d43ec0fc984f2b6867b5d9e0fac191b9d84377ea768d81aea
+SHA512 (doomlegacy_1.48.12_source.tar.bz2) = ae098a76d2bbcf0f7c050ca95f171e1b5abdda7917aa2099d83b6dae28ef7c42c1e65a9d87f311fd0d313ffedba8924970006f97ee5eda802d8096bbb151208a
+Size (doomlegacy_1.48.12_source.tar.bz2) = 2572064 bytes
Index: pkgsrc/games/doomlegacy/files/doomlegacy.6.in
diff -u pkgsrc/games/doomlegacy/files/doomlegacy.6.in:1.2 pkgsrc/games/doomlegacy/files/doomlegacy.6.in:1.3
--- pkgsrc/games/doomlegacy/files/doomlegacy.6.in:1.2 Wed Oct 21 11:43:31 2020
+++ pkgsrc/games/doomlegacy/files/doomlegacy.6.in Mon Dec 19 11:53:59 2022
@@ -1,10 +1,10 @@
.\"=============================================================================
.\" Header
.\"
-.\" Copyright (c) 2019-2020 by Michael Baeuerle.
+.\" Copyright (c) 2019-2022 by Michael Baeuerle.
.\" License: GNU Free Documentation License (GFDL)
.\"
-.TH $NAME 6 2020-05-14 Unix "$NAME $VERSION manual"
+.TH $NAME 6 2022-12-19 Unix "$NAME $VERSION manual"
.\"
.\"
.\"=============================================================================
@@ -82,20 +82,13 @@ Set the configfile to use.
.br
Default: config.cfg
.TP
-.BI -blockmap
-Ignore BLOCKMAP lump in WAD file and create a new blockmap internally.
-.PP
-.RS 25
-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]
-.RE
-.TP 25
.BI -deh " file [file ...]
Load one or more DEH (DeHackEd) files or BEX files, which can change monster
abilities and game text.
.TP
+.BI -dehthing " name
+Supported DEH translations: legacy, boom, prboom, ee.
+.TP
.BI -file " file [file ...]
Set PWAD (Patch WAD) files to use.
.TP
Home |
Main Index |
Thread Index |
Old Index