From a9c53ef8456b94dd7115afed514f59bb434b5a5f Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Sun, 3 Jul 2016 15:53:03 +0000 Subject: [PATCH] Update to version 0.39.0 Changelog: https://github.com/OpenMW/openmw/releases/tag/openmw-0.39.0 PR: 210729 Submitted by: Tobias Kortkamp (maintainer) --- games/openmw/Makefile | 10 +++++---- games/openmw/distinfo | 4 ++-- games/openmw/files/patch-CMakeLists.txt | 16 +++++++------- .../patch-apps_essimporter_converter.hpp | 11 ---------- ...atch-apps_essimporter_convertinventory.cpp | 21 ------------------ .../files/patch-apps_openmw_crashcatcher.cpp | 11 ---------- .../patch-apps_openmw_mwmechanics_spells.cpp | 11 ---------- .../patch-apps_openmw_mwmechanics_spells.hpp | 11 ---------- ...-apps_openmw_mwworld_projectilemanager.hpp | 10 --------- .../patch-apps_openmw_mwworld_refdata.hpp | 10 --------- .../patch-apps_openmw_mwworld_worldimp.cpp | 11 ---------- .../files/patch-apps_wizard_CMakeLists.txt | 4 ++-- .../files/patch-components_esm_spellstate.cpp | 22 ------------------- .../files/patch-components_esm_spellstate.hpp | 11 ---------- .../patch-components_resource_bulletshape.cpp | 10 --------- ...h-components_sceneutil_lightcontroller.cpp | 10 --------- games/openmw/pkg-plist | 10 +++++++++ 17 files changed, 28 insertions(+), 165 deletions(-) delete mode 100644 games/openmw/files/patch-apps_essimporter_converter.hpp delete mode 100644 games/openmw/files/patch-apps_essimporter_convertinventory.cpp delete mode 100644 games/openmw/files/patch-apps_openmw_crashcatcher.cpp delete mode 100644 games/openmw/files/patch-apps_openmw_mwmechanics_spells.cpp delete mode 100644 games/openmw/files/patch-apps_openmw_mwmechanics_spells.hpp delete mode 100644 games/openmw/files/patch-apps_openmw_mwworld_projectilemanager.hpp delete mode 100644 games/openmw/files/patch-apps_openmw_mwworld_refdata.hpp delete mode 100644 games/openmw/files/patch-apps_openmw_mwworld_worldimp.cpp delete mode 100644 games/openmw/files/patch-components_esm_spellstate.cpp delete mode 100644 games/openmw/files/patch-components_esm_spellstate.hpp delete mode 100644 games/openmw/files/patch-components_resource_bulletshape.cpp delete mode 100644 games/openmw/files/patch-components_sceneutil_lightcontroller.cpp diff --git a/games/openmw/Makefile b/games/openmw/Makefile index 57c519fcf0d2..06e8857c82eb 100644 --- a/games/openmw/Makefile +++ b/games/openmw/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openmw -PORTVERSION= 0.38.0 +PORTVERSION= 0.39.0 DISTVERSIONPREFIX= openmw- CATEGORIES= games @@ -24,10 +24,12 @@ BROKEN_FreeBSD_9= does not build USE_GITHUB= yes GH_ACCOUNT= OpenMW -USES= cmake:outsource compiler:c++11-lib ninja openal pkgconfig +USES= cmake:outsource compiler:c++14-lang ninja openal pkgconfig USE_GL= gl -USE_QT5= qmake_build buildtools_build core widgets network opengl +USE_QT5= qmake_build buildtools_build core gui network opengl \ + printsupport widgets USE_SDL= sdl2 +USE_XORG= xt CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \ -DDESIRED_QT_VERSION=5 \ @@ -37,7 +39,7 @@ CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \ -DBUILD_LAUNCHER=ON \ -DBUILD_MWINIIMPORTER=ON \ -DBUILD_ESSIMPORTER=ON \ - -DBUILD_OPENCS=OFF \ + -DBUILD_OPENCS=ON \ -DBUILD_WIZARD=ON \ -DBUILD_WITH_CODE_COVERAGE=OFF \ -DBUILD_UNITTEST=OFF \ diff --git a/games/openmw/distinfo b/games/openmw/distinfo index df3247afef13..64643a8e53d6 100644 --- a/games/openmw/distinfo +++ b/games/openmw/distinfo @@ -1,2 +1,2 @@ -SHA256 (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = c16a44ee9a787dcae61a373625d39733868d213fd6e8ccd86ab9e7ac00ecb85a -SIZE (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = 4137263 +SHA256 (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = b0d294b0814099bd93326f7b86dd84fb727d38dd536bf104272112e6d70ae720 +SIZE (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = 4764754 diff --git a/games/openmw/files/patch-CMakeLists.txt b/games/openmw/files/patch-CMakeLists.txt index 1cdb5a9926c8..4826b1c20c09 100644 --- a/games/openmw/files/patch-CMakeLists.txt +++ b/games/openmw/files/patch-CMakeLists.txt @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2016-01-12 16:11:28 UTC +--- CMakeLists.txt.orig 2016-06-30 21:09:52 UTC +++ CMakeLists.txt -@@ -224,7 +224,7 @@ if (USE_QT) - set (OSG_QT osgQt) +@@ -296,7 +296,7 @@ find_package(Boost REQUIRED COMPONENTS $ + find_package(SDL2 REQUIRED) + find_package(OpenAL REQUIRED) + find_package(Bullet REQUIRED) +-if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 283) ++if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 282) + message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later") endif() --find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX) -+find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX) - - include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}) - diff --git a/games/openmw/files/patch-apps_essimporter_converter.hpp b/games/openmw/files/patch-apps_essimporter_converter.hpp deleted file mode 100644 index 6fbbda295dda..000000000000 --- a/games/openmw/files/patch-apps_essimporter_converter.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/essimporter/converter.hpp.orig 2016-01-12 16:11:28 UTC -+++ apps/essimporter/converter.hpp -@@ -121,7 +121,7 @@ public: - { - mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel; - mContext->mPlayerBase = npc; -- std::map empty; -+ std::map empty; - // FIXME: player start spells and birthsign spells aren't listed here, - // need to fix openmw to account for this - for (std::vector::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it) diff --git a/games/openmw/files/patch-apps_essimporter_convertinventory.cpp b/games/openmw/files/patch-apps_essimporter_convertinventory.cpp deleted file mode 100644 index f125c76c2fac..000000000000 --- a/games/openmw/files/patch-apps_essimporter_convertinventory.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- apps/essimporter/convertinventory.cpp.orig 2016-01-12 16:11:28 UTC -+++ apps/essimporter/convertinventory.cpp -@@ -1,6 +1,7 @@ - #include "convertinventory.hpp" - - #include -+#include - - namespace ESSImport - { -@@ -15,8 +16,8 @@ namespace ESSImport - objstate.blank(); - objstate.mRef = *it; - objstate.mRef.mRefID = Misc::StringUtils::lowerCase(it->mId); -- objstate.mCount = std::abs(it->mCount); // restocking items have negative count in the savefile -- // openmw handles them differently, so no need to set any flags -+ objstate.mCount = abs(it->mCount); // restocking items have negative count in the savefile -+ // openmw handles them differently, so no need to set any flags - state.mItems.push_back(objstate); - if (it->mRelativeEquipmentSlot != -1) - // Note we should really write the absolute slot here, which we do not know about diff --git a/games/openmw/files/patch-apps_openmw_crashcatcher.cpp b/games/openmw/files/patch-apps_openmw_crashcatcher.cpp deleted file mode 100644 index b9fb65d0d69a..000000000000 --- a/games/openmw/files/patch-apps_openmw_crashcatcher.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/openmw/crashcatcher.cpp.orig 2016-01-12 16:11:28 UTC -+++ apps/openmw/crashcatcher.cpp -@@ -24,7 +24,7 @@ - #ifndef PR_SET_PTRACER - #define PR_SET_PTRACER 0x59616d61 - #endif --#elif defined (__APPLE__) -+#elif defined (__APPLE__) || defined (__FreeBSD__) - #include - #endif - diff --git a/games/openmw/files/patch-apps_openmw_mwmechanics_spells.cpp b/games/openmw/files/patch-apps_openmw_mwmechanics_spells.cpp deleted file mode 100644 index fb44a03c2226..000000000000 --- a/games/openmw/files/patch-apps_openmw_mwmechanics_spells.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/openmw/mwmechanics/spells.cpp.orig 2016-01-19 22:26:03 UTC -+++ apps/openmw/mwmechanics/spells.cpp -@@ -44,7 +44,7 @@ namespace MWMechanics - { - if (mSpells.find (spell)==mSpells.end()) - { -- std::map random; -+ std::map random; - - // Determine the random magnitudes (unless this is a castable spell, in which case - // they will be determined when the spell is cast) diff --git a/games/openmw/files/patch-apps_openmw_mwmechanics_spells.hpp b/games/openmw/files/patch-apps_openmw_mwmechanics_spells.hpp deleted file mode 100644 index 783633959495..000000000000 --- a/games/openmw/files/patch-apps_openmw_mwmechanics_spells.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/openmw/mwmechanics/spells.hpp.orig 2016-01-19 22:25:34 UTC -+++ apps/openmw/mwmechanics/spells.hpp -@@ -33,7 +33,7 @@ namespace MWMechanics - - typedef const ESM::Spell* SpellKey; - -- typedef std::map > TContainer; // ID, -+ typedef std::map > TContainer; // ID, - typedef TContainer::const_iterator TIterator; - - struct CorprusStats diff --git a/games/openmw/files/patch-apps_openmw_mwworld_projectilemanager.hpp b/games/openmw/files/patch-apps_openmw_mwworld_projectilemanager.hpp deleted file mode 100644 index b97c0287049c..000000000000 --- a/games/openmw/files/patch-apps_openmw_mwworld_projectilemanager.hpp +++ /dev/null @@ -1,10 +0,0 @@ ---- apps/openmw/mwworld/projectilemanager.hpp.orig 2016-01-12 16:11:28 UTC -+++ apps/openmw/mwworld/projectilemanager.hpp -@@ -3,6 +3,7 @@ - - #include - -+#include - #include - #include - diff --git a/games/openmw/files/patch-apps_openmw_mwworld_refdata.hpp b/games/openmw/files/patch-apps_openmw_mwworld_refdata.hpp deleted file mode 100644 index dcb7d7a5fca1..000000000000 --- a/games/openmw/files/patch-apps_openmw_mwworld_refdata.hpp +++ /dev/null @@ -1,10 +0,0 @@ ---- apps/openmw/mwworld/refdata.hpp.orig 2016-01-12 16:11:28 UTC -+++ apps/openmw/mwworld/refdata.hpp -@@ -5,6 +5,7 @@ - - #include "../mwscript/locals.hpp" - -+#include - #include - - namespace SceneUtil diff --git a/games/openmw/files/patch-apps_openmw_mwworld_worldimp.cpp b/games/openmw/files/patch-apps_openmw_mwworld_worldimp.cpp deleted file mode 100644 index e45e7dd8ced7..000000000000 --- a/games/openmw/files/patch-apps_openmw_mwworld_worldimp.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/openmw/mwworld/worldimp.cpp.orig 2016-01-12 16:11:28 UTC -+++ apps/openmw/mwworld/worldimp.cpp -@@ -108,7 +108,7 @@ namespace MWWorld - } - - private: -- typedef std::tr1::unordered_map LoadersContainer; -+ typedef std::unordered_map LoadersContainer; - LoadersContainer mLoaders; - }; - diff --git a/games/openmw/files/patch-apps_wizard_CMakeLists.txt b/games/openmw/files/patch-apps_wizard_CMakeLists.txt index a38664034e99..3461991c3b86 100644 --- a/games/openmw/files/patch-apps_wizard_CMakeLists.txt +++ b/games/openmw/files/patch-apps_wizard_CMakeLists.txt @@ -1,6 +1,6 @@ ---- apps/wizard/CMakeLists.txt.orig 2016-01-12 16:11:28 UTC +--- apps/wizard/CMakeLists.txt.orig 2016-04-06 11:40:42 UTC +++ apps/wizard/CMakeLists.txt -@@ -150,6 +150,7 @@ endif() +@@ -147,6 +147,7 @@ endif() # Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream if (UNIX AND NOT APPLE) diff --git a/games/openmw/files/patch-components_esm_spellstate.cpp b/games/openmw/files/patch-components_esm_spellstate.cpp deleted file mode 100644 index 10c272d5272b..000000000000 --- a/games/openmw/files/patch-components_esm_spellstate.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- components/esm/spellstate.cpp.orig 2016-01-12 16:11:28 UTC -+++ components/esm/spellstate.cpp -@@ -12,7 +12,7 @@ namespace ESM - { - std::string id = esm.getHString(); - -- std::map random; -+ std::map random; - while (esm.isNextSub("INDX")) - { - int index; -@@ -73,8 +73,8 @@ namespace ESM - { - esm.writeHNString("SPEL", it->first); - -- const std::map& random = it->second; -- for (std::map::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt) -+ const std::map& random = it->second; -+ for (std::map::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt) - { - esm.writeHNT("INDX", rIt->first); - esm.writeHNT("RAND", rIt->second); diff --git a/games/openmw/files/patch-components_esm_spellstate.hpp b/games/openmw/files/patch-components_esm_spellstate.hpp deleted file mode 100644 index 1acf7827f781..000000000000 --- a/games/openmw/files/patch-components_esm_spellstate.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- components/esm/spellstate.hpp.orig 2016-01-12 16:11:28 UTC -+++ components/esm/spellstate.hpp -@@ -28,7 +28,7 @@ namespace ESM - float mMagnitude; - }; - -- typedef std::map > TContainer; -+ typedef std::map > TContainer; - TContainer mSpells; - - std::map > mPermanentSpellEffects; diff --git a/games/openmw/files/patch-components_resource_bulletshape.cpp b/games/openmw/files/patch-components_resource_bulletshape.cpp deleted file mode 100644 index 1b1ba454fb51..000000000000 --- a/games/openmw/files/patch-components_resource_bulletshape.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- components/resource/bulletshape.cpp.orig 2016-01-12 16:11:28 UTC -+++ components/resource/bulletshape.cpp -@@ -1,6 +1,7 @@ - #include "bulletshape.hpp" - - #include -+#include - - #include - #include diff --git a/games/openmw/files/patch-components_sceneutil_lightcontroller.cpp b/games/openmw/files/patch-components_sceneutil_lightcontroller.cpp deleted file mode 100644 index 48cbf223226e..000000000000 --- a/games/openmw/files/patch-components_sceneutil_lightcontroller.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- components/sceneutil/lightcontroller.cpp.orig 2016-01-12 16:11:28 UTC -+++ components/sceneutil/lightcontroller.cpp -@@ -2,6 +2,7 @@ - - #include - -+#include - #include - - #include diff --git a/games/openmw/pkg-plist b/games/openmw/pkg-plist index a1eeb3886d57..f648960cfce9 100644 --- a/games/openmw/pkg-plist +++ b/games/openmw/pkg-plist @@ -1,15 +1,18 @@ bin/bsatool bin/esmtool bin/openmw +bin/openmw-cs bin/openmw-essimporter bin/openmw-iniimporter bin/openmw-launcher bin/openmw-wizard %%ETCDIR%%/gamecontrollerdb.txt +%%ETCDIR%%/openmw-cs.cfg %%ETCDIR%%/openmw.cfg %%ETCDIR%%/settings-default.cfg %%ETCDIR%%/version share/appdata/openmw.appdata.xml +share/applications/openmw-cs.desktop share/applications/openmw.desktop %%DATADIR%%/resources/defaultfilters %%DATADIR%%/resources/mygui/DejaVuLGCSansMono.ttf @@ -97,9 +100,16 @@ share/applications/openmw.desktop %%DATADIR%%/resources/mygui/openmw_wait_dialog_progressbar.layout %%DATADIR%%/resources/mygui/openmw_windows.skin.xml %%DATADIR%%/resources/mygui/skins.xml +%%DATADIR%%/resources/shaders/lighting.glsl +%%DATADIR%%/resources/shaders/objects_fragment.glsl +%%DATADIR%%/resources/shaders/objects_vertex.glsl +%%DATADIR%%/resources/shaders/parallax.glsl +%%DATADIR%%/resources/shaders/terrain_fragment.glsl +%%DATADIR%%/resources/shaders/terrain_vertex.glsl %%DATADIR%%/resources/shaders/water_fragment.glsl %%DATADIR%%/resources/shaders/water_nm.png %%DATADIR%%/resources/shaders/water_vertex.glsl %%DATADIR%%/resources/version +share/pixmaps/openmw-cs.png share/pixmaps/openmw.png @dir %%DATADIR%%/data