Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 98E8084EAA for ; Wed, 7 Jun 2023 15:58:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id pXQnGlH0D4rp for ; Wed, 7 Jun 2023 15:58:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EB90E84EA4 for ; Wed, 7 Jun 2023 15:58:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1F06DFA89; Wed, 7 Jun 2023 15:58:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168615352777490" MIME-Version: 1.0 Date: Wed, 7 Jun 2023 15:58:47 +0000 From: "Michael Baeuerle" Subject: CVS commit: pkgsrc/games/woof To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: micha@netbsd.org X-Mailer: log_accum Message-Id: <20230607155847.1F06DFA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168615352777490 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: micha Date: Wed Jun 7 15:58:47 UTC 2023 Modified Files: pkgsrc/games/woof: Makefile PLIST distinfo Added Files: pkgsrc/games/woof/patches: patch-data_CMakeLists.txt patch-man_WoofInstall.cmake.in Log Message: games/woof: Update to 11.1.4 Woof! 11.1.4 ============ Bug Fixes --------- - more fixes for DSDHacked sprites and sounds. Woof! 11.1.3 ============ Bug Fixes --------- - more fixes for DSDHacked sprites and sounds. Woof! 11.1.2 ============ New Features and Improvements ----------------------------- - woofhud: implement centered widgets, avoid collisions with left/right aligned widgets. Bug Fixes --------- - memio: init reset_eof field. - fix automap overlay reset. - fix DSDHacked crash. - winmidi: prevent hanging notes when pausing game (@ceski-1). - woofhud: avoid collisions between very long left/right aligned widgets. - make cheat restrictions consistent for menu and player input. Thanks @MrAlaux for reporting most of these bugs! Woof! 11.1.1 ============ New Features and Improvements ----------------------------- - winmidi: Sync with Chocolate Doom (@ceski-1). Bug Fixes --------- - Fix setting EOF in memio, this bug broke most DEH lumps. - Do not disable Widescreen menu item without Aspect Ratio Correction anymore (thanks @MrAlaux). - Set display resolution when toggling Exclusive Fullscreen. Woof! 11.1.0 ============ New Features and Improvements ----------------------------- - Allow bound keys to be unbound in menus by pressing the same key. - Implementation of the Native MIDI module for macOS (fixed regression after removing SDL_Mixer). - Add -dumptables command line option to export generated translation tables to PWAD. - Windows Native MIDI improvements (@ceski-1): - Fix EMIDI global looping. - Add MIDI compatibility levels. winmm_complevel config option: 0: Vanilla (Emulates DMX MPU-401 mode) 1: Standard (Emulates MS GS Synth) (Default) 2: Full (Send everything to device, including SysEx) - Distinguish exit with message on error and on success. Bug Fixes --------- - Fix memory issues in dehacked parser found with ASan. - Fix "Smooth pixel scaling" inconsistencies (now it should match Crispy Doom). - More robust fallback logic for music modules (@joanbm). - Always print player coords if automap is inactive. - Eat key if cheat found (e.g. don't switch weapons when typing IDCLEV11). - Resetting the MUSINFO track after changing the level. - Add initialization checks to music modules. Fixed crash if sound device not found (thanks to @joanbm). - Fix initialization with invalid video_display setting (@joanbm). Woof! 11.0.0 ============ New Features and Improvements ----------------------------- - HUD updates. - Introduce new WOOFHUD lump with ability to tweak widgets positions. See the woofhud.lmp example in docs/ and documentation in the wiki. - The three-line level stats and player coords widgets have been consolidated into single lines, the FPS counter is now a separate widget. - Ability to choose standard Doom font for widgets. - Smooth Health/Armor count (@MrAlaux). - HUD font patches updates (@liPillON). - Switch to OpenAl Soft for sound mixing. - Massive improvements to sound mixing quality. Fixes issues with sound "clicking" (first room of DBP25.wad), sound overload (Revenants scream) and others. - Use libsndfile for SFX and music files loading. Support for a lot of WAV formats, Ogg, FLAC, MP3, Opus and others. - Use libxmp for tracker music. - Use a linear resampler and simple 2D panning to not differ too much from vanilla sound. - New video options in General menu: - Add framerate limiting (@mikeday0). - Exclusive fullscreen mode. Activated only when normal fullscreen mode is enabled. - "Smooth pixel scaling" from Crispy Doom. - Make mouse settings exactly the same as in Crispy Doom. Add mouse acceleration options to the General menu. - Support BRGHTMPS lump from Doom Retro. - Format extension with the ability to set SPRITE, FLAT and STATE brightmaps. - De hardcode in-engine brightmaps. See brghtmps.lmp files in autoload/ directory. - Generate color translation tables. - Improve readability and colors of custom fonts in menus and HUD. - Always draw demo progress bar with the lightest and darkest color available. - Textscreen updates (ENDOOM screen and woof-setup) - Resizable textscreen windows. - Increase the default window size. - Render textscreen content to an upscaled intermediate texture. Improve non-integer window size scaling. - Add a menu for binding cheats to keys/buttons. Ability to bind "Fake Archvile Jump". - New cheats: - FREEZE Stops all monsters, projectiles and item animations, but not the player animations (from ZDoom). - IDDKT/IDDST/IDDIT (kill, secret, item) finder cheats from DSDA-Doom. - IDBEHOLDH (health) and IDBEHOLDM (megaarmor) from PrBoom. - SKILL cheat to show (or change) game skill level from Crispy Doom. - List of all cheats available in the wiki. - Add options to disable certain HUD messages (@MrAlaux). - Introduce hide weapon cosmetic option (see Weapons menu). - Implement support for new author field in UMAPINFO. - Add key binding for "clean screenshots" without any HUD elements. - Rearrange the startup messages. - Support monster infight field in Dehacked (taken from Chocolate Doom). Fixes monsters infight in 100krevs.wad. - Add support for loading old Doom (< v1.2) IWADs. Not demo compatible. - Complete donut overrun emulation (from PrBoom+/Chocolate Doom). - Only delete the entire savegame name if not modified. - Update strings edit in menu. Set cursor position at end of line, Backspace and Del work as expected. - Play quit sound only if showing ENDOOM (@ceski-1). - Disable "180 turn" in strict mode (new DSDA rule). - Config updates. Do not store comments and deprecated entries, sort and group, clean up. - Check if drag-n-dropped .lmp files could be demo lumps. - Always interpolate idle weapon bob with uncapped FPS (@ceski-1). - Add M_VBOX and M_PALSEL lumps from PrBoom+. - Play a sound if the menu is activated with a different key than ESC. - Support for QUITMSG1..QUITMSG14 in Dehacked (quit messages in D2ISOv2.wad). - The demo footer is now compatible with PrBoom+/DSDA-Doom demo autoplay. Bug Fixes --------- - Better automap controls, fix some rotate/follow/overlay inconsistencies. - Windows Native MIDI fixes. - Fix songs with missing "hold pedal off" events (@ceski-1). - Update volume after "reset all controllers" event. In certain cases the channel can be audible even if the music volume slider is set to zero (@ceski-1). - Detect SysEx "part level" messages. Fixes volume in Valiant.wad MAP30 (@ceski-1). - Fix stutter in custom weapon switch animations (thanks to @MrAlaux). - Fix colorized player names in network chats. - Clip interpolated weapon sprites (thanks to @mikeday0). - Fix always gray percent / always red mismatch in status bar. - Fix -dogs default value. - Fix desync due to randomly mirrored corpses feature (fixes DBP31.wad). - Add check for wrong indexes in P_LoadSegs() (fixes 1killtng.wad map13). - ESC key resets a menu item with multiple options. - Fix crash when trying to send chat macro with key ASCII code < '0' (thanks to @MrAlaux). - Properly center colorized messages (thanks to @MrAlaux). - Fix alt-tab with exclusive fullscreen on Windows. - Fix -dumplumps command line parameter. - Fix puff interpolation on the floor level (thanks to @JNechaevsky). - Print error and skip PNG patch (fixes practicehub.wad). - Avoid ZIP file directory name clashes. - Fix disappearing icon on fullscreen switch on Windows. - Fix restart MUSINFO music loaded from save. - Fix a skull in the menu being drawn over the confirmation box when deleting a save (thanks to @MrAlaux). - Fix crosshair drawn over bezel in lock-on mode (thanks to @MrAlaux). Miscellaneous ------------- - Static build under Windows, there are no library DLLs in the distribution archive. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 pkgsrc/games/woof/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/woof/PLIST cvs rdiff -u -r1.38 -r1.39 pkgsrc/games/woof/distinfo cvs rdiff -u -r0 -r1.4 pkgsrc/games/woof/patches/patch-data_CMakeLists.txt cvs rdiff -u -r0 -r1.1 \ pkgsrc/games/woof/patches/patch-man_WoofInstall.cmake.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168615352777490 Content-Disposition: inline Content-Length: 7075 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/woof/Makefile diff -u pkgsrc/games/woof/Makefile:1.45 pkgsrc/games/woof/Makefile:1.46 --- pkgsrc/games/woof/Makefile:1.45 Sat May 6 19:09:30 2023 +++ pkgsrc/games/woof/Makefile Wed Jun 7 15:58:46 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2023/05/06 19:09:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.46 2023/06/07 15:58:46 micha Exp $ -DISTNAME= woof_10.5.1 +DISTNAME= woof_11.1.4 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=fabiangreffrath/} GITHUB_TAG= ${DISTNAME} @@ -31,15 +30,6 @@ SUBST_FILES.waddir= src/d_iwad.c SUBST_SED.waddir= -e 's,PKGSRC_PREFIX,"${PREFIX}",' SUBST_SED.waddir+= -e 's,PKGSRC_DOOMWADDIR,"/${DOOMWADDIR}",' -# XDG desktop file and icon are installed by the build system with the logic: -# if(UNIX AND NOT APPLE) -# Remove Apple exception because pkgsrc users maybe have X11 on Apple machines -SUBST_CLASSES+= xdg -SUBST_STAGE.xdg= pre-configure -SUBST_MESSAGE.xdg= Preparing data/CMakeLists.txt file ... -SUBST_FILES.xdg= data/CMakeLists.txt -SUBST_SED.xdg= -e 's,UNIX AND NOT APPLE,UNIX,' - # Process INSTALL.pkgsrc SUBST_CLASSES+= install SUBST_STAGE.install= do-configure @@ -55,11 +45,14 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \ ${DESTDIR}${PREFIX}/share/doc/woof/INSTALL.pkgsrc -.include "../../audio/SDL2_mixer/buildlink3.mk" +BUILDLINK_API_DEPENDS.fluidsynth+= fluidsynth>=2.2.0 .include "../../audio/fluidsynth/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" +BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.1.0 +.include "../../audio/libsndfile/buildlink3.mk" +.include "../../audio/libxmp/buildlink3.mk" +.include "../../audio/openal-soft/buildlink3.mk" +BUILDLINK_API_DEPENDS.SDL2+= SDL2>=2.0.18 .include "../../devel/SDL2/buildlink3.mk" -.include "../../graphics/SDL2_image/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.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.12 pkgsrc/games/woof/PLIST:1.13 --- pkgsrc/games/woof/PLIST:1.12 Fri Sep 30 15:13:13 2022 +++ pkgsrc/games/woof/PLIST Wed Jun 7 15:58:46 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2022/09/30 15:13:13 micha Exp $ +@comment $NetBSD: PLIST,v 1.13 2023/06/07 15:58:46 micha Exp $ bin/woof bin/woof-setup man/man6/woof-setup.6 @@ -13,7 +13,6 @@ share/doc/woof/README.md share/doc/woof/boom.txt share/doc/woof/boomdeh.txt share/doc/woof/boomref.txt -share/doc/woof/changes.txt share/doc/woof/examples/battle.wad share/doc/woof/examples/dogfly.deh share/doc/woof/examples/donut.txt @@ -31,33 +30,32 @@ share/doc/woof/examples/playbud.deh share/doc/woof/examples/possbud.deh share/doc/woof/examples/sky.wad share/doc/woof/examples/touchy.deh -share/doc/woof/log_jff.txt -share/doc/woof/log_lee.txt -share/doc/woof/log_rsp.txt -share/doc/woof/log_ty.txt share/doc/woof/mapcolors_vanilla.cfg -share/doc/woof/mbf-bugs.md share/doc/woof/mbf.txt share/doc/woof/mbfedit.txt share/doc/woof/mbffaq.txt share/doc/woof/options.txt -share/doc/woof/umapinfo.md -share/doc/woof/winmbf02.txt -share/doc/woof/winmbf02s.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/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 Index: pkgsrc/games/woof/distinfo diff -u pkgsrc/games/woof/distinfo:1.38 pkgsrc/games/woof/distinfo:1.39 --- pkgsrc/games/woof/distinfo:1.38 Fri Feb 24 12:21:40 2023 +++ pkgsrc/games/woof/distinfo Wed Jun 7 15:58:46 2023 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.38 2023/02/24 12:21:40 micha Exp $ +$NetBSD: distinfo,v 1.39 2023/06/07 15:58:46 micha Exp $ -BLAKE2s (woof_10.5.1.tar.gz) = 1e5b8cfeb5c30540b974f6e9b91f9f3ccac05eb43f7bc01bdf3969ebe5871fc6 -SHA512 (woof_10.5.1.tar.gz) = 8c2a5bcb816e5f16530e9a6c44b79b701e6c3734d7a23dc68bf5d2db1b23c89f9b6939315104cabdc60fd6ed0db589e27b35be1b11570474531c90882c5e4e96 -Size (woof_10.5.1.tar.gz) = 7279350 bytes +BLAKE2s (woof_11.1.4.tar.gz) = 1c1e40fa94da301d35a1d306059f52b4b7acedaaa9863427210b1fa7b791b973 +SHA512 (woof_11.1.4.tar.gz) = c085b24ba6af604866352ea1d6d37b50e900c46bfdb997d280f5cace3d099d1bc97d33adad5d118d0a384990f4c2335c0a95cc86ae6d1b93e727c3b281307482 +Size (woof_11.1.4.tar.gz) = 7264814 bytes +SHA1 (patch-data_CMakeLists.txt) = c19459831fd535a4336de4397c50921b63767b88 SHA1 (patch-man_CMakeLists.txt) = d5b2b30eb8a7efeddad29699c47801bc1c865403 +SHA1 (patch-man_WoofInstall.cmake.in) = fad08019aac3d0f97e572df7021fd2b17d8dd27d SHA1 (patch-src_d__iwad.c) = e2e596d3f0eacfca8852afa329704c14dadf7889 Added files: Index: pkgsrc/games/woof/patches/patch-data_CMakeLists.txt diff -u /dev/null pkgsrc/games/woof/patches/patch-data_CMakeLists.txt:1.4 --- /dev/null Wed Jun 7 15:58:47 2023 +++ pkgsrc/games/woof/patches/patch-data_CMakeLists.txt Wed Jun 7 15:58:46 2023 @@ -0,0 +1,12 @@ +$NetBSD: patch-data_CMakeLists.txt,v 1.4 2023/06/07 15:58:46 micha Exp $ + +Treat macOS as Unix. + +--- data/CMakeLists.txt.orig 2022-12-28 15:38:06.000000000 +0000 ++++ data/CMakeLists.txt +@@ -1,4 +1,4 @@ +-if(UNIX AND NOT APPLE) ++if(UNIX) + install(FILES woof.desktop DESTINATION share/applications) + install(FILES woof.png DESTINATION share/icons/hicolor/128x128/apps) + install(FILES woof-setup.desktop DESTINATION share/applications) Index: pkgsrc/games/woof/patches/patch-man_WoofInstall.cmake.in diff -u /dev/null pkgsrc/games/woof/patches/patch-man_WoofInstall.cmake.in:1.1 --- /dev/null Wed Jun 7 15:58:47 2023 +++ pkgsrc/games/woof/patches/patch-man_WoofInstall.cmake.in Wed Jun 7 15:58:46 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-man_WoofInstall.cmake.in,v 1.1 2023/06/07 15:58:46 micha Exp $ + +Treat macOS as Unix. + +--- man/WoofInstall.cmake.in.orig 2022-12-28 15:38:06.000000000 +0000 ++++ man/WoofInstall.cmake.in +@@ -20,7 +20,7 @@ if(Python3_EXECUTABLE) + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + OUTPUT_FILE "CMDLINE.md") + +- if(UNIX AND NOT APPLE) ++ if(UNIX) + execute_process(COMMAND + "${Python3_EXECUTABLE}" docgen + -s "${PROJECT_NAME}" -z "${PROJECT_SHORTNAME}" --_----------=_168615352777490--