CVS commit: pkgsrc/games/openmw

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/openmw
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 22 Oct 2021 22:43:12 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Oct 22 22:43:11 UTC 2021

Modified Files:
        pkgsrc/games/openmw: Makefile PLIST distinfo options.mk
        pkgsrc/games/openmw/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/games/openmw/patches:
            patch-components_crashcatcher_crashcatcher.hpp
Removed Files:
        pkgsrc/games/openmw/patches:
            patch-components_detournavigator_offmeshconnectionsmanager.hpp

Log Message:
openmw: update to 0.47.0

0.47.0
------

    Bug #1662: Qt4 and Windows binaries crash if there's a non-ASCII character in a file path/config path
    Bug #1901: Actors colliding behaviour is different from vanilla
    Bug #1952: Incorrect particle lighting
    Bug #2069: Fireflies in Fireflies invade Morrowind look wrong
    Bug #2311: Targeted scripts are not properly supported on non-unique RefIDs
    Bug #2473: Unable to overstock merchants
    Bug #2976: [reopened]: Issues combining settings from the command line and both config files
    Bug #3137: Walking into a wall prevents jumping
    Bug #3372: Projectiles and magic bolts go through moving targets
    Bug #3676: NiParticleColorModifier isn't applied properly
    Bug #3714: Savegame fails to load due to conflict between SpellState and MagicEffects
    Bug #3789: Crash in visitEffectSources while in battle
    Bug #3862: Random container contents behave differently than vanilla
    Bug #3929: Leveled list merchant containers respawn on barter
    Bug #4021: Attributes and skills are not stored as floats
    Bug #4039: Multiple followers should have the same following distance
    Bug #4055: Local scripts don't inherit variables from their base record
    Bug #4083: Door animation freezes when colliding with actors
    Bug #4247: Cannot walk up stairs in Ebonheart docks
    Bug #4357: OpenMW-CS: TopicInfos index sorting and rearranging isn't fully functional
    Bug #4363: OpenMW-CS: Defect in Clone Function for Dialogue Info records
    Bug #4447: Actor collision capsule shape allows looking through some walls
    Bug #4465: Collision shape overlapping causes twitching
    Bug #4476: Abot Gondoliers: player hangs in air during scenic travel
    Bug #4568: Too many actors in one spot can push other actors out of bounds
    Bug #4623: Corprus implementation is incorrect
    Bug #4631: Setting MSAA level too high doesn't fall back to highest supported level
    Bug #4764: Data race in osg ParticleSystem
    Bug #4765: Data race in ChunkManager -> Array::setBinding
    Bug #4774: Guards are ignorant of an invisible player that tries to attack them
    Bug #5026: Data races with rain intensity uniform set by sky and used by water
    Bug #5101: Hostile followers travel with the player
    Bug #5108: Savegame bloating due to inefficient fog textures format
    Bug #5165: Active spells should use real time intead of timestamps
    Bug #5300: NPCs don't switch from torch to shield when starting combat
    Bug #5358: ForceGreeting always resets the dialogue window completely
    Bug #5363: Enchantment autocalc not always 0/1
    Bug #5364: Script fails/stops if trying to startscript an unknown script
    Bug #5367: Selecting a spell on an enchanted item per hotkey always plays the equip sound
    Bug #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures
    Bug #5370: Opening an unlocked but trapped door uses the key
    Bug #5384: OpenMW-CS: Deleting an instance requires reload of scene window to show in editor
    Bug #5387: Move/MoveWorld don't update the object's cell properly
    Bug #5391: Races Redone 1.2 bodies don't show on the inventory
    Bug #5397: NPC greeting does not reset if you leave + reenter area
    Bug #5400: OpenMW-CS: Verifier checks race of non-skin bodyparts
    Bug #5403: Enchantment effect doesn't show on an enemy during death animation
    Bug #5415: Environment maps in ebony cuirass and HiRez Armors Indoril cuirass don't work
    Bug #5416: Junk non-node records before the root node are not handled gracefully
    Bug #5422: The player loses all spells when resurrected
    Bug #5423: Guar follows actors too closely
    Bug #5424: Creatures do not headtrack player
    Bug #5425: Poison effect only appears for one frame
    Bug #5427: GetDistance unknown ID error is misleading
    Bug #5431: Physics performance degradation after a specific number of actors on a scene
    Bug #5435: Enemies can't hurt the player when collision is off
    Bug #5441: Enemies can't push a player character when in critical strike stance
    Bug #5451: Magic projectiles don't disappear with the caster
    Bug #5452: Autowalk is being included in savegames
    Bug #5469: Local map is reset when re-entering certain cells
    Bug #5472: Mistify mod causes CTD in 0.46 on Mac
    Bug #5473: OpenMW-CS: Cell border lines don't update properly on terrain change
    Bug #5479: NPCs who should be walking around town are standing around without walking
    Bug #5484: Zero value items shouldn't be able to be bought or sold for 1 gold
    Bug #5485: Intimidate doesn't increase disposition on marginal wins
    Bug #5490: Hits to carried left slot aren't redistributed if there's no shield equipped
    Bug #5499: Faction advance is available when requirements not met
    Bug #5502: Dead zone for analogue stick movement is too small
    Bug #5507: Sound volume is not clamped on ingame settings update
    Bug #5525: Case-insensitive search in the inventory window does not work with non-ASCII characters
    Bug #5531: Actors flee using current rotation by axis x
    Bug #5539: Window resize breaks when going from a lower resolution to full screen resolution
    Bug #5548: Certain exhausted topics can be highlighted again even though there's no new dialogue
    Bug #5557: Diagonal movement is noticeably slower with analogue stick
    Bug #5588: Randomly clicking on the journal's right-side page when it's empty shows random topics
    Bug #5603: Setting constant effect cast style doesn't correct effects view
    Bug #5604: Only one valid NIF root node is loaded from a single file
    Bug #5611: Usable items with "0 Uses" should be used only once
    Bug #5619: Input events are queued during save loading
    Bug #5622: Can't properly interact with the console when in pause menu
    Bug #5627: Bookart not shown if it isn't followed by <BR> statement
    Bug #5633: Damage Spells in effect before god mode is enabled continue to hurt the player character and can kill them
    Bug #5639: Tooltips cover Messageboxes
    Bug #5644: Summon effects running on the player during game initialization cause crashes
    Bug #5656: Sneaking characters block hits while standing
    Bug #5661: Region sounds don't play at the right interval
    Bug #5675: OpenMW-CS: FRMR subrecords are saved with the wrong MastIdx
    Bug #5680: Bull Netches incorrectly aim over the player character's head and always miss
    Bug #5681: Player character can clip or pass through bridges instead of colliding against them
    Bug #5687: Bound items covering the same inventory slot expiring at the same time freezes the game
    Bug #5688: Water shader broken indoors with enable indoor shadows = false
    Bug #5695: ExplodeSpell for actors doesn't target the ground
    Bug #5703: OpenMW-CS menu system crashing on XFCE
    Bug #5706: AI sequences stop looping after the saved game is reloaded
    Bug #5713: OpenMW-CS: Collada models are corrupted in Qt-based scene view
    Bug #5731: OpenMW-CS: skirts are invisible on characters
    Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage
    Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
    Bug #5762: Movement solver is insufficiently robust
    Bug #5800: Equipping a CE enchanted ring deselects an already equipped and selected enchanted ring from the spell menu
    Bug #5807: Video decoding crash on ARM
    Bug #5821: NPCs from mods getting removed if mod order was changed
    Bug #5835: OpenMW doesn't accept negative values for NPC's hello, alarm, fight, and flee
    Bug #5836: OpenMW dialogue/greeting/voice filter doesn't accept negative Ai values for NPC's hello, alarm, fight, and flee
    Bug #5838: Local map and other menus become blank in some locations while playing Wizards' Islands mod.
    Bug #5840: GetSoundPlaying "Health Damage" doesn't play when NPC hits target with shield effect ( vanilla engine behavior )
    Bug #5841: Can't Cast Zero Cost Spells When Magicka is < 0
    Bug #5869: Guards can initiate arrest dialogue behind locked doors
    Bug #5871: The console appears if you type the Russian letter "Ё" in the name of the enchantment
    Bug #5877: Effects appearing with empty icon
    Bug #5899: Visible modal windows and dropdowns crashing game on exit
    Bug #5902: NiZBufferProperty is unable to disable the depth test
    Bug #5906: Sunglare doesn't work with Mesa drivers and AMD GPUs
    Bug #5912: ImprovedBound mod doesn't work
    Bug #5914: BM: The Swimmer can't reach destination
    Bug #5923: Clicking on empty spaces between journal entries might show random topics
    Bug #5934: AddItem command doesn't accept negative values
    Bug #5975: NIF controllers from sheath meshes are used
    Bug #5991: Activate should always be allowed for inventory items
    Bug #5995: NiUVController doesn't calculate the UV offset properly
    Bug #6007: Crash when ending cutscene is playing
    Bug #6016: Greeting interrupts Fargoth's sneak-walk
    Bug #6022: OpenMW-CS: Terrain selection is not updated when undoing/redoing terrain changes
    Bug #6023: OpenMW-CS: Clicking on a reference in "Terrain land editing" mode discards corresponding select/edit action
    Bug #6028: Particle system controller values are incorrectly used
    Bug #6035: OpenMW-CS: Circle brush in "Terrain land editing" mode sometimes includes vertices outside its radius
    Bug #6036: OpenMW-CS: Terrain selection at the border of cells omits certain corner vertices
    Bug #6043: Actor can have torch missing when torch animation is played
    Bug #6047: Mouse bindings can be triggered during save loading
    Bug #6136: Game freezes when NPCs try to open doors that are about to be closed
    Bug #6294: Game crashes with empty pathgrid
    Feature #390: 3rd person look "over the shoulder"
    Feature #832: OpenMW-CS: Handle deleted references
    Feature #1536: Show more information about level on menu
    Feature #2159: "Graying out" exhausted dialogue topics
    Feature #2386: Distant Statics in the form of Object Paging
    Feature #2404: Levelled List can not be placed into a container
    Feature #2686: Timestamps in openmw.log
    Feature #2798: Mutable ESM records
    Feature #3171: OpenMW-CS: Instance drag selection
    Feature #3983: Wizard: Add link to buy Morrowind
    Feature #4201: Projectile-projectile collision
    Feature #4486: Handle crashes on Windows
    Feature #4894: Consider actors as obstacles for pathfinding
    Feature #4899: Alpha-To-Coverage Anti-Aliasing for alpha testing
    Feature #4917: Do not trigger NavMesh update when RecastMesh update should not change NavMesh
    Feature #4977: Use the "default icon.tga" when an item's icon is not found
    Feature #5043: Head Bobbing
    Feature #5199: OpenMW-CS: Improve scene view colors
    Feature #5297: Add a search function to the "Datafiles" tab of the OpenMW launcher
    Feature #5362: Show the soul gems' trapped soul in count dialog
    Feature #5445: Handle NiLines
    Feature #5456: Basic collada animation support
    Feature #5457: Realistic diagonal movement
    Feature #5486: Fixes trainers to choose their training skills based on their base skill points
    Feature #5500: Prepare enough navmesh tiles before scene loading ends
    Feature #5511: Add in game option to toggle HRTF support in OpenMW
    Feature #5519: Code Patch tab in launcher
    Feature #5524: Resume failed script execution after reload
    Feature #5545: Option to allow stealing from an unconscious NPC during combat
    Feature #5551: Do not reboot PC after OpenMW installation on Windows
    Feature #5563: Run physics update in background thread
    Feature #5579: MCP SetAngle enhancement
    Feature #5580: Service refusal filtering
    Feature #5610: Actors movement should be smoother
    Feature #5642: Ability to attach arrows to actor skeleton instead of bow mesh
    Feature #5649: Skyrim SE compressed BSA format support
    Feature #5672: Make stretch menu background configuration more accessible
    Feature #5692: Improve spell/magic item search to factor in magic effect names
    Feature #5730: Add graphic herbalism option to the launcher and documents
    Feature #5771: ori command should report where a mesh is loaded from and whether the x version is used.
    Feature #5813: Instanced groundcover support
    Feature #5814: Bsatool should be able to create BSA archives, not only to extract it
    Feature #5828: Support more than 8 lights
    Feature #5910: Fall back to delta time when physics can't keep up
    Feature #5980: Support Bullet with double precision instead of one with single precision
    Feature #6024: OpenMW-CS: Selecting terrain in "Terrain land editing" should support "Add to selection" and "Remove from selection" modes
    Feature #6033: Include pathgrid to navigation mesh
    Feature #6034: Find path based on area cost depending on NPC stats
    Task #5480: Drop Qt4 support
    Task #5520: Improve cell name autocompleter implementation


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/games/openmw/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/openmw/PLIST \
    pkgsrc/games/openmw/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/openmw/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/openmw/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.hpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/games/openmw/patches/patch-components_detournavigator_offmeshconnectionsmanager.hpp

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

Modified files:

Index: pkgsrc/games/openmw/Makefile
diff -u pkgsrc/games/openmw/Makefile:1.37 pkgsrc/games/openmw/Makefile:1.38
--- pkgsrc/games/openmw/Makefile:1.37   Sat Oct  9 15:35:05 2021
+++ pkgsrc/games/openmw/Makefile        Fri Oct 22 22:43:11 2021
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2021/10/09 15:35:05 nia Exp $
+# $NetBSD: Makefile,v 1.38 2021/10/22 22:43:11 nia Exp $
 
-DISTNAME=      openmw-0.46.0
-PKGREVISION=   13
+DISTNAME=      openmw-openmw-0.47.0
+PKGNAME=       ${DISTNAME:S/^openmw-//1}
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenMW/}
-GITHUB_TAG=    openmw-${PKGVERSION_NOREV}
+MASTER_SITES=  https://gitlab.com/OpenMW/openmw/-/archive/${PKGNAME_NOREV}/
 
 MAINTAINER=    nia%NetBSD.org@localhost
 HOMEPAGE=      https://openmw.org/
@@ -20,20 +19,24 @@ GCC_REQD+=  4.8
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 CMAKE_ARGS+=   -DGLOBAL_CONFIG_DIR=${PKG_SYSCONFDIR}
+# System bullet is unacceptable due to OpenMW requiring
+# double-precision bullet.
+CMAKE_ARGS+=   -DOPENMW_USE_SYSTEM_BULLET=OFF
 
 EGDIR=         ${PREFIX}/share/examples/openmw
 
 PKG_SYSCONFSUBDIR=     openmw
 
+CONF_FILES+=   ${EGDIR}/defaults.bin ${PKG_SYSCONFDIR}/defaults.bin
 CONF_FILES+=   ${EGDIR}/gamecontrollerdb.txt ${PKG_SYSCONFDIR}/gamecontrollerdb.txt
 CONF_FILES+=   ${EGDIR}/openmw.cfg ${PKG_SYSCONFDIR}/openmw.cfg
-CONF_FILES+=   ${EGDIR}/settings-default.cfg ${PKG_SYSCONFDIR}/settings-default.cfg
 CONF_FILES+=   ${EGDIR}/version ${PKG_SYSCONFDIR}/version
 
 .include "options.mk"
+.include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/unshield/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
-.include "../../devel/bullet/buildlink3.mk"
+#.include "../../devel/bullet/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"

Index: pkgsrc/games/openmw/PLIST
diff -u pkgsrc/games/openmw/PLIST:1.2 pkgsrc/games/openmw/PLIST:1.3
--- pkgsrc/games/openmw/PLIST:1.2       Tue Jan 19 12:45:56 2021
+++ pkgsrc/games/openmw/PLIST   Fri Oct 22 22:43:11 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/01/19 12:45:56 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/10/22 22:43:11 nia Exp $
 bin/bsatool
 bin/esmtool
 bin/niftest
@@ -10,10 +10,10 @@ ${PLIST.gui}bin/openmw-launcher
 ${PLIST.gui}bin/openmw-wizard
 ${PLIST.gui}share/applications/org.openmw.cs.desktop
 share/applications/org.openmw.launcher.desktop
+${PLIST.gui}share/examples/openmw/defaults-cs.bin
+share/examples/openmw/defaults.bin
 share/examples/openmw/gamecontrollerdb.txt
-${PLIST.gui}share/examples/openmw/openmw-cs.cfg
 share/examples/openmw/openmw.cfg
-share/examples/openmw/settings-default.cfg
 share/examples/openmw/version
 share/games/openmw/resources/defaultfilters
 share/games/openmw/resources/mygui/DejaVuLGCSansMono.ttf
@@ -102,7 +102,15 @@ share/games/openmw/resources/mygui/openm
 share/games/openmw/resources/mygui/openmw_wait_dialog_progressbar.layout
 share/games/openmw/resources/mygui/openmw_windows.skin.xml
 share/games/openmw/resources/mygui/skins.xml
+share/games/openmw/resources/shaders/alpha.glsl
+share/games/openmw/resources/shaders/groundcover_fragment.glsl
+share/games/openmw/resources/shaders/groundcover_vertex.glsl
 share/games/openmw/resources/shaders/lighting.glsl
+share/games/openmw/resources/shaders/lighting_util.glsl
+share/games/openmw/resources/shaders/nv_default_fragment.glsl
+share/games/openmw/resources/shaders/nv_default_vertex.glsl
+share/games/openmw/resources/shaders/nv_nolighting_fragment.glsl
+share/games/openmw/resources/shaders/nv_nolighting_vertex.glsl
 share/games/openmw/resources/shaders/objects_fragment.glsl
 share/games/openmw/resources/shaders/objects_vertex.glsl
 share/games/openmw/resources/shaders/parallax.glsl
@@ -114,6 +122,7 @@ share/games/openmw/resources/shaders/sha
 share/games/openmw/resources/shaders/shadows_vertex.glsl
 share/games/openmw/resources/shaders/terrain_fragment.glsl
 share/games/openmw/resources/shaders/terrain_vertex.glsl
+share/games/openmw/resources/shaders/vertexcolors.glsl
 share/games/openmw/resources/shaders/water_fragment.glsl
 share/games/openmw/resources/shaders/water_nm.png
 share/games/openmw/resources/shaders/water_vertex.glsl
@@ -124,7 +133,7 @@ share/games/openmw/resources/vfs/texture
 share/games/openmw/resources/vfs/textures/omw_menu_scroll_left.dds
 share/games/openmw/resources/vfs/textures/omw_menu_scroll_right.dds
 share/games/openmw/resources/vfs/textures/omw_menu_scroll_up.dds
-share/licenses/openmw/DejaVu Font License.txt
+share/licenses/openmw/DejaVuFontLicense.txt
 share/metainfo/openmw.appdata.xml
 ${PLIST.gui}share/pixmaps/openmw-cs.png
 share/pixmaps/openmw.png
Index: pkgsrc/games/openmw/options.mk
diff -u pkgsrc/games/openmw/options.mk:1.2 pkgsrc/games/openmw/options.mk:1.3
--- pkgsrc/games/openmw/options.mk:1.2  Tue Jan 19 12:45:56 2021
+++ pkgsrc/games/openmw/options.mk      Fri Oct 22 22:43:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/01/19 12:45:56 nia Exp $
+# $NetBSD: options.mk,v 1.3 2021/10/22 22:43:11 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openmw
 PKG_SUPPORTED_OPTIONS=         qt5
@@ -11,7 +11,7 @@ PLIST_VARS+=  gui
 .if !empty(PKG_OPTIONS:Mqt5)
 PLIST.gui=     yes
 CMAKE_ARGS+=   -DDESIRED_QT_VERSION=5
-CONF_FILES+=   ${EGDIR}/openmw-cs.cfg ${PKG_SYSCONFDIR}/openmw-cs.cfg
+CONF_FILES+=   ${EGDIR}/defaults-cs.bin ${PKG_SYSCONFDIR}/defaults-cs.bin
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -DBUILD_LAUNCHER=OFF

Index: pkgsrc/games/openmw/distinfo
diff -u pkgsrc/games/openmw/distinfo:1.4 pkgsrc/games/openmw/distinfo:1.5
--- pkgsrc/games/openmw/distinfo:1.4    Thu Oct  7 14:07:45 2021
+++ pkgsrc/games/openmw/distinfo        Fri Oct 22 22:43:11 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2021/10/07 14:07:45 nia Exp $
+$NetBSD: distinfo,v 1.5 2021/10/22 22:43:11 nia Exp $
 
-RMD160 (openmw-0.46.0.tar.gz) = d52b3725a3a589d84cea2494d80f98ea4e29bc50
-SHA512 (openmw-0.46.0.tar.gz) = da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
-Size (openmw-0.46.0.tar.gz) = 5155004 bytes
-SHA1 (patch-CMakeLists.txt) = 924ed36b1ed17b8a8562a43b05ae8393e6ef1e08
+RMD160 (openmw-openmw-0.47.0.tar.gz) = a5e62b369a80beb0a6673bbc85ad574a85423eee
+SHA512 (openmw-openmw-0.47.0.tar.gz) = 517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
+Size (openmw-openmw-0.47.0.tar.gz) = 5156857 bytes
+SHA1 (patch-CMakeLists.txt) = 11f81c9b879bb20b01d2815e2aaf1d111e4fa8a8
 SHA1 (patch-components_crashcatcher_crashcatcher.cpp) = ecb17b1f5a199ddc8b3bd299e0222ebf88c1fdec
-SHA1 (patch-components_detournavigator_offmeshconnectionsmanager.hpp) = b98d76821b3f533027e46481b2cee43c1ded91d0
+SHA1 (patch-components_crashcatcher_crashcatcher.hpp) = f2810b26463edf56391c4d51348ad834f471ad74
 SHA1 (patch-components_files_fixedpath.hpp) = c4047ee90e1771228ce5179d8a082345a0310e03
 SHA1 (patch-components_files_linuxpath.cpp) = 706543e2a684dda0e21b39b35c829baf314deedf
 SHA1 (patch-components_files_linuxpath.hpp) = 0627dc0a15e62b2e3c7314d19d1bb2b099af576e

Index: pkgsrc/games/openmw/patches/patch-CMakeLists.txt
diff -u pkgsrc/games/openmw/patches/patch-CMakeLists.txt:1.3 pkgsrc/games/openmw/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/games/openmw/patches/patch-CMakeLists.txt:1.3        Thu Apr  8 08:40:05 2021
+++ pkgsrc/games/openmw/patches/patch-CMakeLists.txt    Fri Oct 22 22:43:11 2021
@@ -1,34 +1,25 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2021/04/08 08:40:05 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2021/10/22 22:43:11 nia Exp $
 
 Install configuration files to examples directory.
 
---- CMakeLists.txt.orig        2020-06-08 09:11:24.000000000 +0000
+--- CMakeLists.txt.orig        2021-10-10 16:17:03.000000000 +0000
 +++ CMakeLists.txt
-@@ -483,13 +483,13 @@ IF(NOT WIN32 AND NOT APPLE)
-     ENDIF(BUILD_OPENCS)
+@@ -922,13 +922,13 @@ elseif(NOT APPLE)
+         ENDIF(BUILD_OPENCS)
  
-     # Install global configuration files
--    INSTALL(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
--    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" COMPONENT "openmw")
--    INSTALL(FILES "${OpenMW_BINARY_DIR}/resources/version" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
--    INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
-+    INSTALL(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "openmw")
-+    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "${DATAROOTDIR}/examples/openmw" RENAME "openmw.cfg" COMPONENT "openmw")
-+    INSTALL(FILES "${OpenMW_BINARY_DIR}/resources/version" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "openmw")
-+    INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "openmw")
+         # Install global configuration files
+-        INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
+-        INSTALL(FILES "${INSTALL_SOURCE}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" COMPONENT "openmw")
+-        INSTALL(FILES "${INSTALL_SOURCE}/resources/version" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
+-        INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
++        INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "openmw")
++        INSTALL(FILES "${INSTALL_SOURCE}/openmw.cfg.install" DESTINATION "${DATAROOTDIR}/examples/openmw" RENAME "openmw.cfg" COMPONENT "openmw")
++        INSTALL(FILES "${INSTALL_SOURCE}/resources/version" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "openmw")
++        INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "openmw")
  
-     IF(BUILD_OPENCS)
--        INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "opencs")
-+        INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "opencs")
-     ENDIF(BUILD_OPENCS)
+         IF(BUILD_OPENCS)
+-            INSTALL(FILES "${INSTALL_SOURCE}/defaults-cs.bin" DESTINATION "${SYSCONFDIR}" COMPONENT "opencs")
++            INSTALL(FILES "${INSTALL_SOURCE}/defaults-cs.bin" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "opencs")
+         ENDIF(BUILD_OPENCS)
  
-     # Install resources
-@@ -819,7 +819,7 @@ if (OPENMW_OSX_DEPLOYMENT AND APPLE AND 
- 
-     install(CODE "
-         set(BU_CHMOD_BUNDLE_ITEMS ON)
--        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
-+        set (CMAKE_MODULE_PATH "/home/nia/cvs/pkgsrc/games/openmw/work/.buildlink/cmake-Modules" ${CMAKE_MODULE_PATH})
-         include(BundleUtilities)
-         cmake_minimum_required(VERSION 3.1)
-     " COMPONENT Runtime)
+         # Install resources

Added files:

Index: pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.hpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.hpp:1.1
--- /dev/null   Fri Oct 22 22:43:12 2021
+++ pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.hpp  Fri Oct 22 22:43:11 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-components_crashcatcher_crashcatcher.hpp,v 1.1 2021/10/22 22:43:11 nia Exp $
+
+Needs to recognize NetBSD to avoid symbol conflicts.
+
+--- components/crashcatcher/crashcatcher.hpp.orig      2021-10-10 16:17:03.000000000 +0000
++++ components/crashcatcher/crashcatcher.hpp
+@@ -3,7 +3,7 @@
+ 
+ #include <string>
+ 
+-#if (defined(__APPLE__) || (defined(__linux)  &&  !defined(ANDROID)) || (defined(__unix) &&  !defined(ANDROID)) || defined(__posix))
++#if (defined(__APPLE__) || (defined(__linux)  &&  !defined(ANDROID)) || (defined(__unix) &&  !defined(ANDROID)) || defined(__posix)) || defined(__NetBSD__)
+     #define USE_CRASH_CATCHER 1
+ #else
+     #define USE_CRASH_CATCHER 0

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index