summaryrefslogtreecommitdiff
path: root/games/openmw
diff options
context:
space:
mode:
Diffstat (limited to 'games/openmw')
-rw-r--r--games/openmw/Makefile13
-rw-r--r--games/openmw/distinfo6
-rw-r--r--games/openmw/files/patch-apps_openmw_mwgui_cursor.cpp13
-rw-r--r--games/openmw/files/patch-apps_openmw_mwgui_quickkeysmenu.cpp11
-rw-r--r--games/openmw/files/patch-apps_openmw_mwgui_resourceskin.cpp48
-rw-r--r--games/openmw/files/patch-apps_openmw_mwgui_settingswindow.cpp44
-rw-r--r--games/openmw/files/patch-apps_openmw_mwgui_tooltips.cpp38
-rw-r--r--games/openmw/files/patch-apps_openmw_mwgui_travelwindow.cpp20
-rw-r--r--games/openmw/files/patch-apps_openmw_mwgui_windowmanagerimp.cpp11
-rw-r--r--games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp11
-rw-r--r--games/openmw/files/patch-components_bsa_bsa__file.cpp10
-rw-r--r--games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp29
-rw-r--r--games/openmw/files/patch-components_esm3_variant.hpp10
-rw-r--r--games/openmw/files/patch-components_fontloader_fontloader.cpp44
-rw-r--r--games/openmw/files/patch-components_myguiplatform_myguidatamanager.cpp11
-rw-r--r--games/openmw/files/patch-components_myguiplatform_myguidatamanager.hpp11
-rw-r--r--games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp11
-rw-r--r--games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp11
-rw-r--r--games/openmw/files/patch-components_myguiplatform_myguirendermanager.hpp11
-rw-r--r--games/openmw/files/patch-components_myguiplatform_scalinglayer.cpp13
-rw-r--r--games/openmw/files/patch-components_resource_imagemanager.cpp29
-rw-r--r--games/openmw/files/patch-components_resource_imagemanager.hpp11
-rw-r--r--games/openmw/files/patch-components_to__utf8_to__utf8.cpp26
-rw-r--r--games/openmw/files/patch-components_to__utf8_to__utf8.hpp11
-rw-r--r--games/openmw/files/patch-components_widgets_box.cpp65
-rw-r--r--games/openmw/files/patch-components_widgets_box.hpp65
-rw-r--r--games/openmw/files/patch-components_widgets_fontwrapper.hpp20
-rw-r--r--games/openmw/files/patch-components_widgets_imagebutton.cpp11
-rw-r--r--games/openmw/files/patch-components_widgets_imagebutton.hpp11
-rw-r--r--games/openmw/files/patch-components_widgets_list.cpp11
-rw-r--r--games/openmw/files/patch-components_widgets_list.hpp11
-rw-r--r--games/openmw/files/patch-extern_sol3_sol_optional__implementation.hpp12
-rw-r--r--games/openmw/pkg-plist219
33 files changed, 187 insertions, 691 deletions
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 652761704148..fbd17c143ac4 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -1,7 +1,7 @@
PORTNAME= openmw
DISTVERSIONPREFIX= openmw-
-DISTVERSION= 0.48.0
-PORTREVISION= 9
+DISTVERSION= 0.49.0
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= fluffy@FreeBSD.org
@@ -22,14 +22,17 @@ LIB_DEPENDS= libavcodec.so.60:multimedia/ffmpeg \
libicui18n.so:devel/icu \
libyaml-cpp.so:devel/yaml-cpp
-USES= cmake compiler:c++17-lang desktop-file-utils gl luajit openal \
+USES= cmake compiler:c++20-lang desktop-file-utils gl luajit openal \
pkgconfig qt:5 sdl sqlite xorg
USE_GITHUB= yes
GH_ACCOUNT= OpenMW
USE_GL= gl
-USE_QT= core gui network opengl printsupport widgets buildtools:build \
- qmake:build
+USE_QT= core gui linguisttools network opengl printsupport svg widgets \
+ buildtools:build qmake:build
+#USE_QT= base imageformats multimedia svg tools:build
USE_SDL= sdl2
+USE_CXXSTD= c++20
+#USE_GCC= yes
CMAKE_ARGS= -DDESIRED_QT_VERSION=5 \
-DOPENMW_USE_SYSTEM_BULLET=ON \
diff --git a/games/openmw/distinfo b/games/openmw/distinfo
index 6e5831af8789..7eb4ce4a47f8 100644
--- a/games/openmw/distinfo
+++ b/games/openmw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691876125
-SHA256 (OpenMW-openmw-openmw-0.48.0_GH0.tar.gz) = be97b8e900853c43dde8816f2ce49801fb672cffdf48ac7af9782abfb8a74af4
-SIZE (OpenMW-openmw-openmw-0.48.0_GH0.tar.gz) = 6022261
+TIMESTAMP = 1751744429
+SHA256 (OpenMW-openmw-openmw-0.49.0_GH0.tar.gz) = 5f31741d61cf7c736bbe522a1a33342773c7e1b713e7e20f3717eb8da2b1733d
+SIZE (OpenMW-openmw-openmw-0.49.0_GH0.tar.gz) = 5951281
diff --git a/games/openmw/files/patch-apps_openmw_mwgui_cursor.cpp b/games/openmw/files/patch-apps_openmw_mwgui_cursor.cpp
deleted file mode 100644
index 76328e122de7..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwgui_cursor.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- apps/openmw/mwgui/cursor.cpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwgui/cursor.cpp
-@@ -26,8 +26,8 @@ namespace MWGui
- MyGUI::xml::ElementEnumerator info = _node->getElementEnumerator();
- while (info.next("Property"))
- {
-- const std::string& key = info->findAttribute("key");
-- const std::string& value = info->findAttribute("value");
-+ const auto key = info->findAttribute("key");
-+ const auto value = info->findAttribute("value");
-
- if (key == "Point")
- mPoint = MyGUI::IntPoint::parse(value);
diff --git a/games/openmw/files/patch-apps_openmw_mwgui_quickkeysmenu.cpp b/games/openmw/files/patch-apps_openmw_mwgui_quickkeysmenu.cpp
deleted file mode 100644
index 9e2e7b8a79db..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwgui_quickkeysmenu.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/openmw/mwgui/quickkeysmenu.cpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwgui/quickkeysmenu.cpp
-@@ -534,7 +534,7 @@ namespace MWGui
- break;
- }
- case Type_Magic:
-- std::string spellId = button->getUserString("Spell");
-+ std::string spellId{button->getUserString("Spell")};
- key.mId = spellId;
- break;
- }
diff --git a/games/openmw/files/patch-apps_openmw_mwgui_resourceskin.cpp b/games/openmw/files/patch-apps_openmw_mwgui_resourceskin.cpp
deleted file mode 100644
index 615803e2b970..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwgui_resourceskin.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- apps/openmw/mwgui/resourceskin.cpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwgui/resourceskin.cpp
-@@ -9,11 +9,11 @@ namespace MWGui
- void resizeSkin(MyGUI::xml::ElementPtr _node)
- {
- _node->setAttribute("type", "ResourceSkin");
-- const std::string size = _node->findAttribute("size");
-+ const auto size = _node->findAttribute("size");
- if (!size.empty())
- return;
-
-- const std::string textureName = _node->findAttribute("texture");
-+ const std::string textureName{_node->findAttribute("texture")};
- if (textureName.empty())
- return;
-
-@@ -30,11 +30,11 @@ namespace MWGui
- if (basis->getName() != "BasisSkin")
- continue;
-
-- const std::string basisSkinType = basis->findAttribute("type");
-+ const auto basisSkinType = basis->findAttribute("type");
- if (Misc::StringUtils::ciEqual(basisSkinType, "SimpleText"))
- continue;
-
-- const std::string offset = basis->findAttribute("offset");
-+ const auto offset = basis->findAttribute("offset");
- if (!offset.empty())
- continue;
-
-@@ -45,7 +45,7 @@ namespace MWGui
- {
- if (state->getName() == "State")
- {
-- const std::string stateOffset = state->findAttribute("offset");
-+ const auto stateOffset = state->findAttribute("offset");
- if (!stateOffset.empty())
- continue;
-
-@@ -56,7 +56,7 @@ namespace MWGui
- bool hasTileSize = false;
- while (property.next("Property"))
- {
-- const std::string key = property->findAttribute("key");
-+ const auto key = property->findAttribute("key");
- if (key != "TileSize")
- continue;
-
diff --git a/games/openmw/files/patch-apps_openmw_mwgui_settingswindow.cpp b/games/openmw/files/patch-apps_openmw_mwgui_settingswindow.cpp
deleted file mode 100644
index 25fd13d58bc7..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwgui_settingswindow.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- apps/openmw/mwgui/settingswindow.cpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwgui/settingswindow.cpp
-@@ -107,22 +107,22 @@ namespace
-
- std::string getSettingType(MyGUI::Widget* widget)
- {
-- return widget->getUserString("SettingType");
-+ return std::string{widget->getUserString("SettingType")};
- }
-
- std::string getSettingName(MyGUI::Widget* widget)
- {
-- return widget->getUserString("SettingName");
-+ return std::string{widget->getUserString("SettingName")};
- }
-
- std::string getSettingCategory(MyGUI::Widget* widget)
- {
-- return widget->getUserString("SettingCategory");
-+ return std::string{widget->getUserString("SettingCategory")};
- }
-
- std::string getSettingValueType(MyGUI::Widget* widget)
- {
-- return widget->getUserString("SettingValueType");
-+ return std::string{widget->getUserString("SettingValueType")};
- }
-
- void getSettingMinMax(MyGUI::Widget* widget, float& min, float& max)
-@@ -220,12 +220,12 @@ namespace MWGui
-
- void SettingsWindow::updateSliderLabel(MyGUI::ScrollBar *scroller, const std::string& value)
- {
-- std::string labelWidgetName = scroller->getUserString("SettingLabelWidget");
-+ auto labelWidgetName = scroller->getUserString("SettingLabelWidget");
- if (!labelWidgetName.empty())
- {
- MyGUI::TextBox* textBox;
- getWidget(textBox, labelWidgetName);
-- std::string labelCaption = scroller->getUserString("SettingLabelCaption");
-+ std::string labelCaption{scroller->getUserString("SettingLabelCaption")};
- labelCaption = Misc::StringUtils::format(labelCaption, value);
- textBox->setCaptionWithReplacing(labelCaption);
- }
diff --git a/games/openmw/files/patch-apps_openmw_mwgui_tooltips.cpp b/games/openmw/files/patch-apps_openmw_mwgui_tooltips.cpp
deleted file mode 100644
index ccc614df8923..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwgui_tooltips.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- apps/openmw/mwgui/tooltips.cpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwgui/tooltips.cpp
-@@ -168,7 +168,7 @@ namespace MWGui
- return;
- }
-
-- std::string type = focus->getUserString("ToolTipType");
-+ auto type = focus->getUserString("ToolTipType");
-
- if (type == "")
- {
-@@ -224,7 +224,7 @@ namespace MWGui
- ToolTipInfo info;
-
- const ESM::Spell *spell =
-- MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(focus->getUserString("Spell"));
-+ MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(std::string{focus->getUserString("Spell")});
- info.caption = spell->mName;
- Widgets::SpellEffectList effects;
- for (const ESM::ENAMstruct& spellEffect : spell->mEffects.mList)
-@@ -248,7 +248,7 @@ namespace MWGui
- int school = MWMechanics::getSpellSchool(spell, player);
- info.text = "#{sSchool}: " + sSchoolNames[school];
- }
-- std::string cost = focus->getUserString("SpellCost");
-+ auto cost = focus->getUserString("SpellCost");
- if (cost != "" && cost != "0")
- info.text += MWGui::ToolTips::getValueString(MWMechanics::calcSpellCost(*spell), "#{sCastCost}");
- info.effects = effects;
-@@ -262,7 +262,7 @@ namespace MWGui
-
- tooltip->setVisible(true);
-
-- std::map<std::string, std::string> userStrings = focus->getUserStrings();
-+ auto userStrings = focus->getUserStrings();
- for (auto& userStringPair : userStrings)
- {
- size_t underscorePos = userStringPair.first.find('_');
diff --git a/games/openmw/files/patch-apps_openmw_mwgui_travelwindow.cpp b/games/openmw/files/patch-apps_openmw_mwgui_travelwindow.cpp
deleted file mode 100644
index 2b75b3fadc66..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwgui_travelwindow.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- apps/openmw/mwgui/travelwindow.cpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwgui/travelwindow.cpp
-@@ -144,7 +144,7 @@ namespace MWGui
-
- void TravelWindow::onTravelButtonClick(MyGUI::Widget* _sender)
- {
-- std::istringstream iss(_sender->getUserString("price"));
-+ std::istringstream iss(std::string{_sender->getUserString("price")});
- int price;
- iss >> price;
-
-@@ -170,7 +170,7 @@ namespace MWGui
-
- MWBase::Environment::get().getWindowManager()->fadeScreenOut(1);
- ESM::Position pos = *_sender->getUserData<ESM::Position>();
-- std::string cellname = _sender->getUserString("Destination");
-+ std::string cellname{_sender->getUserString("Destination")};
- bool interior = _sender->getUserString("interior") == "y";
- if (mPtr.getCell()->isExterior())
- {
diff --git a/games/openmw/files/patch-apps_openmw_mwgui_windowmanagerimp.cpp b/games/openmw/files/patch-apps_openmw_mwgui_windowmanagerimp.cpp
deleted file mode 100644
index 6aa09505859f..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwgui_windowmanagerimp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/openmw/mwgui/windowmanagerimp.cpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwgui/windowmanagerimp.cpp
-@@ -2148,7 +2148,7 @@ namespace MWGui
- ResourceImageSetPointerFix* imgSetPointer = resource->castType<ResourceImageSetPointerFix>(false);
- if (!imgSetPointer)
- continue;
-- std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0,0).texture;
-+ auto tex_name = imgSetPointer->getImageSet()->getIndexInfo(0,0).texture;
-
- osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(tex_name);
-
diff --git a/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp b/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp
deleted file mode 100644
index fe61c1fc661e..000000000000
--- a/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/openmw/mwstate/charactermanager.hpp.orig 2023-08-08 09:23:20 UTC
-+++ apps/openmw/mwstate/charactermanager.hpp
-@@ -1,6 +1,8 @@
- #ifndef GAME_STATE_CHARACTERMANAGER_H
- #define GAME_STATE_CHARACTERMANAGER_H
-
-+#include <list>
-+
- #include <boost/filesystem/path.hpp>
-
- #include "character.hpp"
diff --git a/games/openmw/files/patch-components_bsa_bsa__file.cpp b/games/openmw/files/patch-components_bsa_bsa__file.cpp
deleted file mode 100644
index 0dcb26d6581f..000000000000
--- a/games/openmw/files/patch-components_bsa_bsa__file.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- components/bsa/bsa_file.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/bsa/bsa_file.cpp
-@@ -26,6 +26,7 @@
- #include <components/files/constrainedfilestream.hpp>
-
- #include <cassert>
-+#include <algorithm>
-
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/fstream.hpp>
diff --git a/games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp b/games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp
new file mode 100644
index 000000000000..7d1fc2f20462
--- /dev/null
+++ b/games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp
@@ -0,0 +1,29 @@
+--- components/crashcatcher/crashcatcher.cpp.orig 2025-07-01 11:41:15 UTC
++++ components/crashcatcher/crashcatcher.cpp
+@@ -95,6 +95,8 @@ namespace
+ { ILL_PRVREG, "Privileged register" },
+ { ILL_COPROC, "Coprocessor error" },
+ { ILL_BADSTK, "Internal stack error" },
++#else
++ { 0, nullptr },
+ #endif
+ };
+
+@@ -113,6 +115,8 @@ namespace
+ #ifndef __FreeBSD__
+ { SEGV_MAPERR, "Address not mapped to object" },
+ { SEGV_ACCERR, "Invalid permissions for mapped object" },
++#else
++ { 0, nullptr },
+ #endif
+ };
+
+@@ -121,6 +125,8 @@ namespace
+ { BUS_ADRALN, "Invalid address alignment" },
+ { BUS_ADRERR, "Non-existent physical address" },
+ { BUS_OBJERR, "Object specific hardware error" },
++#else
++ { 0, nullptr },
+ #endif
+ };
+
diff --git a/games/openmw/files/patch-components_esm3_variant.hpp b/games/openmw/files/patch-components_esm3_variant.hpp
new file mode 100644
index 000000000000..e861f8a3c7ef
--- /dev/null
+++ b/games/openmw/files/patch-components_esm3_variant.hpp
@@ -0,0 +1,10 @@
+--- components/esm3/variant.hpp.orig 2025-07-01 11:41:15 UTC
++++ components/esm3/variant.hpp
+@@ -5,6 +5,7 @@
+ #include <string>
+ #include <tuple>
+ #include <variant>
++#include <cstdint>
+
+ namespace ESM
+ {
diff --git a/games/openmw/files/patch-components_fontloader_fontloader.cpp b/games/openmw/files/patch-components_fontloader_fontloader.cpp
deleted file mode 100644
index e3e20265d062..000000000000
--- a/games/openmw/files/patch-components_fontloader_fontloader.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- components/fontloader/fontloader.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/fontloader/fontloader.cpp
-@@ -37,7 +37,7 @@ namespace
- MyGUI::xml::ElementEnumerator propertyIterator = resourceNode->getElementEnumerator();
- while (propertyIterator.next("Property"))
- {
-- std::string key = propertyIterator->findAttribute("key");
-+ auto key = propertyIterator->findAttribute("key");
-
- if (key == propertyName)
- {
-@@ -57,12 +57,12 @@ namespace
- MyGUI::xml::ElementEnumerator layersIterator = root->getElementEnumerator();
- while (layersIterator.next("Layer"))
- {
-- std::string name = layersIterator->findAttribute("name");
-+ auto name = layersIterator->findAttribute("name");
-
- if (name == "JournalBooks")
- {
- MyGUI::xml::ElementPtr sizeProperty = getProperty(layersIterator.current(), "Size");
-- const std::string& sizeValue = sizeProperty != nullptr ? sizeProperty->findAttribute("value") : std::string();
-+ auto sizeValue = sizeProperty != nullptr ? sizeProperty->findAttribute("value") : std::string_view();
- if (!sizeValue.empty())
- return MyGUI::IntSize::parse(sizeValue);
- }
-@@ -263,7 +263,7 @@ namespace Gui
- bool valid = false;
- if (resourceNode.next("Resource"))
- {
-- std::string type = resourceNode->findAttribute("type");
-+ auto type = resourceNode->findAttribute("type");
- valid = (type == "ResourceTrueTypeFont");
- }
-
-@@ -571,7 +571,7 @@ namespace Gui
- MyGUI::xml::ElementEnumerator resourceNode = _node->getElementEnumerator();
- while (resourceNode.next("Resource"))
- {
-- std::string type = resourceNode->findAttribute("type");
-+ auto type = resourceNode->findAttribute("type");
-
- if (Misc::StringUtils::ciEqual(type, "ResourceSkin") ||
- Misc::StringUtils::ciEqual(type, "AutoSizedResourceSkin"))
diff --git a/games/openmw/files/patch-components_myguiplatform_myguidatamanager.cpp b/games/openmw/files/patch-components_myguiplatform_myguidatamanager.cpp
deleted file mode 100644
index 38e11fad1b76..000000000000
--- a/games/openmw/files/patch-components_myguiplatform_myguidatamanager.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/myguiplatform/myguidatamanager.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/myguiplatform/myguidatamanager.cpp
-@@ -57,7 +57,7 @@ const MyGUI::VectorString &DataManager::getDataListNam
- throw std::runtime_error("DataManager::getDataListNames is not implemented - VFS is used");
- }
-
--const std::string &DataManager::getDataPath(const std::string &name) const
-+std::string DataManager::getDataPath(const std::string &name) const
- {
- static std::string result;
- result.clear();
diff --git a/games/openmw/files/patch-components_myguiplatform_myguidatamanager.hpp b/games/openmw/files/patch-components_myguiplatform_myguidatamanager.hpp
deleted file mode 100644
index f37bd1b59ff0..000000000000
--- a/games/openmw/files/patch-components_myguiplatform_myguidatamanager.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/myguiplatform/myguidatamanager.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/myguiplatform/myguidatamanager.hpp
-@@ -44,7 +44,7 @@ class DataManager : public MyGUI::DataManager (public)
- @param _name Resource name.
- @return Return full path to specified data.
- */
-- const std::string& getDataPath(const std::string& _name) const override;
-+ std::string getDataPath(const std::string& _name) const override;
-
- private:
- std::string mResourcePath;
diff --git a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp b/games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp
deleted file mode 100644
index dcc078307c8d..000000000000
--- a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/myguiplatform/myguiloglistener.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/myguiplatform/myguiloglistener.cpp
-@@ -25,7 +25,7 @@ namespace osgMyGUI
- mStream.flush();
- }
-
-- void CustomLogListener::log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line)
-+ void CustomLogListener::log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message, std::string_view _file, int _line)
- {
- if (mStream.is_open())
- {
diff --git a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp b/games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp
deleted file mode 100644
index acf183aec108..000000000000
--- a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/myguiplatform/myguiloglistener.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/myguiplatform/myguiloglistener.hpp
-@@ -28,7 +28,7 @@ namespace osgMyGUI
- void close() override;
- void flush() override;
-
-- void log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line) override;
-+ void log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message, std::string_view _file, int _line) override;
-
- const std::string& getFileName() const { return mFileName; }
-
diff --git a/games/openmw/files/patch-components_myguiplatform_myguirendermanager.hpp b/games/openmw/files/patch-components_myguiplatform_myguirendermanager.hpp
deleted file mode 100644
index e3e0782e7b0d..000000000000
--- a/games/openmw/files/patch-components_myguiplatform_myguirendermanager.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/myguiplatform/myguirendermanager.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/myguiplatform/myguirendermanager.hpp
-@@ -110,7 +110,7 @@ class RenderManager : public MyGUI::RenderManager, pub
- /** @see IRenderTarget::getInfo */
- const MyGUI::RenderTargetInfo& getInfo() const override { return mInfo; }
-
-- bool checkTexture(MyGUI::ITexture* _texture);
-+ bool checkTexture(MyGUI::ITexture* _texture) override;
-
- void setViewSize(int width, int height) override;
-
diff --git a/games/openmw/files/patch-components_myguiplatform_scalinglayer.cpp b/games/openmw/files/patch-components_myguiplatform_scalinglayer.cpp
deleted file mode 100644
index 32d8549ae89f..000000000000
--- a/games/openmw/files/patch-components_myguiplatform_scalinglayer.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- components/myguiplatform/scalinglayer.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/myguiplatform/scalinglayer.cpp
-@@ -126,8 +126,8 @@ namespace osgMyGUI
- {
- if (info->getName() == "Property")
- {
-- const std::string& key = info->findAttribute("key");
-- const std::string& value = info->findAttribute("value");
-+ const auto key = info->findAttribute("key");
-+ const auto value = info->findAttribute("value");
-
- if (key == "Size")
- {
diff --git a/games/openmw/files/patch-components_resource_imagemanager.cpp b/games/openmw/files/patch-components_resource_imagemanager.cpp
deleted file mode 100644
index 5064982f2abe..000000000000
--- a/games/openmw/files/patch-components_resource_imagemanager.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- components/resource/imagemanager.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/resource/imagemanager.cpp
-@@ -58,7 +58,7 @@ namespace Resource
-
- }
-
-- bool checkSupported(osg::Image* image, const std::string& filename)
-+ bool checkSupported(osg::Image* image)
- {
- switch(image->getPixelFormat())
- {
-@@ -83,7 +83,7 @@ namespace Resource
- return true;
- }
-
-- osg::ref_ptr<osg::Image> ImageManager::getImage(const std::string &filename, bool disableFlip)
-+ osg::ref_ptr<osg::Image> ImageManager::getImage(std::string_view filename, bool disableFlip)
- {
- const std::string normalized = mVFS->normalizeFilename(filename);
-
-@@ -147,7 +147,7 @@ namespace Resource
- osg::ref_ptr<osg::Image> image = result.getImage();
-
- image->setFileName(normalized);
-- if (!checkSupported(image, filename))
-+ if (!checkSupported(image))
- {
- static bool uncompress = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr);
- if (!uncompress)
diff --git a/games/openmw/files/patch-components_resource_imagemanager.hpp b/games/openmw/files/patch-components_resource_imagemanager.hpp
deleted file mode 100644
index b007c3cf7770..000000000000
--- a/games/openmw/files/patch-components_resource_imagemanager.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/resource/imagemanager.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/resource/imagemanager.hpp
-@@ -28,7 +28,7 @@ namespace Resource
-
- /// Create or retrieve an Image
- /// Returns the dummy image if the given image is not found.
-- osg::ref_ptr<osg::Image> getImage(const std::string& filename, bool disableFlip = false);
-+ osg::ref_ptr<osg::Image> getImage(std::string_view filename, bool disableFlip = false);
-
- osg::Image* getWarningImage();
-
diff --git a/games/openmw/files/patch-components_to__utf8_to__utf8.cpp b/games/openmw/files/patch-components_to__utf8_to__utf8.cpp
deleted file mode 100644
index 915b8e19f49a..000000000000
--- a/games/openmw/files/patch-components_to__utf8_to__utf8.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- components/to_utf8/to_utf8.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/to_utf8/to_utf8.cpp
-@@ -52,18 +52,18 @@ namespace
- return std::find_if(input.begin(), input.end(), [] (unsigned char v) { return v == 0 || v >= 128; });
- }
-
-- std::basic_string_view<signed char> getTranslationArray(FromType sourceEncoding)
-+ const signed char* getTranslationArray(FromType sourceEncoding)
- {
- switch (sourceEncoding)
- {
- case ToUTF8::WINDOWS_1252:
-- return {ToUTF8::windows_1252, std::size(ToUTF8::windows_1252)};
-+ return ToUTF8::windows_1252;
- case ToUTF8::WINDOWS_1250:
-- return {ToUTF8::windows_1250, std::size(ToUTF8::windows_1250)};
-+ return ToUTF8::windows_1250;
- case ToUTF8::WINDOWS_1251:
-- return {ToUTF8::windows_1251, std::size(ToUTF8::windows_1251)};
-+ return ToUTF8::windows_1251;
- case ToUTF8::CP437:
-- return {ToUTF8::cp437, std::size(ToUTF8::cp437)};
-+ return ToUTF8::cp437;
- }
- throw std::logic_error("Invalid source encoding: " + std::to_string(sourceEncoding));
- }
diff --git a/games/openmw/files/patch-components_to__utf8_to__utf8.hpp b/games/openmw/files/patch-components_to__utf8_to__utf8.hpp
deleted file mode 100644
index e5921c5604cf..000000000000
--- a/games/openmw/files/patch-components_to__utf8_to__utf8.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/to_utf8/to_utf8.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/to_utf8/to_utf8.hpp
-@@ -46,7 +46,7 @@ namespace ToUTF8
- inline std::pair<std::size_t, bool> getLengthLegacyEnc(std::string_view input) const;
- inline void copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const;
-
-- const std::basic_string_view<signed char> mTranslationArray;
-+ const signed char* mTranslationArray;
- };
-
- class Utf8Encoder
diff --git a/games/openmw/files/patch-components_widgets_box.cpp b/games/openmw/files/patch-components_widgets_box.cpp
deleted file mode 100644
index 19798e7fc48a..000000000000
--- a/games/openmw/files/patch-components_widgets_box.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
---- components/widgets/box.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/widgets/box.cpp
-@@ -7,7 +7,7 @@ namespace Gui
- {
- // TODO: Since 3.4.2 MyGUI is supposed to automatically translate tags
- // If the 3.4.2 become a required minimum version, the ComboBox class may be removed.
-- void ComboBox::setPropertyOverride(const std::string& _key, const std::string& _value)
-+ void ComboBox::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- #if MYGUI_VERSION >= MYGUI_DEFINE_VERSION(3,4,2)
- MyGUI::ComboBox::setPropertyOverride (_key, _value);
-@@ -61,7 +61,7 @@ namespace Gui
- notifySizeChange (this);
- }
-
-- void AutoSizedTextBox::setPropertyOverride(const std::string& _key, const std::string& _value)
-+ void AutoSizedTextBox::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- if (_key == "ExpandDirection")
- {
-@@ -123,7 +123,7 @@ namespace Gui
- setEditStatic(true);
- }
-
-- void AutoSizedEditBox::setPropertyOverride(const std::string& _key, const std::string& _value)
-+ void AutoSizedEditBox::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- if (_key == "ExpandDirection")
- {
-@@ -156,7 +156,7 @@ namespace Gui
- notifySizeChange (this);
- }
-
-- void AutoSizedButton::setPropertyOverride(const std::string& _key, const std::string& _value)
-+ void AutoSizedButton::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- if (_key == "ExpandDirection")
- {
-@@ -179,7 +179,7 @@ namespace Gui
- align();
- }
-
-- bool Box::_setPropertyImpl(const std::string& _key, const std::string& _value)
-+ bool Box::_setPropertyImpl(std::string_view _key, std::string_view _value)
- {
- if (_key == "Spacing")
- mSpacing = MyGUI::utility::parseValue<int>(_value);
-@@ -278,7 +278,7 @@ namespace Gui
- }
- }
-
-- void HBox::setPropertyOverride(const std::string& _key, const std::string& _value)
-+ void HBox::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- if (!Box::_setPropertyImpl (_key, _value))
- MyGUI::Widget::setPropertyOverride(_key, _value);
-@@ -433,7 +433,7 @@ namespace Gui
- }
- }
-
-- void VBox::setPropertyOverride(const std::string& _key, const std::string& _value)
-+ void VBox::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- if (!Box::_setPropertyImpl (_key, _value))
- MyGUI::Widget::setPropertyOverride(_key, _value);
diff --git a/games/openmw/files/patch-components_widgets_box.hpp b/games/openmw/files/patch-components_widgets_box.hpp
deleted file mode 100644
index 33932150339c..000000000000
--- a/games/openmw/files/patch-components_widgets_box.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
---- components/widgets/box.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/widgets/box.hpp
-@@ -16,7 +16,7 @@ namespace Gui
- MYGUI_RTTI_DERIVED( ComboBox )
-
- protected:
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
- };
-
- class Button : public FontWrapper<MyGUI::Button>
-@@ -58,7 +58,7 @@ namespace Gui
- void setCaption(const MyGUI::UString& _value) override;
-
- protected:
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
- std::string mFontSize;
- };
-
-@@ -74,7 +74,7 @@ namespace Gui
- void initialiseOverride() override;
-
- protected:
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
- int getWidth();
- std::string mFontSize;
- bool mShrink = false;
-@@ -91,7 +91,7 @@ namespace Gui
- void setCaption(const MyGUI::UString& _value) override;
-
- protected:
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
- std::string mFontSize;
- };
-
-@@ -111,7 +111,7 @@ namespace Gui
- protected:
- virtual void align() = 0;
-
-- virtual bool _setPropertyImpl(const std::string& _key, const std::string& _value);
-+ virtual bool _setPropertyImpl(std::string_view _key, std::string_view _value);
-
- int mSpacing; // how much space to put between elements
-
-@@ -143,7 +143,7 @@ namespace Gui
- void align() override;
- MyGUI::IntSize getRequestedSize() override;
-
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
-
- void onWidgetCreated(MyGUI::Widget* _widget) override;
- };
-@@ -162,7 +162,7 @@ namespace Gui
- void align() override;
- MyGUI::IntSize getRequestedSize() override;
-
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
-
- void onWidgetCreated(MyGUI::Widget* _widget) override;
- };
diff --git a/games/openmw/files/patch-components_widgets_fontwrapper.hpp b/games/openmw/files/patch-components_widgets_fontwrapper.hpp
deleted file mode 100644
index de1f6dae96db..000000000000
--- a/games/openmw/files/patch-components_widgets_fontwrapper.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- components/widgets/fontwrapper.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/widgets/fontwrapper.hpp
-@@ -11,14 +11,14 @@ namespace Gui
- class FontWrapper : public T
- {
- public:
-- void setFontName(const std::string& name) override
-+ void setFontName(std::string_view _value) override
- {
-- T::setFontName(name);
-+ T::setFontName(_value);
- T::setPropertyOverride ("FontHeight", getFontSize());
- }
-
- protected:
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override
- {
- T::setPropertyOverride (_key, _value);
-
diff --git a/games/openmw/files/patch-components_widgets_imagebutton.cpp b/games/openmw/files/patch-components_widgets_imagebutton.cpp
deleted file mode 100644
index 9887031881b5..000000000000
--- a/games/openmw/files/patch-components_widgets_imagebutton.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/widgets/imagebutton.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/widgets/imagebutton.cpp
-@@ -34,7 +34,7 @@ namespace Gui
- updateImage();
- }
-
-- void ImageButton::setPropertyOverride(const std::string &_key, const std::string &_value)
-+ void ImageButton::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- if (_key == "ImageHighlighted")
- mImageHighlighted = _value;
diff --git a/games/openmw/files/patch-components_widgets_imagebutton.hpp b/games/openmw/files/patch-components_widgets_imagebutton.hpp
deleted file mode 100644
index 617e49ac50ac..000000000000
--- a/games/openmw/files/patch-components_widgets_imagebutton.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/widgets/imagebutton.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/widgets/imagebutton.hpp
-@@ -31,7 +31,7 @@ namespace Gui
- static bool sDefaultNeedKeyFocus;
-
- protected:
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
- void onMouseLostFocus(MyGUI::Widget* _new) override;
- void onMouseSetFocus(MyGUI::Widget* _old) override;
- void onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id) override;
diff --git a/games/openmw/files/patch-components_widgets_list.cpp b/games/openmw/files/patch-components_widgets_list.cpp
deleted file mode 100644
index a39f2a13dc5b..000000000000
--- a/games/openmw/files/patch-components_widgets_list.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/widgets/list.cpp.orig 2023-08-08 09:23:20 UTC
-+++ components/widgets/list.cpp
-@@ -105,7 +105,7 @@ namespace Gui
- mScrollView->setViewOffset(MyGUI::IntPoint(0, -viewPosition));
- }
-
-- void MWList::setPropertyOverride(const std::string &_key, const std::string &_value)
-+ void MWList::setPropertyOverride(std::string_view _key, std::string_view _value)
- {
- if (_key == "ListItemSkin")
- mListItemSkin = _value;
diff --git a/games/openmw/files/patch-components_widgets_list.hpp b/games/openmw/files/patch-components_widgets_list.hpp
deleted file mode 100644
index d21eeb5a93b8..000000000000
--- a/games/openmw/files/patch-components_widgets_list.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/widgets/list.hpp.orig 2023-08-08 09:23:20 UTC
-+++ components/widgets/list.hpp
-@@ -48,7 +48,7 @@ namespace Gui
-
- void scrollToTop();
-
-- void setPropertyOverride(const std::string& _key, const std::string& _value) override;
-+ void setPropertyOverride(std::string_view _key, std::string_view _value) override;
-
- protected:
- void initialiseOverride() override;
diff --git a/games/openmw/files/patch-extern_sol3_sol_optional__implementation.hpp b/games/openmw/files/patch-extern_sol3_sol_optional__implementation.hpp
deleted file mode 100644
index ac31cf924f51..000000000000
--- a/games/openmw/files/patch-extern_sol3_sol_optional__implementation.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- extern/sol3/sol/optional_implementation.hpp.orig 2023-08-08 09:23:20 UTC
-+++ extern/sol3/sol/optional_implementation.hpp
-@@ -2191,7 +2191,8 @@ namespace sol {
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
- *this = nullopt;
-- this->construct(std::forward<Args>(args)...);
-+ new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
-+ return **this;
- }
-
- /// Swaps this optional with the other.
diff --git a/games/openmw/pkg-plist b/games/openmw/pkg-plist
index 25e2b3c2791c..a9016b9fcf86 100644
--- a/games/openmw/pkg-plist
+++ b/games/openmw/pkg-plist
@@ -13,7 +13,6 @@ bin/openmw-wizard
%%ETCDIR%%/defaults.bin
%%ETCDIR%%/gamecontrollerdb.txt
%%ETCDIR%%/openmw.cfg
-%%ETCDIR%%/version
share/applications/org.openmw.cs.desktop
share/applications/org.openmw.launcher.desktop
share/metainfo/openmw.appdata.xml
@@ -22,69 +21,115 @@ share/metainfo/openmw.appdata.xml
%%DATADIR%%/resources/lua_api/coroutine.doclua
%%DATADIR%%/resources/lua_api/global.doclua
%%DATADIR%%/resources/lua_api/math.doclua
+%%DATADIR%%/resources/lua_api/openmw/ambient.lua
+%%DATADIR%%/resources/lua_api/openmw/animation.lua
%%DATADIR%%/resources/lua_api/openmw/async.lua
+%%DATADIR%%/resources/lua_api/openmw/camera.lua
%%DATADIR%%/resources/lua_api/openmw/core.lua
%%DATADIR%%/resources/lua_api/openmw/debug.lua
+%%DATADIR%%/resources/lua_api/openmw/input.lua
+%%DATADIR%%/resources/lua_api/openmw/interfaces.lua
+%%DATADIR%%/resources/lua_api/openmw/markup.lua
+%%DATADIR%%/resources/lua_api/openmw/menu.lua
%%DATADIR%%/resources/lua_api/openmw/nearby.lua
%%DATADIR%%/resources/lua_api/openmw/postprocessing.lua
%%DATADIR%%/resources/lua_api/openmw/self.lua
+%%DATADIR%%/resources/lua_api/openmw/storage.lua
%%DATADIR%%/resources/lua_api/openmw/types.lua
%%DATADIR%%/resources/lua_api/openmw/ui.lua
%%DATADIR%%/resources/lua_api/openmw/util.lua
+%%DATADIR%%/resources/lua_api/openmw/vfs.lua
%%DATADIR%%/resources/lua_api/openmw/world.lua
%%DATADIR%%/resources/lua_api/string.doclua
%%DATADIR%%/resources/lua_api/table.doclua
%%DATADIR%%/resources/lua_libs/content.lua
%%DATADIR%%/resources/openmw.png
-%%DATADIR%%/resources/shaders/alpha.glsl
-%%DATADIR%%/resources/shaders/blended_depth_postpass_fragment.glsl
-%%DATADIR%%/resources/shaders/blended_depth_postpass_vertex.glsl
-%%DATADIR%%/resources/shaders/debug_fragment.glsl
-%%DATADIR%%/resources/shaders/debug_vertex.glsl
-%%DATADIR%%/resources/shaders/depth.glsl
-%%DATADIR%%/resources/shaders/fog.glsl
-%%DATADIR%%/resources/shaders/fullscreen_tri_fragment.glsl
-%%DATADIR%%/resources/shaders/fullscreen_tri_vertex.glsl
-%%DATADIR%%/resources/shaders/groundcover_fragment.glsl
-%%DATADIR%%/resources/shaders/groundcover_vertex.glsl
-%%DATADIR%%/resources/shaders/gui_fragment.glsl
-%%DATADIR%%/resources/shaders/gui_vertex.glsl
-%%DATADIR%%/resources/shaders/hdr_luminance_fragment.glsl
-%%DATADIR%%/resources/shaders/hdr_resolve_fragment.glsl
-%%DATADIR%%/resources/shaders/lighting.glsl
-%%DATADIR%%/resources/shaders/lighting_util.glsl
-%%DATADIR%%/resources/shaders/multiview_resolve_fragment.glsl
-%%DATADIR%%/resources/shaders/multiview_resolve_vertex.glsl
-%%DATADIR%%/resources/shaders/nv_default_fragment.glsl
-%%DATADIR%%/resources/shaders/nv_default_vertex.glsl
-%%DATADIR%%/resources/shaders/nv_nolighting_fragment.glsl
-%%DATADIR%%/resources/shaders/nv_nolighting_vertex.glsl
-%%DATADIR%%/resources/shaders/objects_fragment.glsl
-%%DATADIR%%/resources/shaders/objects_vertex.glsl
-%%DATADIR%%/resources/shaders/openmw_fragment.glsl
-%%DATADIR%%/resources/shaders/openmw_fragment.h.glsl
-%%DATADIR%%/resources/shaders/openmw_fragment_multiview.glsl
-%%DATADIR%%/resources/shaders/openmw_vertex.glsl
-%%DATADIR%%/resources/shaders/openmw_vertex.h.glsl
-%%DATADIR%%/resources/shaders/openmw_vertex_multiview.glsl
-%%DATADIR%%/resources/shaders/parallax.glsl
-%%DATADIR%%/resources/shaders/s360_fragment.glsl
-%%DATADIR%%/resources/shaders/s360_vertex.glsl
-%%DATADIR%%/resources/shaders/shadowcasting_fragment.glsl
-%%DATADIR%%/resources/shaders/shadowcasting_vertex.glsl
-%%DATADIR%%/resources/shaders/shadows_fragment.glsl
-%%DATADIR%%/resources/shaders/shadows_vertex.glsl
-%%DATADIR%%/resources/shaders/sky_fragment.glsl
-%%DATADIR%%/resources/shaders/sky_vertex.glsl
-%%DATADIR%%/resources/shaders/skypasses.glsl
-%%DATADIR%%/resources/shaders/softparticles.glsl
-%%DATADIR%%/resources/shaders/terrain_fragment.glsl
-%%DATADIR%%/resources/shaders/terrain_vertex.glsl
-%%DATADIR%%/resources/shaders/vertexcolors.glsl
-%%DATADIR%%/resources/shaders/water_fragment.glsl
-%%DATADIR%%/resources/shaders/water_nm.png
-%%DATADIR%%/resources/shaders/water_vertex.glsl
+%%DATADIR%%/resources/shaders/compatibility/bs/default.frag
+%%DATADIR%%/resources/shaders/compatibility/bs/default.vert
+%%DATADIR%%/resources/shaders/compatibility/bs/nolighting.frag
+%%DATADIR%%/resources/shaders/compatibility/bs/nolighting.vert
+%%DATADIR%%/resources/shaders/compatibility/debug.frag
+%%DATADIR%%/resources/shaders/compatibility/debug.vert
+%%DATADIR%%/resources/shaders/compatibility/depthclipped.frag
+%%DATADIR%%/resources/shaders/compatibility/depthclipped.vert
+%%DATADIR%%/resources/shaders/compatibility/fog.glsl
+%%DATADIR%%/resources/shaders/compatibility/fullscreen_tri.frag
+%%DATADIR%%/resources/shaders/compatibility/fullscreen_tri.vert
+%%DATADIR%%/resources/shaders/compatibility/groundcover.frag
+%%DATADIR%%/resources/shaders/compatibility/groundcover.vert
+%%DATADIR%%/resources/shaders/compatibility/gui.frag
+%%DATADIR%%/resources/shaders/compatibility/gui.vert
+%%DATADIR%%/resources/shaders/compatibility/luminance/luminance.frag
+%%DATADIR%%/resources/shaders/compatibility/luminance/resolve.frag
+%%DATADIR%%/resources/shaders/compatibility/multiview_resolve.frag
+%%DATADIR%%/resources/shaders/compatibility/multiview_resolve.vert
+%%DATADIR%%/resources/shaders/compatibility/normals.glsl
+%%DATADIR%%/resources/shaders/compatibility/objects.frag
+%%DATADIR%%/resources/shaders/compatibility/objects.vert
+%%DATADIR%%/resources/shaders/compatibility/ripples_blobber.frag
+%%DATADIR%%/resources/shaders/compatibility/ripples_simulate.frag
+%%DATADIR%%/resources/shaders/compatibility/shadowcasting.frag
+%%DATADIR%%/resources/shaders/compatibility/shadowcasting.vert
+%%DATADIR%%/resources/shaders/compatibility/shadows_fragment.glsl
+%%DATADIR%%/resources/shaders/compatibility/shadows_vertex.glsl
+%%DATADIR%%/resources/shaders/compatibility/sky.frag
+%%DATADIR%%/resources/shaders/compatibility/sky.vert
+%%DATADIR%%/resources/shaders/compatibility/terrain.frag
+%%DATADIR%%/resources/shaders/compatibility/terrain.vert
+%%DATADIR%%/resources/shaders/compatibility/vertexcolors.glsl
+%%DATADIR%%/resources/shaders/compatibility/water.frag
+%%DATADIR%%/resources/shaders/compatibility/water.vert
+%%DATADIR%%/resources/shaders/core/gui.frag
+%%DATADIR%%/resources/shaders/core/gui.vert
+%%DATADIR%%/resources/shaders/core/ripples_blobber.comp
+%%DATADIR%%/resources/shaders/core/ripples_simulate.comp
+%%DATADIR%%/resources/shaders/lib/core/fragment.glsl
+%%DATADIR%%/resources/shaders/lib/core/fragment.h.glsl
+%%DATADIR%%/resources/shaders/lib/core/fragment_multiview.glsl
+%%DATADIR%%/resources/shaders/lib/core/vertex.glsl
+%%DATADIR%%/resources/shaders/lib/core/vertex.h.glsl
+%%DATADIR%%/resources/shaders/lib/core/vertex_multiview.glsl
+%%DATADIR%%/resources/shaders/lib/light/lighting.glsl
+%%DATADIR%%/resources/shaders/lib/light/lighting_util.glsl
+%%DATADIR%%/resources/shaders/lib/luminance/constants.glsl
+%%DATADIR%%/resources/shaders/lib/material/alpha.glsl
+%%DATADIR%%/resources/shaders/lib/material/parallax.glsl
+%%DATADIR%%/resources/shaders/lib/particle/occlusion.glsl
+%%DATADIR%%/resources/shaders/lib/particle/soft.glsl
+%%DATADIR%%/resources/shaders/lib/sky/passes.glsl
+%%DATADIR%%/resources/shaders/lib/util/coordinates.glsl
+%%DATADIR%%/resources/shaders/lib/util/distortion.glsl
+%%DATADIR%%/resources/shaders/lib/util/quickstep.glsl
+%%DATADIR%%/resources/shaders/lib/view/depth.glsl
+%%DATADIR%%/resources/shaders/lib/water/fresnel.glsl
+%%DATADIR%%/resources/shaders/lib/water/rain_ripples.glsl
+%%DATADIR%%/resources/shaders/lib/water/ripples.glsl
+%%DATADIR%%/resources/translations/components_de.qm
+%%DATADIR%%/resources/translations/components_en.qm
+%%DATADIR%%/resources/translations/components_fr.qm
+%%DATADIR%%/resources/translations/components_ru.qm
+%%DATADIR%%/resources/translations/components_sv.qm
+%%DATADIR%%/resources/translations/launcher_de.qm
+%%DATADIR%%/resources/translations/launcher_en.qm
+%%DATADIR%%/resources/translations/launcher_fr.qm
+%%DATADIR%%/resources/translations/launcher_ru.qm
+%%DATADIR%%/resources/translations/launcher_sv.qm
+%%DATADIR%%/resources/translations/wizard_de.qm
+%%DATADIR%%/resources/translations/wizard_en.qm
+%%DATADIR%%/resources/translations/wizard_fr.qm
+%%DATADIR%%/resources/translations/wizard_ru.qm
+%%DATADIR%%/resources/translations/wizard_sv.qm
%%DATADIR%%/resources/version
+%%DATADIR%%/resources/vfs-mw/l10n/Calendar/de.yaml
+%%DATADIR%%/resources/vfs-mw/l10n/Calendar/en.yaml
+%%DATADIR%%/resources/vfs-mw/l10n/Calendar/fr.yaml
+%%DATADIR%%/resources/vfs-mw/l10n/Calendar/gmst.yaml
+%%DATADIR%%/resources/vfs-mw/l10n/Calendar/ru.yaml
+%%DATADIR%%/resources/vfs-mw/l10n/Calendar/sv.yaml
+%%DATADIR%%/resources/vfs-mw/l10n/Interface/gmst.yaml
+%%DATADIR%%/resources/vfs-mw/l10n/OMWEngine/gmst.yaml
+%%DATADIR%%/resources/vfs-mw/openmw_aux/calendarconfig.lua
+%%DATADIR%%/resources/vfs/animations/animation-config.yaml
%%DATADIR%%/resources/vfs/builtin.omwscripts
%%DATADIR%%/resources/vfs/fonts/DejaVuFontLicense.txt
%%DATADIR%%/resources/vfs/fonts/DejaVuLGCSansMono.omwfont
@@ -95,51 +140,40 @@ share/metainfo/openmw.appdata.xml
%%DATADIR%%/resources/vfs/fonts/MysticCards.omwfont
%%DATADIR%%/resources/vfs/fonts/MysticCards.ttf
%%DATADIR%%/resources/vfs/fonts/MysticCardsFontLicense.txt
-%%DATADIR%%/resources/vfs/l10n/BuiltInShaders/de.yaml
-%%DATADIR%%/resources/vfs/l10n/BuiltInShaders/en.yaml
-%%DATADIR%%/resources/vfs/l10n/BuiltInShaders/fr.yaml
-%%DATADIR%%/resources/vfs/l10n/BuiltInShaders/ru.yaml
-%%DATADIR%%/resources/vfs/l10n/BuiltInShaders/sv.yaml
%%DATADIR%%/resources/vfs/l10n/Calendar/de.yaml
%%DATADIR%%/resources/vfs/l10n/Calendar/en.yaml
-%%DATADIR%%/resources/vfs/l10n/Calendar/fr.yaml
%%DATADIR%%/resources/vfs/l10n/Calendar/ru.yaml
%%DATADIR%%/resources/vfs/l10n/Calendar/sv.yaml
-%%DATADIR%%/resources/vfs/l10n/DebugMenu/de.yaml
-%%DATADIR%%/resources/vfs/l10n/DebugMenu/en.yaml
-%%DATADIR%%/resources/vfs/l10n/DebugMenu/fr.yaml
-%%DATADIR%%/resources/vfs/l10n/DebugMenu/ru.yaml
-%%DATADIR%%/resources/vfs/l10n/DebugMenu/sv.yaml
%%DATADIR%%/resources/vfs/l10n/Interface/de.yaml
%%DATADIR%%/resources/vfs/l10n/Interface/en.yaml
%%DATADIR%%/resources/vfs/l10n/Interface/fr.yaml
%%DATADIR%%/resources/vfs/l10n/Interface/ru.yaml
%%DATADIR%%/resources/vfs/l10n/Interface/sv.yaml
-%%DATADIR%%/resources/vfs/l10n/Navigation/de.yaml
-%%DATADIR%%/resources/vfs/l10n/Navigation/en.yaml
-%%DATADIR%%/resources/vfs/l10n/Navigation/fr.yaml
-%%DATADIR%%/resources/vfs/l10n/Navigation/ru.yaml
-%%DATADIR%%/resources/vfs/l10n/Navigation/sv.yaml
%%DATADIR%%/resources/vfs/l10n/OMWCamera/de.yaml
%%DATADIR%%/resources/vfs/l10n/OMWCamera/en.yaml
%%DATADIR%%/resources/vfs/l10n/OMWCamera/fr.yaml
%%DATADIR%%/resources/vfs/l10n/OMWCamera/ru.yaml
%%DATADIR%%/resources/vfs/l10n/OMWCamera/sv.yaml
-%%DATADIR%%/resources/vfs/l10n/PostProcessing/de.yaml
-%%DATADIR%%/resources/vfs/l10n/PostProcessing/en.yaml
-%%DATADIR%%/resources/vfs/l10n/PostProcessing/fr.yaml
-%%DATADIR%%/resources/vfs/l10n/PostProcessing/ru.yaml
-%%DATADIR%%/resources/vfs/l10n/PostProcessing/sv.yaml
-%%DATADIR%%/resources/vfs/l10n/SavegameMenu/de.yaml
-%%DATADIR%%/resources/vfs/l10n/SavegameMenu/en.yaml
-%%DATADIR%%/resources/vfs/l10n/SavegameMenu/fr.yaml
-%%DATADIR%%/resources/vfs/l10n/SavegameMenu/ru.yaml
-%%DATADIR%%/resources/vfs/l10n/SavegameMenu/sv.yaml
-%%DATADIR%%/resources/vfs/l10n/SettingsMenu/de.yaml
-%%DATADIR%%/resources/vfs/l10n/SettingsMenu/en.yaml
-%%DATADIR%%/resources/vfs/l10n/SettingsMenu/fr.yaml
-%%DATADIR%%/resources/vfs/l10n/SettingsMenu/ru.yaml
-%%DATADIR%%/resources/vfs/l10n/SettingsMenu/sv.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWControls/de.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWControls/en.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWControls/fr.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWControls/ru.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWControls/sv.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWEngine/de.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWEngine/en.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWEngine/fr.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWEngine/ru.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWEngine/sv.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWMusic/de.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWMusic/en.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWMusic/fr.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWMusic/ru.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWMusic/sv.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWShaders/de.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWShaders/en.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWShaders/fr.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWShaders/ru.yaml
+%%DATADIR%%/resources/vfs/l10n/OMWShaders/sv.yaml
%%DATADIR%%/resources/vfs/mygui/OpenMWResourcePlugin.xml
%%DATADIR%%/resources/vfs/mygui/core.skin
%%DATADIR%%/resources/vfs/mygui/core.xml
@@ -227,9 +261,11 @@ share/metainfo/openmw.appdata.xml
%%DATADIR%%/resources/vfs/mygui/openmw_windows.skin.xml
%%DATADIR%%/resources/vfs/mygui/skins.xml
%%DATADIR%%/resources/vfs/openmw_aux/calendar.lua
+%%DATADIR%%/resources/vfs/openmw_aux/calendarconfig.lua
%%DATADIR%%/resources/vfs/openmw_aux/time.lua
%%DATADIR%%/resources/vfs/openmw_aux/ui.lua
%%DATADIR%%/resources/vfs/openmw_aux/util.lua
+%%DATADIR%%/resources/vfs/scripts/omw/activationhandlers.lua
%%DATADIR%%/resources/vfs/scripts/omw/ai.lua
%%DATADIR%%/resources/vfs/scripts/omw/camera/camera.lua
%%DATADIR%%/resources/vfs/scripts/omw/camera/first_person_auto_switch.lua
@@ -237,9 +273,23 @@ share/metainfo/openmw.appdata.xml
%%DATADIR%%/resources/vfs/scripts/omw/camera/move360.lua
%%DATADIR%%/resources/vfs/scripts/omw/camera/settings.lua
%%DATADIR%%/resources/vfs/scripts/omw/camera/third_person.lua
+%%DATADIR%%/resources/vfs/scripts/omw/cellhandlers.lua
%%DATADIR%%/resources/vfs/scripts/omw/console/global.lua
%%DATADIR%%/resources/vfs/scripts/omw/console/local.lua
+%%DATADIR%%/resources/vfs/scripts/omw/console/menu.lua
%%DATADIR%%/resources/vfs/scripts/omw/console/player.lua
+%%DATADIR%%/resources/vfs/scripts/omw/crimes.lua
+%%DATADIR%%/resources/vfs/scripts/omw/input/actionbindings.lua
+%%DATADIR%%/resources/vfs/scripts/omw/input/gamepadcontrols.lua
+%%DATADIR%%/resources/vfs/scripts/omw/input/playercontrols.lua
+%%DATADIR%%/resources/vfs/scripts/omw/input/settings.lua
+%%DATADIR%%/resources/vfs/scripts/omw/input/smoothmovement.lua
+%%DATADIR%%/resources/vfs/scripts/omw/mechanics/animationcontroller.lua
+%%DATADIR%%/resources/vfs/scripts/omw/mechanics/playercontroller.lua
+%%DATADIR%%/resources/vfs/scripts/omw/music/actor.lua
+%%DATADIR%%/resources/vfs/scripts/omw/music/helpers.lua
+%%DATADIR%%/resources/vfs/scripts/omw/music/music.lua
+%%DATADIR%%/resources/vfs/scripts/omw/music/settings.lua
%%DATADIR%%/resources/vfs/scripts/omw/mwui/borders.lua
%%DATADIR%%/resources/vfs/scripts/omw/mwui/constants.lua
%%DATADIR%%/resources/vfs/scripts/omw/mwui/filters.lua
@@ -249,12 +299,18 @@ share/metainfo/openmw.appdata.xml
%%DATADIR%%/resources/vfs/scripts/omw/mwui/textEdit.lua
%%DATADIR%%/resources/vfs/scripts/omw/settings/common.lua
%%DATADIR%%/resources/vfs/scripts/omw/settings/global.lua
+%%DATADIR%%/resources/vfs/scripts/omw/settings/menu.lua
%%DATADIR%%/resources/vfs/scripts/omw/settings/player.lua
-%%DATADIR%%/resources/vfs/scripts/omw/settings/render.lua
%%DATADIR%%/resources/vfs/scripts/omw/settings/renderers.lua
+%%DATADIR%%/resources/vfs/scripts/omw/skillhandlers.lua
+%%DATADIR%%/resources/vfs/scripts/omw/ui.lua
+%%DATADIR%%/resources/vfs/scripts/omw/usehandlers.lua
+%%DATADIR%%/resources/vfs/scripts/omw/worldeventhandlers.lua
%%DATADIR%%/resources/vfs/shaders/adjustments.omwfx
%%DATADIR%%/resources/vfs/shaders/bloomlinear.omwfx
%%DATADIR%%/resources/vfs/shaders/debug.omwfx
+%%DATADIR%%/resources/vfs/shaders/internal_distortion.omwfx
+%%DATADIR%%/resources/vfs/textures/omw/water_nm.png
%%DATADIR%%/resources/vfs/textures/omw_menu_scroll_center_h.dds
%%DATADIR%%/resources/vfs/textures/omw_menu_scroll_center_v.dds
%%DATADIR%%/resources/vfs/textures/omw_menu_scroll_down.dds
@@ -263,4 +319,3 @@ share/metainfo/openmw.appdata.xml
%%DATADIR%%/resources/vfs/textures/omw_menu_scroll_up.dds
share/pixmaps/openmw-cs.png
share/pixmaps/openmw.png
-@dir %%DATADIR%%/data