CVS commit: pkgsrc/games

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 9 Aug 2019 16:26:09 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug  9 16:26:09 UTC 2019

Modified Files:
        pkgsrc/games: Makefile
Added Files:
        pkgsrc/games/openmw: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/games/openmw/patches: patch-CMakeLists.txt
            patch-apps_openmw_mwgui_bookpage.hpp
            patch-apps_openmw_mwgui_spellview.hpp
            patch-apps_openmw_mwgui_videowidget.hpp
            patch-components_crashcatcher_crashcatcher.cpp
            patch-components_esm_custommarkerstate.hpp
            patch-components_files_fixedpath.hpp
            patch-components_files_linuxpath.cpp
            patch-components_files_linuxpath.hpp

Log Message:
Add games/openmw.

OpenMW is a free, open source and modern game engine which reimplements and
extends the one that runs the 2002 open-world RPG Morrowind. The engine
comes with its own editor, called OpenMW-CS which allows the user to edit
or create their own original games.

NOTE: Playing Morrowind with this engine still requires the Morrowind data
files that you own.


To generate a diff of this commit:
cvs rdiff -u -r1.445 -r1.446 pkgsrc/games/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/openmw/DESCR pkgsrc/games/openmw/Makefile \
    pkgsrc/games/openmw/PLIST pkgsrc/games/openmw/distinfo \
    pkgsrc/games/openmw/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/games/openmw/patches/patch-CMakeLists.txt \
    pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_bookpage.hpp \
    pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_spellview.hpp \
    pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_videowidget.hpp \
    pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.cpp \
    pkgsrc/games/openmw/patches/patch-components_esm_custommarkerstate.hpp \
    pkgsrc/games/openmw/patches/patch-components_files_fixedpath.hpp \
    pkgsrc/games/openmw/patches/patch-components_files_linuxpath.cpp \
    pkgsrc/games/openmw/patches/patch-components_files_linuxpath.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/Makefile
diff -u pkgsrc/games/Makefile:1.445 pkgsrc/games/Makefile:1.446
--- pkgsrc/games/Makefile:1.445 Thu Aug  8 13:40:30 2019
+++ pkgsrc/games/Makefile       Fri Aug  9 16:26:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.445 2019/08/08 13:40:30 nia Exp $
+# $NetBSD: Makefile,v 1.446 2019/08/09 16:26:09 nia Exp $
 #
 
 COMMENT=       Games
@@ -282,6 +282,7 @@ SUBDIR+=    not_tetris
 SUBDIR+=       omega
 SUBDIR+=       onscripter
 SUBDIR+=       openmortal
+SUBDIR+=       openmw
 SUBDIR+=       openttd
 SUBDIR+=       openttd-data
 SUBDIR+=       orbital_eunuchs_sniper

Added files:

Index: pkgsrc/games/openmw/DESCR
diff -u /dev/null pkgsrc/games/openmw/DESCR:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/DESCR   Fri Aug  9 16:26:09 2019
@@ -0,0 +1,7 @@
+OpenMW is a free, open source and modern game engine which reimplements and
+extends the one that runs the 2002 open-world RPG Morrowind. The engine
+comes with its own editor, called OpenMW-CS which allows the user to edit
+or create their own original games.
+
+NOTE: Playing Morrowind with this engine still requires the Morrowind data
+files that you own.
Index: pkgsrc/games/openmw/Makefile
diff -u /dev/null pkgsrc/games/openmw/Makefile:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/Makefile        Fri Aug  9 16:26:09 2019
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+DISTNAME=      openmw-0.45.0
+CATEGORIES=    games
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenMW/}
+GITHUB_TAG=    openmw-${PKGVERSION_NOREV}
+
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://openmw.org/
+COMMENT=       Recreation of The Elder Scrolls III: Morrowind game engine
+LICENSE=       gnu-gpl-v3
+
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++11
+USE_TOOLS+=    pkg-config
+
+# C++11
+GCC_REQD+=     4.8
+
+CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
+CMAKE_ARGS+=   -DGLOBAL_CONFIG_DIR=${PKG_SYSCONFDIR}
+
+EGDIR=         ${PREFIX}/share/examples/openmw
+
+PKG_SYSCONFSUBDIR=     openmw
+
+CONF_FILES+=   ${EGDIR}/gamecontrollerdb.txt ${PKG_SYSCONFDIR}/gamecontrollerdb.txt
+CONF_FILES+=   ${EGDIR}/gamecontrollerdb_204.txt ${PKG_SYSCONFDIR}/gamecontrollerdb_204.txt
+CONF_FILES+=   ${EGDIR}/gamecontrollerdb_205.txt ${PKG_SYSCONFDIR}/gamecontrollerdb_205.txt
+CONF_FILES+=   ${EGDIR}/openmw-cs.cfg ${PKG_SYSCONFDIR}/openmw-cs.cfg
+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/unshield/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/bullet/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/mygui/buildlink3.mk"
+.include "../../graphics/osg/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/openmw/PLIST
diff -u /dev/null pkgsrc/games/openmw/PLIST:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/PLIST   Fri Aug  9 16:26:09 2019
@@ -0,0 +1,122 @@
+@comment $NetBSD: PLIST,v 1.1 2019/08/09 16:26:09 nia Exp $
+bin/bsatool
+bin/esmtool
+bin/openmw
+bin/openmw-cs
+bin/openmw-essimporter
+bin/openmw-iniimporter
+bin/openmw-launcher
+bin/openmw-wizard
+share/applications/openmw-cs.desktop
+share/applications/openmw.desktop
+share/examples/openmw/gamecontrollerdb.txt
+share/examples/openmw/gamecontrollerdb_204.txt
+share/examples/openmw/gamecontrollerdb_205.txt
+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
+share/games/openmw/resources/mygui/OpenMWResourcePlugin.xml
+share/games/openmw/resources/mygui/core.skin
+share/games/openmw/resources/mygui/core.xml
+share/games/openmw/resources/mygui/core_layouteditor.xml
+share/games/openmw/resources/mygui/openmw.png
+share/games/openmw/resources/mygui/openmw_alchemy_window.layout
+share/games/openmw/resources/mygui/openmw_book.layout
+share/games/openmw/resources/mygui/openmw_box.skin.xml
+share/games/openmw/resources/mygui/openmw_button.skin.xml
+share/games/openmw/resources/mygui/openmw_chargen_birth.layout
+share/games/openmw/resources/mygui/openmw_chargen_class.layout
+share/games/openmw/resources/mygui/openmw_chargen_class_description.layout
+share/games/openmw/resources/mygui/openmw_chargen_create_class.layout
+share/games/openmw/resources/mygui/openmw_chargen_generate_class_result.layout
+share/games/openmw/resources/mygui/openmw_chargen_race.layout
+share/games/openmw/resources/mygui/openmw_chargen_review.layout
+share/games/openmw/resources/mygui/openmw_chargen_select_attribute.layout
+share/games/openmw/resources/mygui/openmw_chargen_select_skill.layout
+share/games/openmw/resources/mygui/openmw_chargen_select_specialization.layout
+share/games/openmw/resources/mygui/openmw_companion_window.layout
+share/games/openmw/resources/mygui/openmw_confirmation_dialog.layout
+share/games/openmw/resources/mygui/openmw_console.layout
+share/games/openmw/resources/mygui/openmw_console.skin.xml
+share/games/openmw/resources/mygui/openmw_container_window.layout
+share/games/openmw/resources/mygui/openmw_count_window.layout
+share/games/openmw/resources/mygui/openmw_debug_window.layout
+share/games/openmw/resources/mygui/openmw_debug_window.skin.xml
+share/games/openmw/resources/mygui/openmw_dialogue_window.layout
+share/games/openmw/resources/mygui/openmw_dialogue_window.skin.xml
+share/games/openmw/resources/mygui/openmw_edit.skin.xml
+share/games/openmw/resources/mygui/openmw_edit_effect.layout
+share/games/openmw/resources/mygui/openmw_edit_note.layout
+share/games/openmw/resources/mygui/openmw_enchanting_dialog.layout
+share/games/openmw/resources/mygui/openmw_font.xml
+share/games/openmw/resources/mygui/openmw_hud.layout
+share/games/openmw/resources/mygui/openmw_hud_box.skin.xml
+share/games/openmw/resources/mygui/openmw_hud_energybar.skin.xml
+share/games/openmw/resources/mygui/openmw_infobox.layout
+share/games/openmw/resources/mygui/openmw_interactive_messagebox.layout
+share/games/openmw/resources/mygui/openmw_interactive_messagebox_notransp.layout
+share/games/openmw/resources/mygui/openmw_inventory_window.layout
+share/games/openmw/resources/mygui/openmw_itemselection_dialog.layout
+share/games/openmw/resources/mygui/openmw_jail_screen.layout
+share/games/openmw/resources/mygui/openmw_journal.layout
+share/games/openmw/resources/mygui/openmw_journal.skin.xml
+share/games/openmw/resources/mygui/openmw_layers.xml
+share/games/openmw/resources/mygui/openmw_levelup_dialog.layout
+share/games/openmw/resources/mygui/openmw_list.skin.xml
+share/games/openmw/resources/mygui/openmw_loading_screen.layout
+share/games/openmw/resources/mygui/openmw_magicselection_dialog.layout
+share/games/openmw/resources/mygui/openmw_mainmenu.layout
+share/games/openmw/resources/mygui/openmw_mainmenu.skin.xml
+share/games/openmw/resources/mygui/openmw_map_window.layout
+share/games/openmw/resources/mygui/openmw_map_window.skin.xml
+share/games/openmw/resources/mygui/openmw_merchantrepair.layout
+share/games/openmw/resources/mygui/openmw_messagebox.layout
+share/games/openmw/resources/mygui/openmw_persuasion_dialog.layout
+share/games/openmw/resources/mygui/openmw_pointer.xml
+share/games/openmw/resources/mygui/openmw_progress.skin.xml
+share/games/openmw/resources/mygui/openmw_quickkeys_menu.layout
+share/games/openmw/resources/mygui/openmw_quickkeys_menu_assign.layout
+share/games/openmw/resources/mygui/openmw_recharge_dialog.layout
+share/games/openmw/resources/mygui/openmw_repair.layout
+share/games/openmw/resources/mygui/openmw_resources.xml
+share/games/openmw/resources/mygui/openmw_savegame_dialog.layout
+share/games/openmw/resources/mygui/openmw_screen_fader.layout
+share/games/openmw/resources/mygui/openmw_screen_fader_hit.layout
+share/games/openmw/resources/mygui/openmw_scroll.layout
+share/games/openmw/resources/mygui/openmw_scroll.skin.xml
+share/games/openmw/resources/mygui/openmw_settings.xml
+share/games/openmw/resources/mygui/openmw_settings_window.layout
+share/games/openmw/resources/mygui/openmw_spell_buying_window.layout
+share/games/openmw/resources/mygui/openmw_spell_window.layout
+share/games/openmw/resources/mygui/openmw_spellcreation_dialog.layout
+share/games/openmw/resources/mygui/openmw_stats_window.layout
+share/games/openmw/resources/mygui/openmw_text.skin.xml
+share/games/openmw/resources/mygui/openmw_text_input.layout
+share/games/openmw/resources/mygui/openmw_tooltips.layout
+share/games/openmw/resources/mygui/openmw_trade_window.layout
+share/games/openmw/resources/mygui/openmw_trainingwindow.layout
+share/games/openmw/resources/mygui/openmw_travel_window.layout
+share/games/openmw/resources/mygui/openmw_wait_dialog.layout
+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/lighting.glsl
+share/games/openmw/resources/shaders/objects_fragment.glsl
+share/games/openmw/resources/shaders/objects_vertex.glsl
+share/games/openmw/resources/shaders/parallax.glsl
+share/games/openmw/resources/shaders/s360_fragment.glsl
+share/games/openmw/resources/shaders/s360_vertex.glsl
+share/games/openmw/resources/shaders/terrain_fragment.glsl
+share/games/openmw/resources/shaders/terrain_vertex.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
+share/games/openmw/resources/version
+share/licenses/openmw/DejaVu Font License.txt
+share/metainfo/openmw.appdata.xml
+share/pixmaps/openmw-cs.png
+share/pixmaps/openmw.png
+@pkgdir share/games/openmw/data
Index: pkgsrc/games/openmw/distinfo
diff -u /dev/null pkgsrc/games/openmw/distinfo:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/distinfo        Fri Aug  9 16:26:09 2019
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+SHA1 (openmw-0.45.0.tar.gz) = 57ffaa0e066ddd4ad22b56b58879061693fa0c0d
+RMD160 (openmw-0.45.0.tar.gz) = 26810d9a3373691969d3f1c4b78b8aa52c866ec7
+SHA512 (openmw-0.45.0.tar.gz) = b968426659457cf486f6756f7ab82cc4cb34a92923c433dd86f711e5d7097f75441ed17daa50d21f15f1847f5aed1f4c3a094a06cfd3f2e9b90aa182742c596f
+Size (openmw-0.45.0.tar.gz) = 4711103 bytes
+SHA1 (patch-CMakeLists.txt) = 03224ef628e2a7a0668a331728ff0896bb0e6ed4
+SHA1 (patch-apps_openmw_mwgui_bookpage.hpp) = 5a47f960d9082e8d62e97010422815c059fd4df3
+SHA1 (patch-apps_openmw_mwgui_spellview.hpp) = c263753e14b7cb3e61c6cd3fddd04e5b8594b6ef
+SHA1 (patch-apps_openmw_mwgui_videowidget.hpp) = 5882cebcf7a658676b672f2716ab0ba6b9f4572f
+SHA1 (patch-components_crashcatcher_crashcatcher.cpp) = ecb17b1f5a199ddc8b3bd299e0222ebf88c1fdec
+SHA1 (patch-components_esm_custommarkerstate.hpp) = 1b7caefd441ff9ac30a328d53e630030997ccbb2
+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/options.mk
diff -u /dev/null pkgsrc/games/openmw/options.mk:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/options.mk      Fri Aug  9 16:26:09 2019
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.openmw
+PKG_SUPPORTED_OPTIONS=         qt5
+PKG_SUGGESTED_OPTIONS=         qt5
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   gui
+
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST.gui=     yes
+CMAKE_ARGS+=   -DDESIRED_QT_VERSION=5
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DBUILD_LAUNCHER=OFF
+CMAKE_ARGS+=   -DBUILD_OPENCS=OFF
+CMAKE_ARGS+=   -DBUILD_WIZARD=OFF
+.endif

Index: pkgsrc/games/openmw/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/openmw/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-CMakeLists.txt    Fri Aug  9 16:26:09 2019
@@ -0,0 +1,29 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Install configuration files to examples directory.
+
+--- CMakeLists.txt.orig        2019-08-09 16:06:59.842914670 +0000
++++ CMakeLists.txt
+@@ -420,15 +420,15 @@ IF(NOT WIN32 AND 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}/gamecontrollerdb_204.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
+-    INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb_205.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(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb_204.txt" DESTINATION "${DATAROOTDIR}/examples/openmw" COMPONENT "openmw")
++    INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb_205.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)
+ 
+     # Install resources
Index: pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_bookpage.hpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_bookpage.hpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_bookpage.hpp    Fri Aug  9 16:26:09 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-apps_openmw_mwgui_bookpage.hpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Always include <memory> for smart pointers in MWGui
+
+Upstream commit:
+https://github.com/OpenMW/openmw/commit/216e1ab16f88b9db6f8559bce2095e84c0ebbcbd.patch
+
+--- apps/openmw/mwgui/bookpage.hpp.orig        2019-03-10 10:50:29.000000000 +0000
++++ apps/openmw/mwgui/bookpage.hpp
+@@ -6,6 +6,7 @@
+ #include "MyGUI_FontManager.h"
+ 
+ #include <functional>
++#include <memory>
+ #include <stdint.h>
+ 
+ #include <components/settings/settings.hpp>
Index: pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_spellview.hpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_spellview.hpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_spellview.hpp   Fri Aug  9 16:26:09 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-apps_openmw_mwgui_spellview.hpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Always include <memory> for smart pointers in MWGui
+
+Upstream commit:
+https://github.com/OpenMW/openmw/commit/216e1ab16f88b9db6f8559bce2095e84c0ebbcbd.patch
+
+--- apps/openmw/mwgui/spellview.hpp.orig       2019-03-10 10:50:29.000000000 +0000
++++ apps/openmw/mwgui/spellview.hpp
+@@ -1,6 +1,7 @@
+ #ifndef OPENMW_GUI_SPELLVIEW_H
+ #define OPENMW_GUI_SPELLVIEW_H
+ 
++#include <memory>
+ #include <tuple>
+ 
+ #include <MyGUI_Widget.h>
Index: pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_videowidget.hpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_videowidget.hpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-apps_openmw_mwgui_videowidget.hpp Fri Aug  9 16:26:09 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-apps_openmw_mwgui_videowidget.hpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Always include <memory> for smart pointers in MWGui
+
+Upstream commit:
+https://github.com/OpenMW/openmw/commit/216e1ab16f88b9db6f8559bce2095e84c0ebbcbd.patch
+
+--- apps/openmw/mwgui/videowidget.hpp.orig     2019-03-10 10:50:29.000000000 +0000
++++ apps/openmw/mwgui/videowidget.hpp
+@@ -2,6 +2,7 @@
+ #define OPENMW_MWGUI_VIDEOWIDGET_H
+ 
+ #include <MyGUI_Widget.h>
++#include <memory>
+ 
+ namespace Video
+ {
Index: pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.cpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.cpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-components_crashcatcher_crashcatcher.cpp  Fri Aug  9 16:26:09 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-components_crashcatcher_crashcatcher.cpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Support NetBSD.
+
+--- components/crashcatcher/crashcatcher.cpp.orig      2019-03-10 10:50:29.000000000 +0000
++++ components/crashcatcher/crashcatcher.cpp
+@@ -28,7 +28,7 @@ namespace bfs = boost::filesystem;
+ #ifndef PR_SET_PTRACER
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+-#elif defined (__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__)
++#elif defined (__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <signal.h>
+ #endif
+ 
Index: pkgsrc/games/openmw/patches/patch-components_esm_custommarkerstate.hpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-components_esm_custommarkerstate.hpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-components_esm_custommarkerstate.hpp      Fri Aug  9 16:26:09 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-components_esm_custommarkerstate.hpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+fix builds against MyGUI master
+
+Upstream commit:
+https://github.com/OpenMW/openmw/commit/698c90b3ee01bb4e8be7f8ac72ce2029bb681dae.patch
+
+--- components/esm/custommarkerstate.hpp.orig  2019-03-10 10:50:29.000000000 +0000
++++ components/esm/custommarkerstate.hpp
+@@ -16,7 +16,7 @@ struct CustomMarker
+ 
+     std::string mNote;
+ 
+-    bool operator == (const CustomMarker& other)
++    bool operator == (const CustomMarker& other) const
+     {
+         return mNote == other.mNote && mCell == other.mCell && mWorldX == other.mWorldX && mWorldY == other.mWorldY;
+     }
Index: pkgsrc/games/openmw/patches/patch-components_files_fixedpath.hpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-components_files_fixedpath.hpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-components_files_fixedpath.hpp    Fri Aug  9 16:26:09 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-components_files_fixedpath.hpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Support NetBSD.
+
+--- components/files/fixedpath.hpp.orig        2017-11-15 17:20:40.000000000 +0000
++++ components/files/fixedpath.hpp
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <boost/filesystem.hpp>
+ 
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #ifndef ANDROID
+     #include <components/files/linuxpath.hpp>
+     namespace Files { typedef LinuxPath TargetPathType; }
Index: pkgsrc/games/openmw/patches/patch-components_files_linuxpath.cpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-components_files_linuxpath.cpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-components_files_linuxpath.cpp    Fri Aug  9 16:26:09 2019
@@ -0,0 +1,20 @@
+$NetBSD: patch-components_files_linuxpath.cpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Support NetBSD.
+
+--- components/files/linuxpath.cpp.orig        2019-03-10 10:50:29.000000000 +0000
++++ components/files/linuxpath.cpp
+@@ -1,6 +1,6 @@
+ #include "linuxpath.hpp"
+ 
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ 
+ #include <pwd.h>
+ #include <unistd.h>
+@@ -157,4 +157,4 @@ boost::filesystem::path LinuxPath::getIn
+ 
+ } /* namespace Files */
+ 
+-#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) */
++#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) */ 
Index: pkgsrc/games/openmw/patches/patch-components_files_linuxpath.hpp
diff -u /dev/null pkgsrc/games/openmw/patches/patch-components_files_linuxpath.hpp:1.1
--- /dev/null   Fri Aug  9 16:26:09 2019
+++ pkgsrc/games/openmw/patches/patch-components_files_linuxpath.hpp    Fri Aug  9 16:26:09 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-components_files_linuxpath.hpp,v 1.1 2019/08/09 16:26:09 nia Exp $
+
+Support NetBSD.
+
+--- components/files/linuxpath.hpp.orig        2017-11-15 17:20:40.000000000 +0000
++++ components/files/linuxpath.hpp
+@@ -1,7 +1,7 @@
+ #ifndef COMPONENTS_FILES_LINUXPATH_H
+ #define COMPONENTS_FILES_LINUXPATH_H
+ 
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ 
+ #include <boost/filesystem.hpp>
+

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

Home | Main Index | Thread Index | Old Index