CVS commit: pkgsrc/games/woof

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed Apr  2 12:21:59 UTC 2025

Modified Files:
        pkgsrc/games/woof: Makefile PLIST distinfo
        pkgsrc/games/woof/patches: patch-data_CMakeLists.txt
Removed Files:
        pkgsrc/games/woof/patches: patch-src_hu__lib.c

Log Message:
games/woof: Update to 15.2.0

- Remove patch for SmartOS (code does not exist any more)
- Switch from USE_CMAKE to "devel/cmake/build.mk"
- Update PLIST and dependencies
- Build should now be reproducible

Woof! 15.2.0
============

New Features and Improvements
-----------------------------
- Dynamic resolution improvements:
  - Added 30-frame history and 15-frame cooldown period after resolution change.
  - Rename the "FPS Limiter" option to "Target FPS" to indicate that it's also
    a dynamic resolution target.
- Added saving button states in savegames (from Doom Retro).
- Added support for alternative music tracks for Final Doom introduced in
  DoomMetalVol5.wad (from Crispy Doom).
- Added vertical option for level stats and player coords widgets in SBARDEF,
  rearranged widgets in automap mode.

Bug Fixes
---------
- Fixed demo footer and file name after restart.
- Fixed evil grin getting triggered at level start (and by ID(K)FA).
- Fixed UMAPINFO Doom 1 intermission text skipping at episode end.
- Fixed rendering of voxels on top/bottom of screen (thanks to @MrAlaux).
- Fixed invulnerability option for skies defined in SKYDEFS lump.
- Fixed undefined behavior in "Linear Sky" calculation on MacOS ARM CPUs.
- Fixed some local options overriding netgame settings.

For changes in older versions see upstream release page:
<https://github.com/fabiangreffrath/woof/releases>


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/games/woof/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/games/woof/PLIST
cvs rdiff -u -r1.43 -r1.44 pkgsrc/games/woof/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/woof/patches/patch-data_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/games/woof/patches/patch-src_hu__lib.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/woof/Makefile
diff -u pkgsrc/games/woof/Makefile:1.52 pkgsrc/games/woof/Makefile:1.53
--- pkgsrc/games/woof/Makefile:1.52     Wed Feb 12 06:45:05 2025
+++ pkgsrc/games/woof/Makefile  Wed Apr  2 12:21:58 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2025/02/12 06:45:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2025/04/02 12:21:58 micha Exp $
 
-DISTNAME=      woof_14.3.0
+DISTNAME=      woof_15.2.0
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fabiangreffrath/}
 GITHUB_TAG=    ${DISTNAME}
@@ -14,15 +13,17 @@ COMMENT=    Continuation of Lee Killough's 
 LICENSE=       gnu-gpl-v2
 
 USE_CC_FEATURES=       c99
+USE_TOOLS+=            pkg-config
 
-USE_CMAKE=     yes
-USE_TOOLS+=    pkg-config
-CMAKE_CONFIGURE_ARGS+= -G "Unix Makefiles" ..
-CONFIGURE_DIRS=        build
-WRKSRC=                ${WRKDIR}/woof-${DISTNAME}
+# Use release date for reproducible build
+WOOF_BUILD_DATE=       2025-03-31
+CONFIGURE_ENV+=                BUILD_DATE=${WOOF_BUILD_DATE}
+CFLAGS+=               -DBUILD_DATE=\"${WOOF_BUILD_DATE}\"
+
+REPLACE_PYTHON+=       man/docgen
 
 # DOOMWADDIR is intentionally shared with other Doom packages
-DOOMWADDIR=    share/doom
+DOOMWADDIR=            share/doom
 
 # Add DOOMWADDIR to search path
 SUBST_CLASSES+=                waddir
@@ -40,7 +41,6 @@ SUBST_FILES.install=  ${WRKDIR}/INSTALL.p
 SUBST_SED.install=     -e 's,DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
 
 pre-configure:
-       cd ${WRKSRC}; mkdir build
        ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
 
 post-install:
@@ -53,15 +53,22 @@ post-install:
        ${MV} ${DESTDIR}${PREFIX}/share/metainfo/io.github.fabiangreffrath.woof.metainfo.xml \
                ${DESTDIR}${PREFIX}/share/metainfo/woof.metainfo.xml
 
+.include "../../devel/cmake/build.mk"
+
 BUILDLINK_API_DEPENDS.fluidsynth+=     fluidsynth>=2.2.0
 .include "../../audio/fluidsynth/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libebur128+=     libebur128>=1.2.0
+.include "../../audio/libebur128/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsndfile+=     libsndfile>=1.1.0
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libxmp/buildlink3.mk"
+BUILDLINK_API_DEPENDS.openal-soft+=    openal-soft>=1.22.0
 .include "../../audio/openal-soft/buildlink3.mk"
 BUILDLINK_API_DEPENDS.SDL2+=           SDL2>=2.0.18
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/yyjson/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../net/SDL2_net/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 

Index: pkgsrc/games/woof/PLIST
diff -u pkgsrc/games/woof/PLIST:1.15 pkgsrc/games/woof/PLIST:1.16
--- pkgsrc/games/woof/PLIST:1.15        Wed Apr 17 16:58:25 2024
+++ pkgsrc/games/woof/PLIST     Wed Apr  2 12:21:58 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2024/04/17 16:58:25 micha Exp $
+@comment $NetBSD: PLIST,v 1.16 2025/04/02 12:21:58 micha Exp $
 bin/woof
 bin/woof-setup
 man/man6/woof-setup.6
@@ -34,28 +34,9 @@ share/doc/woof/mbf.txt
 share/doc/woof/mbfedit.txt
 share/doc/woof/mbffaq.txt
 share/doc/woof/options.txt
-share/doc/woof/woofhud.lmp
-share/doc/woof/woofhud.md
 share/icons/hicolor/128x128/apps/woof-setup.png
 share/icons/hicolor/128x128/apps/woof.png
 share/metainfo/woof.metainfo.xml
-share/woof/autoload/betalevl.wad/umapdef.lmp
-share/woof/autoload/chex.wad/brghtmps.lmp
-share/woof/autoload/chex.wad/chex.deh
-share/woof/autoload/chex.wad/extchex.deh
-share/woof/autoload/chex.wad/umapdef.lmp
-share/woof/autoload/chex2.wad/brghtmps.lmp
-share/woof/autoload/doom-all/brghtmps.lmp
-share/woof/autoload/e1m4b.wad/umapdef.lmp
-share/woof/autoload/e1m8b.wad/umapdef.lmp
-share/woof/autoload/hacx.wad/bloodcolor.deh
-share/woof/autoload/hacx.wad/brghtmps.lmp
-share/woof/autoload/masterlevels.wad/umapdef.lmp
-share/woof/autoload/nerve.wad/umapdef.lmp
-share/woof/autoload/rekkr.wad/bloodcolor.deh
-share/woof/autoload/rekkrsa.wad/bloodcolor.deh
-share/woof/autoload/rekkrsl.wad/bloodcolor.deh
-share/woof/autoload/sigil_v1_21.wad/umapdef.lmp
-share/woof/autoload/tnt.wad/brghtmps.lmp
 share/woof/soundfonts/TimGM6mb.sf2
 share/woof/soundfonts/copyright
+share/woof/woof.pk3

Index: pkgsrc/games/woof/distinfo
diff -u pkgsrc/games/woof/distinfo:1.43 pkgsrc/games/woof/distinfo:1.44
--- pkgsrc/games/woof/distinfo:1.43     Wed Apr 17 16:58:25 2024
+++ pkgsrc/games/woof/distinfo  Wed Apr  2 12:21:58 2025
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.43 2024/04/17 16:58:25 micha Exp $
+$NetBSD: distinfo,v 1.44 2025/04/02 12:21:58 micha Exp $
 
-BLAKE2s (woof_14.3.0.tar.gz) = e1cbde6ca27012a6cc3278658baaf8bb111410b1410e5124aded0bc089c3908c
-SHA512 (woof_14.3.0.tar.gz) = 0f8bf67a02aa826cb13b70b10da50cb5205ad455a9a33f1f56c41fe12f7b87518f31fced70ce8389d3c1afe84c8ac273aa91ac5bf388325092fcb51529ae0f94
-Size (woof_14.3.0.tar.gz) = 7379087 bytes
-SHA1 (patch-data_CMakeLists.txt) = 6f08692862a6c765d2f04228420b351bbd256e83
+BLAKE2s (woof_15.2.0.tar.gz) = 7ea0ec56288a6c5e7a619eaafde231004f92b1b248c3f05a7eb7cf3cc49fa764
+SHA512 (woof_15.2.0.tar.gz) = 30b7723bf0ba8f381ed3b3e63282acf57cb00a4f8c616dacee37549ec4ee09e4e487028657f4bf20d3c150f860805be79e10b61f1757a192292db1febb4b4045
+Size (woof_15.2.0.tar.gz) = 7569940 bytes
+SHA1 (patch-data_CMakeLists.txt) = 9fdbd587b364b0af1e58479451832154a46c6c35
 SHA1 (patch-man_CMakeLists.txt) = d5b2b30eb8a7efeddad29699c47801bc1c865403
 SHA1 (patch-man_WoofInstall.cmake.in) = fbbb75d201d53af8d68eeb29956d793eda465ffb
 SHA1 (patch-src_d__iwad.c) = 88e02974ce6a32be07ca035856c85ebdf97b3ab0
-SHA1 (patch-src_hu__lib.c) = 00e566dcd879b6874a93f2482129e2cc85a29b83

Index: pkgsrc/games/woof/patches/patch-data_CMakeLists.txt
diff -u pkgsrc/games/woof/patches/patch-data_CMakeLists.txt:1.6 pkgsrc/games/woof/patches/patch-data_CMakeLists.txt:1.7
--- pkgsrc/games/woof/patches/patch-data_CMakeLists.txt:1.6     Wed Apr 17 16:58:25 2024
+++ pkgsrc/games/woof/patches/patch-data_CMakeLists.txt Wed Apr  2 12:21:58 2025
@@ -1,10 +1,16 @@
-$NetBSD: patch-data_CMakeLists.txt,v 1.6 2024/04/17 16:58:25 micha Exp $
+$NetBSD: patch-data_CMakeLists.txt,v 1.7 2025/04/02 12:21:58 micha Exp $
 
+Use release date for reproducible build.
 Treat macOS as Unix.
 
---- data/CMakeLists.txt.orig   2024-03-15 07:15:40.000000000 +0000
+--- data/CMakeLists.txt.orig   2025-01-31 07:30:37.000000000 +0000
 +++ data/CMakeLists.txt
-@@ -4,7 +4,7 @@ configure_file(io.github.fabiangreffrath
+@@ -1,10 +1,11 @@
+-string(TIMESTAMP PROJECT_DATE "%Y-%m-%d" UTC)
++#string(TIMESTAMP PROJECT_DATE "%Y-%m-%d" UTC)
++set(PROJECT_DATE $ENV{BUILD_DATE})
+ 
+ configure_file(io.github.fabiangreffrath.woof.metainfo.in
                 io.github.fabiangreffrath.woof.metainfo.xml
                 ESCAPE_QUOTES @ONLY)