Skip to content

Commit

Permalink
games/arx-libertatis: update to arx-libertatis-1.2
Browse files Browse the repository at this point in the history
Changelog:

Arx Libertatis 1.2 "Mega Mega Mega"

Released: 2021-07-13 (announcement)

Gameplay

  * Added an alternate, less strict rune recognition algorithm
    (enabled by default) (feature request #289, #653)
  * Made rune recognition less dependent on framerate (bug #856)
  * Added an alternate bow aim mode
  * Added gravity to arrows unless fully charged
  * Fixed weapon durability degrading faster at higher framerates
    (bug #790)
  * Fixed poison and magic resistance bonus from equipment and cheats
    being ignored in some cases
  * Fixed player ascending infinitely when attacked while levitating
    (bug #640)
  * Fixed Slow down (Rhaa Rune (decrease)Movis Rune (movement)) spell
    affecting user interface and input and improve player movement
    while it is active (bug #534)
  * Fixed hunger dropping below 0% when overeating (bug #132, fix is
    also applied when loading save files)
  * Higher caster level now makes the Curse (Rhaa Rune (decrease)
    Stregum Rune (magic)Vitae Rune (life)) spell more effective against
    NPC Damages, Armor Class and Damage Absorption instead of less
    effective
  * Calculated Armor Class, Magic Resistance, Poison Resistance and
    Damages stats now include attribute and skill modifiers from items
    and spells (bug #322)
  * The Critical Hit chance now includes item and cheat modifiers
  * The Negate magic (Nhi Rune (remove)Stregum Rune (magic)
    Spacium Rune (field)) spell and effect now correctly follows
    the target
  * Fixed player not receiving experience for kills by summoned
    creatures
  * Fixed selection of replacement weapon when the equipped one
    breaks to select one that is similarly powerful
  * Fixed maximum player Health and Mana ignoring attribute modifiers
    from items and spells while the MAX or MAR cheats are active
  * Fixed Akbaa not attacking the player after using his tentacle
    attack twice (bug #584)
  * Fixed spells without mana drain using the mana drain from
    previous spells
  * Fixed Confuse (Rhaa Rune (decrease)Vista Rune (vision)) spell
    ending immediately (bug #615)

Graphics

  * Windows: In multi-GPU setups (Optimus/PowerXpress) the more
    powerful GPU is now used by default
  * Added a configurable FPS limit independent of vsync, defaulting
    to the display refresh rate
  * Added a field of view setting (feature request #404)
  * Re-added a fullscreen gamma option (feature request #254)
  * Added support for fullscreen modes with different refresh rates
  * Added anti-aliasing to alpha cutouts (color key anti-aliasing,
    alpha to coverage and sample shading
  * Added an option to disable anisotropic filtering
    (feature request #96)
  * Added options to disable view bobbing and camera shake
    (feature request #405)
  * Fixed missing blob shadows under dragged entities
  * Fixed wrongly displayed light flare when dragging a torch (bug #783)
  * Fixed water and lava not being animated while the night vision
    spell is active (bug #1053)
  * Fixed scaling of flares around lights with higher resolutions
  * Fixed light flares showing through scene geometry or disappearing
    when the light is still visible (bug #120)
  * Fixed light flares showing through non-interactive entities
    (e.g. doors that are opening or closing)
  * Fixed light flares being drawn in front interface elements
    including notes (bug #1145)
  * Fixed light flares being disabled when the player book is open
  * Fixed flashes, flares and other effects appearing in front of
    the cinematic border
  * Fixed missing dynamic lighting for far away scene geometry
    (bug #1213)
  * Fixed amount of sparks, flame and smoke particles depending on
    the framerate
  * Fixed cinematic light flicker depending on the framerate
  * Fixed VSync setting not being applied until the game is restarted
  * Fixed water and lava animation overlay (bug #512)
  * Fixed map rendering glitches with buggy OpenGL drivers (bug #539)
  * Fixed Negate magic (Nhi Rune (remove)Stregum Rune (magic)Spacium
    Rune (field)) and Trap (Aam Rune (create)Morte
    Rune (death)Cosum Rune (object)) spell effects not rotating
  * Fixed overzealous entity culling (bug #588)
  * Fixed weapons and equipment always being drawn in front of the
    player hands and arms
  * Fixed player hands clipping with walls in first person view
  * Fixed arrow object rotation not matching direction
  * Fixed missing arrow trails (bug #538) and improved the effect
    (also used in the Speed (Mega Rune (increase)Movis
    Rune (movement)) spell)
  * Fixed NPC animations not playing when close to the player
    (bug #270)
  * Fixed missing aura when a protection spell ended before a Lower
    armor (Rhaa Rune (decrease)Kaom Rune (protection)) on the same
    target
  * Fixed Ylside blow up effect only disappearing when looking at it
    (bug #122)
  * Fixed lighting only being updated every other frame (bug #75)
  * Increased depth buffer from 16 bits minimum to 24 bits to
    prevent Z-fighting (bug #759)
  * Linux: Fixed missing anti-aliasing for some drivers

Interface

  * Added options to scale the player book, HUD and cursor with
    larger resolutions (feature request #391, #996)
  * Added an option to limit speech width on wide screens (enabled
    by default)
  * Fixed scaling and positioning of magic flares when casting with
    higher resolutions (bug #535)
  * Fixed scaling of cinematics with higher and wide resolutions
  * Add an option to letterbox or fade out cinematics with wide
    resolutions (fade by default)
  * Fixed player book and minimap being stretched with wide resolutions
    (bug #211)
  * Fixed minimap texture filtering changing when hovering map markers
    (bug #570)
  * Added anti-aliasing to HUD element borders (even without MSAA)
  * Improved quest book text layout
  * Added options to control the in-game font size and weight
  * Increased default font weight for text in the player book and notes
    to improve readability
  * Improved shop inventory sorting
  * Added crosshair when aiming with a fully charged bow
  * Sorting the inventory now never drops items to the ground
  * Fixed missing quest book background when there are no quest entries
    (bug #1021)
  * Fixed wrong items being highlighted when in combine mode (bug #121)
  * Add missing item halo when combining items
  * Fixed item halo being displayed in front of dragged items
  * Fixed too small font size at resolutions slightly above 640x480
  * Fixed rendering of runes in the player book
  * Removed light affecting the world when clicking on runes in the book
  * Tweaked how spell/stealth/equipment/torch icons move when opening
    the inventory
  * Fixed purse halo not showing when selling certain items
  * Fixed health and mana gauges not being hidden during the death
    animation (bug #806)
  * Fixed position of number in cursor when distributing skill points
  * Fixed level transition icons on the map not being displayed
    correctly (bug #782)
  * The player book is now closed when returning to mouse look mode
    (bug #143)
  * Fixed missing characters after forced line breaks in text
    (bug #718)

Controls

  * Added raw mouse input support and an option to control mouse
    acceleration
  * Fixed border turning (bug #255) and added an option to disable it
  * The "Resume game" menu entry and quickload (F9) now load the last
    save if no game is running (feature request #45)
  * Added a keyboard shortcut for drinking cure poison potions (not
    bound by default)
  * Added a keyboard shortcut to enter level transitions
    (feature request #105)
  * Add an auto ready weapon mode that only triggers on enemies
  * Player book and notes can now be closed using Escape
    (feature request #409)
  * Improved item drag and drop behavior
  * Improved drag threshold to make it less likely to accidentally
    drag an item when Shift+clicking it (bug #1225)
  * Fixed being able to exceed item stack size limits in some cases
    (bug #1111)
  * Added the ability to drop stacks of items to the floor or throw
    them (feature request #36)
  * Added the ability to pick up stacks of items outside inventories
    while holding shift (stealth mode shortcut)
  * Items can now be dragged across saves and level transitions
  * Fixed rotation of dragged and thrown entities (bug #591)
  * Fixed invert mouse setting affecting turning via keyboard or
    screen borders
  * Fixed double-click only working for the first slot in the Action
    binding (bug #795)
  * Mouse grab now released during cutscenes, conversations and
    cinematics
  * Fixed mouse not always being centered when exiting mouse look mode
  * Mouse look mode is now cancelled on focus loss to prevent the
    cursor being continuously warped to the window center

Audio

  * Added an option to enable OpenAL Soft's virtual surround (HRTF)
    support (enabled automatically when using headphones)
  * Re-added environmental audio effects (reverb) using OpenAL EFX
    (the game uses only one relatively neutral environment)
  * Added a config option to select the audio device
    (feature request #379)
  * Restored more spell sounds and fixed spell sound positions
  * The Harm (Rhaa Rune (decrease)Vitae Rune (life)), Ignite (Aam
    Rune (create)Yok Rune (fire)) and Douse (Nhi Rune (remove)Yok
    Rune (fire)) sound effects now correctly follow the caster/target
    (bug #740)
  * Added an option to mute audio when the window is not focused
  * Fixed duplicated page turn sound when clicking top tabs in the
    player book (bug #1125)
  * Fixed casting sound being played on level load when restoring
    persistent fields of protection
  * Fixed bare handed entity hit sound being repeated each frame
  * Fixed sound position when dousing torches
  * Added missing panning for ambient sounds
  * Audio listener orientation now uses the camera pitch (only
    noticeable with HRTF)
  * Fixed audio suddenly cutting off when getting too far from sources

Menu

  * Added text and audio language options (available languages depend
    on your Arx Fatalis version)
  * Added German, Italian, Russian and Spanish localization of new
    menu strings (feature request #1006)
  * Improved customize controls menu:
  * Overwriting bindings no longer moves the old key (bug #717)
  * Key bindings can now be removed using the escape key
    (feature request #408)
  * Displayed key names now use the current keyboard layout
  * Fixed removing duplicated key assignments
  * Fixed being locked out of the config menu when binding the
    'toggle fullscreen' action to the left mouse button (bug #1136)
  * Fixed UI not updating properly when changing key bindings
    (bug #717)
  * Sliders and option widgets can now be controlled using the mouse
    wheel or by clicking at the desired position
  * Fixed checkbox mouseover area (bug #528)
  * Fixed disappearing menu textures after resizing the window (bug #275)
  * Fixed slow cursor animation and shorter cursor trail with higher
    framerates
  * Increased the save thumbnail size
  * Added support for Unicode save names (feature request #1032)
  * Improved editing support in the save name textbox, including copy
    & paste support
  * Improved date/time display in the save list
  * Added additional highlighting and improved positioning to the
    credits
  * Added the libraries and tools used for the build to the credits
  * Added support for scrolling the credits using the mouse wheel
    or keyboard
  * Fixed credits scroll position changing on window size changes

Windowing

  * Switched to SDL 2 for windowing and input (task #506) - SDL 1
    backend will be removed in the next version
  * No longer grabs all keys when fullscreen (with SDL2)
  * The default ("Desktop") resolution now selects fullscreen
    windowed mode (with SDL2) (feature request #300, #449)
  * Added an option not to minimize the fullscreen window on
    Alt+TAB (feature request #814)
  * Added a new high-resolution icon
  * Screen saver is no longer inhibited while in the menu in windowed mode
  * Windows: Disabled OS-level DPI scaling (bug #706)
  * Windows: Fixed missing window icon
  * Linux: Translated the .desktop file to Italian and Spanish
  * macOS: Handle Command + Q shortcut to close the window

Modding

  * Added support for loading uncompressed FTL files
  * Added a blender plugin for FTL files
  * Added support for extending localization strings in mods
  * Added a ^camera system variable returning the active camera
  * Added a ^dragged system variable returning the item being dragged
  * Added the ^angle* and ^view* system system variables returning
    the rotation of the player or another entity
  * Fixed ^gamedays system variable to give the number of days since
    the playthrough start instead of the the number of 10-days
  * Added the -o flag to the spellcast script command to orphan the
    spell after being cast
  * Added library and python wrapper for decompressing FTL files

Debugging

  * Added a script console (feature request #356)
  * Added more debug views and made the key binding configurable
    (feature request #1500)
  * Added --skiplogo, --loadlevel, --loadslot and --loadsave
    command-line option to skip startup logos or load a level
    or save file on startup
  * Added support for loading save files by drag & drop
  * Added ability to rename saves to arxsavetool
  * Added a --benchmark command-line option
  * Added a --override-gl command-line option and extension_overrides
    setting to control used OpenGL extensions
  * Changed to OpenGL debug context and enabled ARB_debug_output for
    debug builds or with the --debug-gl option
  * Added a config option for the vertex streaming buffer size

Tools

  * Added support to arxunpak to extract all resources as seen by
    the game (default when no arguments are given)
  * Added support to arxunpak to create resource manifests with
    checksums
  * arxunpak now handles non-ASCII characters in filenames
  * Unix: Added support for different French and Russian Arx Fatalis
    CD versions to the data install script
  * Unix: Added support for different localized demo versions to the
    data install script
  * Unix: Fixed support for copying non-English data files from Steam
    installs in the data install script (bug #829)

Performance

  * A lot of code cleanup and various performance tweaks
  * Reduced number of redundant OpenGL state changes
  * Improved vertex upload, now uses persistently mapped buffers when
    available
  * MSAA is now disabled for interface draw calls where it does not
    make a difference
  * Optimized particle effect rendering
  * Changed blood rendering to only need one draw command per particle
  * Disabled denormalized floating point numbers on x86 and ARM for
    better performance
  * Added a performance profiling tool
  * Changed magic missile spell to only use one sound source instead
    of one per missile
  * Improved CPU usage when the window is minimized
  * Improved pathfinding performance, especially when the target is
    unreachable (bug #652)
  * Windows: The OpenGL context is no longer re-initialized on
    resolution changes
  * Unix: Enabled -ffast-math in release builds (was already enabled
    for MSVC)

Other Fixes

  * Significantly improved the item-world collision test: thrown or
    dropped items should no longer get stuck in walls, hover above
    the ground or fall through the ground or walls (bug #50, #556, #956)
  * Fixed screenshot shortcut (F10) always overriding the same file
  * Fixed potential resource leaks
  * Fixed direction of player speech outside cutscenes
  * Save files now correctly store game time for playthroughs longer
    than 1193 hours (AL 1.1.x and older as well as AF 1.21 simply
    ignore the additional data)
  * Fixed inconsistent state (weapon equipped while not in combat
    mode) when loading a save that was created while in combat mode
  * Fixed persistent arrow trails if arrows get outside the world
  * Fixed game time not being reset to 0 when starting a new
    playthrough after having an old one loaded
  * Fixed ^sender script variable possibly changing during script
    execution
  * Fixed a buffer overflow when saving with very long script
    variables
  * Fixed missing black bars in a cutscene in the castle of Arx
    (bug #1014)
  * Fixed Akbaa tentacle not being hidden when it is supposed to be
    in the Ylside bunker
  * Fixed crashes with item stack sizes or player gold amounts
    above 999999
  * Fixed wrat teleport breaking when saving and loading during the
    teleport
  * Fixed inconsistent weapon attachment when saving while in combat
    mode (bug #581)
  * Fixed getting stuck in a cutscene in level 5 (bug #1293)
  * Made saving more robust against unexpected filesystem errors
    (bug #439) or other programs opening the save file (bug #1218)
  * Improved handling of corrupted inventories in save files
    (bug #1445)
  * Fixed initial player position when starting a new game after
    already having loaded an existing game (bug #140)
  * Fixed minimap reveal status not being reset when starting a new
    game (bug #1349)
  * Fixed script variables not getting cleared on new game
  * Fixed an error when a resource file size changed after the game
    start
  * Fixed various crashes:
  * Fixed a crash when loading saves with more than 1500 entities in
    a single level (bug #375)
  * Fixed a crash when the entity whose inventory is open is destroyed
    (bug #843)
  * Fixed a crash when the caster or target of a spell is destroyed
    (bug #951)
  * Fixed a crash when the entity selected for combining is destroyed
    (bug #452)
  * Fixed a lockup when throwing items at certain objects
  * Fixed problems when loading save files with bugged entity positions
    (bug #894, #995)
  * Fixed asserts with very high player stats not obtainable during
    normal gameplay (bug #942)

Technical Changes

  * Fixed build with CMake 3.5.0 or newer
  * Fixed Windows XP support with newer MSVC versions
  * New dependency: GLM 0.9.5.0 or newer
  * macOS: New dependency: iconutil (from Xcode) or icnsutil for
    building the .icns icon
  * New crash reporter dependency: WinHTTP / libcurl 7.20.0 or newer
  * Dropped support for CMake < 2.8.3
  * Dropped support for Boost < 1.48
  * Dropped support for Qt < 4.7
  * Added support for using libepoxy instead of GLEW to load OpenGL
    functions
  * The unity build is now enabled by default
  * No longer stores deleted entities in save files if not needed
  * Added SDL 2 fall-back for error dialogs
  * Cleaned up missing data files error dialog, ask before running
    arx-install-data
  * Added support for statically linking Freetype and ZLIB
  * Color output is no longer enabled if $NO_COLOR is set or if $TERM
    is unset or set to "dumb"
  * Added support for setting a runtime libexec search dir different
    from the install path
  * Added support for the ARX_PATH environment variable under Windows
  * Added support for storing .pak and loose files in a data
    subdirectory
  * Added support for loading data files relative to the executable
  * Added support for configuring additional data search paths
  * There is now a dialog on crash and the crash report is prepared
    even if the Qt-based reporter is not available
  * Fixed build on newer macOS versions
  * Save files now track which playthrough they belong to (not used
    in the UI yet)
  * The arx binary now displays a graphical error dialog when passed
    bad command-line arguments
  * Changed passwall cheat to bypass culling
  * Removed the need for a custom vertex shader
  * Added support for using OpenGL ES-CM 1.x when desktop OpenGL is
    not available
  * Add a script warning when a command is missing parameters
  * The Gold linker is used and link time optimizations are now
    enabled automatically when building from source
  * Enabled address randomization for the main executable in MSVC
    builds
  * Made .pak loading case-insensitive on all platforms
  * Windows: Added support for statically linking Qt in the crash
    reporter
  * Windows: Support using a 32-bit crash reporter for a 64-bit arx
    process
  * Windows: Added Unicode filesystem support (feature request #786)

Removed Features

  * DirectX backends (Direct3D, DirectSound, DirectInput)
  * Video bit depth option
  * Support for loading uncooked objects (.teo) and scenes (.scn)
  * Removed link_mouse_look_to_use config option
  * Removed the unused killme script command
  * Removed the unused stack, code, rgb and sub-commands from the
    zoneparam script command
  * Remove stubbed-out -a flag from the set script command
  • Loading branch information
yorickhardy committed Jul 21, 2021
1 parent f322a90 commit 7d80486
Show file tree
Hide file tree
Showing 11 changed files with 134 additions and 254 deletions.
12 changes: 7 additions & 5 deletions games/arx-libertatis/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.5 2020/06/01 10:30:03 js Exp $
# $NetBSD: Makefile,v 1.6 2021/07/21 12:53:20 yhardy Exp $

DISTNAME= arx-libertatis-1.1.2
PKGREVISION= 1
DISTNAME= arx-libertatis-1.2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=project/arx/arx-libertatis-1.1.2/}
MASTER_SITES= https://arx-libertatis.org/files/
EXTRACT_SUFX= .tar.xz

MAINTAINER= pkgsrc-users@NetBSD.org
Expand Down Expand Up @@ -31,8 +30,11 @@ post-patch:

.include "../../audio/openal-soft/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glew/buildlink3.mk"
.include "../../graphics/glm/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libepoxy/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
60 changes: 58 additions & 2 deletions games/arx-libertatis/PLIST
Original file line number Diff line number Diff line change
@@ -1,10 +1,66 @@
@comment $NetBSD: PLIST,v 1.1 2016/09/02 16:46:04 wiz Exp $
@comment $NetBSD: PLIST,v 1.2 2021/07/21 12:53:20 yhardy Exp $
bin/arx
bin/arx-install-data
bin/arxsavetool
bin/arxunpak
include/ArxIO.h
lib/libArxIO.so
lib/libArxIO.so.0
lib/libArxIO.so.1.2
libexec/arxtool
man/man1/arx-install-data.1
man/man1/arxsavetool.1
man/man1/arxunpak.1
man/man6/arx.6
${PLIST.NotDarwin}share/applications/arx-libertatis.desktop
${PLIST.NotDarwin}share/pixmaps/arx-libertatis.png
share/blender/scripts/addons/arx/__init__.py
share/blender/scripts/addons/arx/arx_io_animation.py
share/blender/scripts/addons/arx/arx_io_area.py
share/blender/scripts/addons/arx/arx_io_material.py
share/blender/scripts/addons/arx/arx_io_model.py
share/blender/scripts/addons/arx/arx_io_test_roundtrip.py
share/blender/scripts/addons/arx/arx_io_util.py
share/blender/scripts/addons/arx/arx_ui_area.py
share/blender/scripts/addons/arx/dataAmb.py
share/blender/scripts/addons/arx/dataCin.py
share/blender/scripts/addons/arx/dataCommon.py
share/blender/scripts/addons/arx/dataDlf.py
share/blender/scripts/addons/arx/dataFtl.py
share/blender/scripts/addons/arx/dataFts.py
share/blender/scripts/addons/arx/dataLlf.py
share/blender/scripts/addons/arx/dataTea.py
share/blender/scripts/addons/arx/files.py
share/blender/scripts/addons/arx/lib.py
share/blender/scripts/addons/arx/main.py
share/blender/scripts/addons/arx/managers.py
share/blender/scripts/addons/arx/meshEdit.py
share/blender/scripts/addons/arx/naivePkware.py
share/games/arx/localisation/languages/chinese.ini
share/games/arx/localisation/languages/deutsch.ini
share/games/arx/localisation/languages/english.ini
share/games/arx/localisation/languages/francais.ini
share/games/arx/localisation/languages/hungarian.ini
share/games/arx/localisation/languages/italiano.ini
share/games/arx/localisation/languages/japanese.ini
share/games/arx/localisation/languages/russian.ini
share/games/arx/localisation/languages/spanish.ini
share/games/arx/localisation/xtext_default_001_arxlibertatis.ini
share/games/arx/localisation/xtext_deutsch_001_arxlibertatis.ini
share/games/arx/localisation/xtext_english_001_arxlibertatis.ini
share/games/arx/localisation/xtext_hungarian_001_arxlibertatis.ini
share/games/arx/localisation/xtext_italiano_001_arxlibertatis.ini
share/games/arx/localisation/xtext_russian_001_arxlibertatis.ini
share/games/arx/localisation/xtext_spanish_001_arxlibertatis.ini
share/games/arx/misc/dejavusansmono.ttf
share/games/arx/misc/icons.ttf
share/icons/hicolor/128x128/apps/arx-libertatis.png
share/icons/hicolor/16x16/apps/arx-libertatis.png
share/icons/hicolor/192x192/apps/arx-libertatis.png
share/icons/hicolor/22x22/apps/arx-libertatis.png
share/icons/hicolor/24x24/apps/arx-libertatis.png
share/icons/hicolor/256x256/apps/arx-libertatis.png
share/icons/hicolor/32x32/apps/arx-libertatis.png
share/icons/hicolor/48x48/apps/arx-libertatis.png
share/icons/hicolor/512x512/apps/arx-libertatis.png
share/icons/hicolor/64x64/apps/arx-libertatis.png
share/icons/hicolor/96x96/apps/arx-libertatis.png
21 changes: 8 additions & 13 deletions games/arx-libertatis/distinfo
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
$NetBSD: distinfo,v 1.3 2020/06/01 10:30:03 js Exp $
$NetBSD: distinfo,v 1.4 2021/07/21 12:53:20 yhardy Exp $

SHA1 (arx-libertatis-1.1.2.tar.xz) = 3b14a55553c564fd33caafb3a5bdb2d328e1fde8
RMD160 (arx-libertatis-1.1.2.tar.xz) = 94145d36664d8d747c0abc3ced9c9055fd642690
SHA512 (arx-libertatis-1.1.2.tar.xz) = d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
Size (arx-libertatis-1.1.2.tar.xz) = 970608 bytes
SHA1 (patch-CMakeLists.txt) = f905b3b51e39dff8bf2e24d4de76b677495fad00
SHA1 (patch-cmake_CompileCheck.cmake) = b954b0115666741ffbd5686e997d24bae72a3196
SHA1 (patch-cmake_VersionString.cmake) = afff2ae36425f3ffe0e1679d28e48ff4b6fc3d6f
SHA1 (patch-src_graphics_opengl_OpenGLRenderer.cpp) = 410769fea6b911dcb283b1da85bebd2861de8d94
SHA1 (patch-src_io_fs_FilesystemPOSIX.cpp) = 96f1938038c667997350f51a2bb201de0c9843e3
SHA1 (patch-src_platform_Thread.cpp) = 38e31c77c9e6e795cb37842da82b5ed6681f6aea
SHA1 (patch-src_platform_Time.cpp) = c67f1bd2a3bdaec7426970b8f72020667abeb8ed
SHA1 (patch-src_script_Script.cpp) = 29a923b5254077e2dc2cd73f69afb89025ef7012
SHA1 (arx-libertatis-1.2.tar.xz) = afec697725d2cffee4c5ba04479cd5ba78502408
RMD160 (arx-libertatis-1.2.tar.xz) = 5465f98f0a56abbbef9eb33b40e164ce2971acb2
SHA512 (arx-libertatis-1.2.tar.xz) = faa838469ed65346e660eda5af95626bd140fa589f6d46917cd567782969f47080214bc98e99b3b7c85b5a150d610fb8712f261ac84799d504e4dda75533f67c
Size (arx-libertatis-1.2.tar.xz) = 2478640 bytes
SHA1 (patch-CMakeLists.txt) = 61ec31c85ef4b775f9467b343e6b9e1516e146a1
SHA1 (patch-cmake_CompileCheck.cmake) = ca205e24c331f84765bf1bc29e0d7db9213250cc
SHA1 (patch-src_platform_Thread.cpp) = a1ef75e2e9e9c9981aee992ade0713eecdf538b2
117 changes: 38 additions & 79 deletions games/arx-libertatis/patches/patch-CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,89 +1,48 @@
$NetBSD: patch-CMakeLists.txt,v 1.2 2020/06/01 10:30:03 js Exp $

Fix use of CMAKE_MODULE_PATH (see also patch-cmake_VersionString.cmake)

Resolve "Attempt at a recursive or nested TRY_COMPILE in directory"
(see also patch-cmake_CompileCheck.cmake)

and
$NetBSD: patch-CMakeLists.txt,v 1.3 2021/07/21 12:53:20 yhardy Exp $

Rename VERSION to ARX_VERSION so that __has_include(<version>) does not
pick it up on a case-insensitive file system on Darwin.

and

commit 60e43c3cbf3fb0aa10cc3092b2512ccebb60b80d
Author: Daniel Scharrer <daniel@constexpr.org>
Date: Tue Feb 23 07:04:11 2016 +0100

CMake: Bump policy version to 3.4

Amongst other things, this makes the build system more rubust against
stray variables coming from included CMake scripts provided by the
system by disabling variable expansion for quoted strings in if().

Fixes build with CMake 3.5 (tested with 3.5.0-rc3).


--- CMakeLists.txt.orig 2013-10-17 17:25:04.000000000 +0000
--- CMakeLists.txt.orig 2021-07-14 00:04:33.000000000 +0000
+++ CMakeLists.txt
@@ -13,6 +13,11 @@ else()
cmake_minimum_required(VERSION 2.8)
endif()

+if(CMAKE_VERSION VERSION_GREATER 3.4)
+ cmake_policy(VERSION 3.4)
+else()
+ cmake_policy(VERSION ${CMAKE_VERSION})
+endif()

# Define configuration options

@@ -174,10 +179,12 @@ mark_as_advanced(
# Helper scrips

include(CheckCXXSourceCompiles)
+include(CheckIncludeFiles)
@@ -274,11 +274,11 @@ include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckTypeSize)

-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # For custom cmake modules
+set(CMAKE_CUSTOM_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # For custom cmake modules
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CUSTOM_MODULE_PATH}) # For custom cmake modules
include(BuildSystem)
include(BuildType)
include(CompileCheck)
@@ -406,15 +413,15 @@ if(NOT MSVC)
endif()

# Not a symbol, so we can't use check_symbol_exists
- check_compile(ARX_HAVE_BUILTIN_TRAP
- "${CMAKE_MODULE_PATH}/check_compiler_builtin_trap.cpp"
- "__builtin_trap" "compiler feature"
- )
-
- check_compile(ARX_HAVE_ATTRIBUTE_FORMAT_PRINTF
- "${CMAKE_MODULE_PATH}/check_compiler_attribute_format_printf.cpp"
- "__attribute__((format(printf, i, j)))" "compiler feature"
- )
+ #check_compile(ARX_HAVE_BUILTIN_TRAP
+ # "${CMAKE_MODULE_PATH}/check_compiler_builtin_trap.cpp"
+ # "__builtin_trap" "compiler feature"
+ #)
+
+ #check_compile(ARX_HAVE_ATTRIBUTE_FORMAT_PRINTF
+ # "${CMAKE_MODULE_PATH}/check_compiler_attribute_format_printf.cpp"
+ # "__attribute__((format(printf, i, j)))" "compiler feature"
+ #)

check_symbol_exists(nanosleep "time.h" ARX_HAVE_NANOSLEEP)

@@ -951,7 +958,7 @@ configure_file("${SRC_DIR}/${PLATFORM_CO
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # For custom cmake modules
+set (CMAKE_MODULE_PATH "/tmp/pkgsrc/games/arx-libertatis/work/.buildlink/cmake-Modules" "/tmp/pkgsrc/games/arx-libertatis/work/.buildlink/cmake-Modules" "/tmp/pkgsrc/games/arx-libertatis/work/.buildlink/cmake-Modules" "${PROJECT_SOURCE_DIR}/cmake") # For custom cmake modules

include(VersionString)
set(version_names VERSION ICON_NAME DATA_VERSION IO_LIBRARY_ABI_VERSION)
-parse_version_file("${version_names}" "VERSION")
+parse_version_file("${version_names}" "ARX_VERSION")
if(VERSION_ERROR OR DATA_VERSION_ERROR OR IO_LIBRARY_ABI_VERSION_ERROR)
message(WARNING "Error parsing version file!")
endif()
@@ -1481,7 +1481,7 @@ configure_file("src/${PLATFORM_CONFIG_H}

set(VERSION_TEMPLATE "${SRC_DIR}/core/Version.cpp.in")
set(VERSION_FILE "${CMAKE_BINARY_DIR}/core/Version.cpp")
-set(VERSION_SOURCES VERSION "VERSION" AUTHORS "AUTHORS")
+set(VERSION_SOURCES VERSION "ARX_VERSION" AUTHORS "AUTHORS")
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/core")
set(VERSION_TEMPLATE "src/core/Version.cpp.in")
set(VERSION_FILE "${PROJECT_BINARY_DIR}/core/Version.cpp")
-set(VERSION_SOURCES VERSION "VERSION" AUTHORS "AUTHORS" COPYING "COPYING")
+set(VERSION_SOURCES VERSION "ARX_VERSION" AUTHORS "AUTHORS" COPYING "COPYING")
file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/core")
version_file("${VERSION_TEMPLATE}" "${VERSION_FILE}" "${VERSION_SOURCES}" ".git")
list(APPEND ARX_SOURCES "${VERSION_FILE}")
list(APPEND ARX_SOURCES ${VERSION_FILE})
@@ -1490,7 +1490,7 @@ if(WIN32)
set(VERSION_RC_TEMPLATE "src/core/Version.rc.in")
function(create_version_resource exe name)
set(rc_file "${PROJECT_BINARY_DIR}/${exe}-version.rc")
- set(rc_sources VERSION "VERSION" COPYING "COPYING")
+ set(rc_sources VERSION "ARX_VERSION" COPYING "COPYING")
if(ARGC GREATER 2)
list(APPEND rc_sources ${ARGV2} "${ARGV2}")
endif()
@@ -1502,7 +1502,7 @@ if(WIN32)
set(APPLICATION_MANIFEST_TEMPLATE "src/core/Version.manifest.in")
function(create_application_manifest exe)
set(manifest_file "${PROJECT_BINARY_DIR}/${exe}.manifest")
- set(manifest_sources VERSION "VERSION")
+ set(manifest_sources VERSION "ARX_VERSION")
set(manifest_defines "-DEXE=${exe}")
if(ARGC GREATER 1 AND ARGV1 STREQUAL "dpiaware")
list(APPEND manifest_defines "-DDPIAWARE=true")
16 changes: 8 additions & 8 deletions games/arx-libertatis/patches/patch-cmake_CompileCheck.cmake
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
$NetBSD: patch-cmake_CompileCheck.cmake,v 1.1 2016/09/02 16:46:04 wiz Exp $
$NetBSD: patch-cmake_CompileCheck.cmake,v 1.2 2021/07/21 12:53:20 yhardy Exp $

Resolve "Attempt at a recursive or nested TRY_COMPILE in directory"
(see also patch-CMakeLists.txt)

--- cmake/CompileCheck.cmake.orig 2013-07-15 20:31:38.000000000 +0200
+++ cmake/CompileCheck.cmake 2013-07-15 20:32:36.000000000 +0200
@@ -52,7 +52,7 @@
--- cmake/CompileCheck.cmake.orig 2021-07-14 00:04:33.000000000 +0000
+++ cmake/CompileCheck.cmake
@@ -60,7 +60,7 @@ function(check_compile RESULT FILE FLAG

# Check if we can compile and link a simple file with the new flags
try_compile(
- check_compiler_flag ${CMAKE_BINARY_DIR} ${FILE}
- check_compiler_flag ${PROJECT_BINARY_DIR} ${FILE}
+ check_compiler_flag ${CMAKE_BINARY_DIR}/CMakeTmp ${FILE}
CMAKE_FLAGS "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
"-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}"
"-DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
CMAKE_FLAGS "-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}"
"-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}"
"-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}"
56 changes: 0 additions & 56 deletions games/arx-libertatis/patches/patch-cmake_VersionString.cmake

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions games/arx-libertatis/patches/patch-src_io_fs_FilesystemPOSIX.cpp

This file was deleted.

28 changes: 15 additions & 13 deletions games/arx-libertatis/patches/patch-src_platform_Thread.cpp
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
$NetBSD: patch-src_platform_Thread.cpp,v 1.1 2016/09/02 16:46:04 wiz Exp $
$NetBSD: patch-src_platform_Thread.cpp,v 1.2 2021/07/21 12:53:20 yhardy Exp $

Fix pthread_setname_np on NetBSD

--- src/platform/Thread.cpp.orig 2012-08-16 18:07:06.000000000 +0200
+++ src/platform/Thread.cpp 2012-08-16 18:19:04.000000000 +0200
@@ -96,7 +96,11 @@
--- src/platform/Thread.cpp.orig 2021-07-14 00:04:34.000000000 +0000
+++ src/platform/Thread.cpp
@@ -133,8 +133,13 @@ void * Thread::entryPoint(void * param)

// Set the thread name.
#if defined(ARX_HAVE_PTHREAD_SETNAME_NP) && ARX_PLATFORM != ARX_PLATFORM_MACOSX
#if ARX_HAVE_PTHREAD_SETNAME_NP && ARX_PLATFORM != ARX_PLATFORM_MACOS
+ # if defined(__NetBSD__)
+ // NetBSD
+ pthread_setname_np(thread.m_thread, "%s", (void*)const_cast<char*>(thread.m_threadName.c_str()));
+ # else
// Linux
+# ifdef __NetBSD__
+ pthread_setname_np(thread.thread, "%s", (void*)thread.threadName.c_str());
+# else
pthread_setname_np(thread.thread, thread.threadName.c_str());
+# endif
#elif defined(ARX_HAVE_PTHREAD_SETNAME_NP) && ARX_PLATFORM == ARX_PLATFORM_MACOSX
// Mac OS X
pthread_setname_np(thread.threadName.c_str());
pthread_setname_np(thread.m_thread, thread.m_threadName.c_str());
+ # endif
#elif ARX_HAVE_PTHREAD_SETNAME_NP && ARX_PLATFORM == ARX_PLATFORM_MACOS
// macOS
pthread_setname_np(thread.m_threadName.c_str());
Loading

0 comments on commit 7d80486

Please sign in to comment.