CVS commit: pkgsrc/games/yquake2

["Yorick Hardy" <yhardy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   yhardy
Date:           Sun Sep 10 10:18:44 UTC 2023

Modified Files:
        pkgsrc/games/yquake2: Makefile PLIST distinfo
        pkgsrc/games/yquake2/patches: patch-Makefile

Log Message:
games/yquake2: update to yquake2-8.20

NetBSD is now supported, but the default pkgsrc prefix
is used -- so adjust the Makefile patch to let pkgsrc
determine the search paths.

Changelog:

Quake II 8.10 to 8.20:
- This release marks Quake IIs 25th anniversary. Happy Birthday!
- Various improvements to the menu. This includes updates to the menu
  framework itself, to the game controller menu, the savegame menu and
  the video menus. (by apartfromtime, protocultor, David Carlier and
  0lvin)
- A lot of fixes and improvements to the controller support. Support for
  gyro aiming, more precise stick handling and rumble improvements. (by
  protocultor)
- Implement faster weapon switching with the new 'cycleweap' command.
  (by protocultor).
- Fixes pusher delta yaw manipulation. This fixes the infamous bug were
  a player standing on a blocked elevator gets turned around (by
  skuller).
- Add a command 'spawnentity' to spawn entities at the given
  coordinates. Can be used for debugging. (by 0lvin)
- Ported monster footstep sounds from SkacikPLs Q2RTX fork. Needs a pak
  file with assets to work, see the documentation for details. (by
  0lvin)
- Ported reverb effects from SkacikPLs Q2RTX fork. (by 0lvin)
- Fix several coop related bugs with the powercubes. (by BjossiAlfreds)
- A way better fix for dead bodys obstructing elevators or falling
  through the worldmodel. (by BjossiAlfreds)
- Fix items already in water playing a splash sound at level start. (by
  BjossiAlfreds)
- Pause the game when getting minimized or hidden. (by David Carlier)
- Fix Bugs related to 'ogg_ignoretrack0'. (by BjossiAlfreds)
- Share model loading code between renderers. (by 0lvin)
- Restore stair step smoothing for step sizes other than 16.
- Fix playback of long audio samples (>10 seconds) through OpenAL.

Quake II 8.01 to 8.10:
- The OpenGL 3.2 renderer now supports the classic underwater effect.
  Until now it was only available in the Software renderer.
- Add 'ref_gles3', an OpenGL ES 3.0 renderer lib. This is an variant
  of the OpenGL 3.2 renderer, using OpenGL ES instead of desktop OpenGL.
  It greatly enhances support for embedded GPUs like the RaspberryPI 4.
- The Software renderer now supports colored lightning. It can be
  enabled through `sw_colorlight`. (by 0lvin)
- Another round of timing fixes. Implement `cl_maxfps -1` (the new
  default, existing configs are not altered) to automatically select
  a known to be good packet framerate depending on the current renderer
  framerate. This solves some subtile problems with stuttering entities.
- Greatly improved support for joysticks and controllers. Devices can
  now be hotplugged at runtime, binding should be portable between
  differend controllers and there's a new menu for controller bindings.
  (by Jaime Moreira)
- Add the `r_2D_unfiltered` and `r_videos_unfiltered` cvars. When
  enabled 2D elements like the HUD and videos are not filtered, they
  appear pixeled.
- Add 'prefweap' command to select weapon by priority. (by Jaime
  Moreira)
- Support building with Microsoft Visual Studio 2015 and newer.
- Several game code fixes, mostly for stuck mechanics in fact2. (by
  BjossiAlfreds and maraakate)
- Fix two stuck monsters in hangar1 and jail5. (by Dremor8484 and
  BjossiAlfreds)
- Fix the `viewsize` cvar.

Quake II 8.00 to 8.01:
- Fix the game not starting when nonexistent dirs in the search path.
- Sync haptic joystick effects to the sound. (by 0lvin)
- Move several map bug fixes to entity files, add some more map bug
  fixes. Without entity files the maps are the same as in Vanilla Quake
  II. (by BjossiAlfreds)
- Play the correct demo loop after changing the current mod.
- Fix numbered paks with upper case letters added twice to the search
  path. Only Windows was affected.
- `g_footsteps 2` now only generate footstep sound when the player is on
  the ground entity and no longer when in water or air.
- Add a cvar `g_machinegun_norecoil' which disables the machinegun
  recoil effect. This is cheat protected. (by De-Deppe)
- Scale 8 bit textures when `r_scale8bittextures` is set. (by 0lvin)
- The game is no longer limited to 1000 FPS when running in timedemo
  mode. (by 0lvin)
- Optimise command line parser and fix several subtle bugs. (by
  BjossiAlfreds)
- Add `r_2D_unfiltered`, when set to `1` 2D elements aren't filtered.
- Fix soldiers never chowing their pain skin as long as they're alive.
- Fix relative paths in ZIP files not being found.
- Add `gamemode` command for changing between singleplayer, deathmach
  and coop. (by BjossiAlfreds)
- Show a download progress bar when `cl_http_show_dw_progress` is set to
  `1`. (by David Carlier)

Quake II 7.45 to 8.00:
- Client side support for the optional Vulkan renderer library.
- Non existent renderer libraries are now skipped over by the menu.
- Fix several bugs when loading autosaves.
- Bump the maximal number of OGG/Vorbis files to 128.
- Several fixes to the Barracuda Shark. (by BjossiAlfreds)
- 'vid_fullscreen' and 'r_mode' are no longer special, they require an
  explicit 'vid_restart' like every other cvar.
- Remove hardcoded map fixes and replace them by optional entity files.
  Add several newly discovered map fixes. (by BjossiAlfreds)
- Send the network protocol version to the server. This can be used by
  the server to support clients with different network protocol version.
  (by Knightmare)
- Force SDL to minimize the window when its focus is lost. This fixes
  several problem under Windows with SDL 2.0.14 and newer.
- Switch the semantics of the 'vid_fullscreen' cvar. '1' is now native
  fullscreen, like it was in Vanilla Quake II. '2' is desktop
  fullscreen. When desktop fullscreen is selected through the menu,
  'r_mode' is forced to '-2'.
- Add 'g_footsteps' to control the generation of footstep sound. This
  cvar is cheat protected. '1' is Vanilla Quake II behavior and the
  default. '0' never generates footstep sound, '2' always generates
  them.
- Support stereo wave files. (by 0lvin)
- Add 'cl_r1q2_lighstyle'. When set to '1' Yamagi Quake II uses the
  Vanilla Quake II light styles (for example yellow light for the
  Hyperblaster) instead of the default r1q2 light styles.
- Add a submenu to configure gamepad and joystick sensitivities. (by
  Larry Davis)
- Ensure that the config file is written before changing the active mod.
  This prevents config changes from getting lost.
- Overhaul the search path logic. Make sure that each directory is added
  only once.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/games/yquake2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/yquake2/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/yquake2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/yquake2/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/yquake2/Makefile
diff -u pkgsrc/games/yquake2/Makefile:1.21 pkgsrc/games/yquake2/Makefile:1.22
--- pkgsrc/games/yquake2/Makefile:1.21  Sat May  6 19:09:31 2023
+++ pkgsrc/games/yquake2/Makefile       Sun Sep 10 10:18:44 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2023/05/06 19:09:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2023/09/10 10:18:44 yhardy Exp $
 
-DISTNAME=      quake2-7.45
+DISTNAME=      quake2-8.20
 PKGNAME=       y${DISTNAME}
-PKGREVISION=   10
 CATEGORIES=    games
 MASTER_SITES=  https://deponie.yamagi.org/quake2/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/games/yquake2/PLIST
diff -u pkgsrc/games/yquake2/PLIST:1.2 pkgsrc/games/yquake2/PLIST:1.3
--- pkgsrc/games/yquake2/PLIST:1.2      Tue Nov 24 13:04:52 2020
+++ pkgsrc/games/yquake2/PLIST  Sun Sep 10 10:18:44 2023
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2020/11/24 13:04:52 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/09/10 10:18:44 yhardy Exp $
 bin/q2ded
 bin/quake2
 libexec/yquake2/q2ded
 libexec/yquake2/quake2
 libexec/yquake2/ref_gl1.so
 libexec/yquake2/ref_gl3.so
+libexec/yquake2/ref_gles3.so
 libexec/yquake2/ref_soft.so
 share/applications/yquake2.desktop
 share/pixmaps/quake2.png

Index: pkgsrc/games/yquake2/distinfo
diff -u pkgsrc/games/yquake2/distinfo:1.6 pkgsrc/games/yquake2/distinfo:1.7
--- pkgsrc/games/yquake2/distinfo:1.6   Tue Oct 26 10:44:36 2021
+++ pkgsrc/games/yquake2/distinfo       Sun Sep 10 10:18:44 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:44:36 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/09/10 10:18:44 yhardy Exp $
 
-BLAKE2s (quake2-7.45.tar.xz) = 8eeb32906a0ef8a61b757cacac00c6ae424e08c015d27aaa9aff6c3d3959ebe7
-SHA512 (quake2-7.45.tar.xz) = 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
-Size (quake2-7.45.tar.xz) = 1997816 bytes
-SHA1 (patch-Makefile) = c9ed23e0361c676d8fe560b591f217dd9f662516
+BLAKE2s (quake2-8.20.tar.xz) = 14be64905a3b8ab705817e35932d585dff284b84c1449ef9f10e8c5cbc59d0d5
+SHA512 (quake2-8.20.tar.xz) = 5dbdbbf582494d16d00b9880ddea6de4b098a307dbe4ddf6bc90aa6b2bd2928c10fab40cf5dd63861e7a37f9c75b9afae6f43f8bfff3ee6704ca94f78ff9b7d2
+Size (quake2-8.20.tar.xz) = 2152184 bytes
+SHA1 (patch-Makefile) = adde4e75f4ac25b92b69260826720a1790e1aafe

Index: pkgsrc/games/yquake2/patches/patch-Makefile
diff -u pkgsrc/games/yquake2/patches/patch-Makefile:1.1 pkgsrc/games/yquake2/patches/patch-Makefile:1.2
--- pkgsrc/games/yquake2/patches/patch-Makefile:1.1     Tue Nov 24 13:04:53 2020
+++ pkgsrc/games/yquake2/patches/patch-Makefile Sun Sep 10 10:18:44 2023
@@ -1,27 +1,25 @@
-$NetBSD: patch-Makefile,v 1.1 2020/11/24 13:04:53 nia Exp $
+$NetBSD: patch-Makefile,v 1.2 2023/09/10 10:18:44 yhardy Exp $
 
-Add support for NetBSD.
+Let pkgsrc determine the search paths, instead of forcing
+the prefix.
 
---- Makefile.orig      2020-10-17 13:37:27.000000000 +0000
+--- Makefile.orig      2022-12-09 11:37:27.000000000 +0000
 +++ Makefile
-@@ -286,6 +286,8 @@ ifeq ($(YQ2_OSTYPE),Linux)
- override LDFLAGS += -lm -ldl -rdynamic
+@@ -286,7 +286,7 @@ INCLUDE ?= -I/usr/include
  else ifeq ($(YQ2_OSTYPE),FreeBSD)
- override LDFLAGS += -lm
-+else ifeq ($(YQ2_OSTYPE),NetBSD)
-+override LDFLAGS += -lm
+ INCLUDE ?= -I/usr/local/include
+ else ifeq ($(YQ2_OSTYPE),NetBSD)
+-INCLUDE ?= -I/usr/X11R7/include -I/usr/pkg/include
++INCLUDE ?= -I/usr/X11R7/include
  else ifeq ($(YQ2_OSTYPE),OpenBSD)
- override LDFLAGS += -lm
+ INCLUDE ?= -I/usr/local/include
+ else ifeq ($(YQ2_OSTYPE),Windows)
+@@ -301,7 +301,7 @@ LDFLAGS ?= -L/usr/lib
+ else ifeq ($(YQ2_OSTYPE),FreeBSD)
+ LDFLAGS ?= -L/usr/local/lib
+ else ifeq ($(YQ2_OSTYPE),NetBSD)
+-LDFLAGS ?= -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib
++LDFLAGS ?= -L/usr/X11R7/lib
+ else ifeq ($(YQ2_OSTYPE),OpenBSD)
+ LDFLAGS ?= -L/usr/local/lib
  else ifeq ($(YQ2_OSTYPE),Windows)
-@@ -452,6 +454,11 @@ release/quake2 : CFLAGS += -DHAVE_EXECIN
- release/quake2 : LDFLAGS += -lexecinfo
- endif
- 
-+ifeq ($(YQ2_OSTYPE), NetBSD)
-+release/quake2 : CFLAGS += -DHAVE_EXECINFO
-+release/quake2 : LDFLAGS += -lexecinfo
-+endif
-+
- ifeq ($(YQ2_OSTYPE), OpenBSD)
- release/quake2 : CFLAGS += -DHAVE_EXECINFO
- release/quake2 : LDFLAGS += -lexecinfo