head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.12 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.10 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.8 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.6 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.4 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.2 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.2.0.10 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.8 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.6 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.4 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.2 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.1.0.22 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.20 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.18 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.16 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.14 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.12 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.10 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.8 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.6 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.4 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.2 pkgsrc-2020Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2024.11.27.07.04.55; author khorben; state Exp; branches; next 1.2; commitid zsncxYANrw8xHfzF; 1.2 date 2023.09.10.10.18.44; author yhardy; state Exp; branches; next 1.1; commitid S9vdGuzCJ7Pm4dEE; 1.1 date 2020.11.24.13.04.53; author nia; state Exp; branches; next ; commitid rg4Up5EJFLRaN8xC; desc @@ 1.3 log @yquake2: fix the search paths and installation on macOS On macOS, ld(1) defaults to the output filename for the "install path" (LC_ID_DYLIB). This is caught by pkgsrc with `otool -L` in order to determine REQUIRES= in mk/pkgformat/pkg/metadata.mk - but it is wrong here, since the library is moved to libexec/yquake2 before packaging. (Error "missing library" when checking for missing run-time search paths in check-shlibs.mk) While there, this also fixes the default search path for the quake2 executable. NFCI anywhere outside macOS. Tested on NetBSD/amd64 and macOS/amd64. @ text @$NetBSD: patch-Makefile,v 1.2 2023/09/10 10:18:44 yhardy Exp $ Let pkgsrc determine the search paths, instead of forcing the prefix. Set the correct ID for the shared libraries on macOS. --- Makefile.orig 2022-12-09 11:37:27.000000000 +0000 +++ Makefile @@@@ -286,7 +286,7 @@@@ INCLUDE ?= -I/usr/include else ifeq ($(YQ2_OSTYPE),FreeBSD) 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) 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) @@@@ -516,7 +516,7 @@@@ endif ifeq ($(WITH_RPATH),yes) ifeq ($(YQ2_OSTYPE), Darwin) -release/quake2 : LDFLAGS += -Wl,-rpath,'@@executable_path/lib' +release/quake2 : LDFLAGS += -Wl,-rpath,'$(PREFIX)/lib' else release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib' endif @@@@ -579,6 +579,7 @@@@ ref_gl1: release/ref_gl1.dylib : LDFLAGS += -shared -framework OpenGL +release/ref_gl1.dylib : LDFLAGS += -Wl,-install_name,$(PREFIX)/libexec/yquake2/ref_gl1.dylib else # not Windows or Darwin @@@@ -619,6 +620,7 @@@@ ref_gl3: release/ref_gl3.dylib : GLAD_INCLUDE = -Isrc/client/refresh/gl3/glad/include release/ref_gl3.dylib : LDFLAGS += -shared +release/ref_gl3.dylib : LDFLAGS += -Wl,-install_name,$(PREFIX)/libexec/yquake2/ref_gl3.dylib else # not Windows or Darwin @@@@ -668,6 +670,7 @@@@ release/ref_gles3.dylib : GLAD_INCLUDE = release/ref_gles3.dylib : CFLAGS += -DYQ2_GL3_GLES3 -DYQ2_GL3_GLES release/ref_gles3.dylib : LDFLAGS += -shared +release/ref_gles3.dylib : LDFLAGS += -Wl,-install_name,$(PREFIX)/libexec/yquake2/ref_gles3.dylib else # not Windows or Darwin @@@@ -711,6 +714,7 @@@@ ref_soft: $(MAKE) release/ref_soft.dylib release/ref_soft.dylib : LDFLAGS += -shared +release/ref_soft.dylib : LDFLAGS += -Wl,-install_name,$(PREFIX)/libexec/yquake2/ref_soft.dylib else # not Windows or Darwin @ 1.2 log @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. @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.1 2020/11/24 13:04:53 nia Exp $ d6 2 d28 41 @ 1.1 log @yquake2: Update to 7.45 Quake II 7.44 to 7.45: - Fix a crash under windows when opening the games menu with mods installed. Quake II 7.43 to 7.44: - Fix some input option not getting saved. - Limit busywaits to the full client. This lowers the cpu consumption of q2ded considerably. - Rework the build system to be more distribution friendly. The base CFLAGS and LDFLAGS can now be overridden by the environment and by options passed to make. (by Simon McVittie) - Fix some corner cases of broken IPv6 connectivity. - Fix qport colliding between several Yamagi Quake II clients. - Keyboard keys unknown to Yamagi Quake II can now be bound. - Adaptive vsync is now supported by setting 'r_vsync' to '1'. - Implement 'coop_pickup_weapons'. When set to '1', a weapon may be picked up by coop players if the player doesn't have the weapon in their inventory or no other player has already picked it up. - In coop elevators wait for 'coop_elevator_delay' seconds. - If 'cl_anglekick' is set '1' angle kicks are ignored. This breaks the gameplay a little bit, but helps against motion sickness. This cvar is cheat protected. - Add 'listmaps' command and autocompletion for maps. (by JBerg) - Make 'wait' in scripts wait for 17 ms. This fixes some movement makros. - Support for Haiku. (by David Carlier) - Add a 'mods' submenu. (by earth-metal) - Add the 'vstr' command and 'nextdemo' cvar. Ported from ioquake3. (by Denis Pauk) @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 1 Add support for NetBSD. d6 1 a6 1 --- Makefile.orig 2020-10-17 13:37:27.000000000 +0000 d8 1 a8 2 @@@@ -286,6 +286,8 @@@@ ifeq ($(YQ2_OSTYPE),Linux) override LDFLAGS += -lm -ldl -rdynamic d10 4 a13 3 override LDFLAGS += -lm +else ifeq ($(YQ2_OSTYPE),NetBSD) +override LDFLAGS += -lm d15 10 a24 1 override LDFLAGS += -lm a25 12 @@@@ -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 @