Attachment 171984 Details for Bug 210729 – openmw.diff

[patch] openmw.diff

openmw.diff (text/plain), 17.73 KB, created by Tobias Kortkamp on 2016-06-30 22:27:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-06-30 22:27:49 UTC

Size: 17.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 417843)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	openmw
>-PORTVERSION=	0.38.0
>+PORTVERSION=	0.39.0
> DISTVERSIONPREFIX=	openmw-
> CATEGORIES=	games
> 
>@@ -24,10 +24,11 @@
> 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 +38,7 @@
> 		-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 \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 417843)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 417843)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -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})
>- 
>Index: files/patch-apps_essimporter_converter.hpp
>===================================================================
>--- files/patch-apps_essimporter_converter.hpp	(revision 417843)
>+++ files/patch-apps_essimporter_converter.hpp	(nonexistent)
>@@ -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<const int, float> empty;
>-+            std::map<int, float> empty;
>-             // FIXME: player start spells and birthsign spells aren't listed here,
>-             // need to fix openmw to account for this
>-             for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)
>
>Property changes on: files/patch-apps_essimporter_converter.hpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_essimporter_convertinventory.cpp
>===================================================================
>--- files/patch-apps_essimporter_convertinventory.cpp	(revision 417843)
>+++ files/patch-apps_essimporter_convertinventory.cpp	(nonexistent)
>@@ -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 <components/misc/stringops.hpp>
>-+#include <cstdlib>
>- 
>- 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
>
>Property changes on: files/patch-apps_essimporter_convertinventory.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_openmw_crashcatcher.cpp
>===================================================================
>--- files/patch-apps_openmw_crashcatcher.cpp	(revision 417843)
>+++ files/patch-apps_openmw_crashcatcher.cpp	(nonexistent)
>@@ -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 <signal.h>
>- #endif
>- 
>
>Property changes on: files/patch-apps_openmw_crashcatcher.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_openmw_mwmechanics_spells.cpp
>===================================================================
>--- files/patch-apps_openmw_mwmechanics_spells.cpp	(revision 417843)
>+++ files/patch-apps_openmw_mwmechanics_spells.cpp	(nonexistent)
>@@ -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<const int, float> random;
>-+            std::map<int, float> random;
>- 
>-             // Determine the random magnitudes (unless this is a castable spell, in which case
>-             // they will be determined when the spell is cast)
>
>Property changes on: files/patch-apps_openmw_mwmechanics_spells.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_openmw_mwmechanics_spells.hpp
>===================================================================
>--- files/patch-apps_openmw_mwmechanics_spells.hpp	(revision 417843)
>+++ files/patch-apps_openmw_mwmechanics_spells.hpp	(nonexistent)
>@@ -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<SpellKey, std::map<const int, float> > TContainer; // ID, <effect index, normalised random magnitude>
>-+            typedef std::map<SpellKey, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>
>-             typedef TContainer::const_iterator TIterator;
>- 
>-             struct CorprusStats
>
>Property changes on: files/patch-apps_openmw_mwmechanics_spells.hpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_openmw_mwworld_projectilemanager.hpp
>===================================================================
>--- files/patch-apps_openmw_mwworld_projectilemanager.hpp	(revision 417843)
>+++ files/patch-apps_openmw_mwworld_projectilemanager.hpp	(nonexistent)
>@@ -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 <string>
>- 
>-+#include <osg/observer_ptr>
>- #include <osg/ref_ptr>
>- #include <osg/PositionAttitudeTransform>
>- 
>
>Property changes on: files/patch-apps_openmw_mwworld_projectilemanager.hpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_openmw_mwworld_refdata.hpp
>===================================================================
>--- files/patch-apps_openmw_mwworld_refdata.hpp	(revision 417843)
>+++ files/patch-apps_openmw_mwworld_refdata.hpp	(nonexistent)
>@@ -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 <string>
>- #include <osg/Vec3f>
>- 
>- namespace SceneUtil
>
>Property changes on: files/patch-apps_openmw_mwworld_refdata.hpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_openmw_mwworld_worldimp.cpp
>===================================================================
>--- files/patch-apps_openmw_mwworld_worldimp.cpp	(revision 417843)
>+++ files/patch-apps_openmw_mwworld_worldimp.cpp	(nonexistent)
>@@ -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<std::string, ContentLoader*> LoadersContainer;
>-+          typedef std::unordered_map<std::string, ContentLoader*> LoadersContainer;
>-           LoadersContainer mLoaders;
>-     };
>- 
>
>Property changes on: files/patch-apps_openmw_mwworld_worldimp.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-apps_wizard_CMakeLists.txt
>===================================================================
>--- files/patch-apps_wizard_CMakeLists.txt	(revision 417843)
>+++ files/patch-apps_wizard_CMakeLists.txt	(working copy)
>@@ -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)
>Index: files/patch-components_esm_spellstate.cpp
>===================================================================
>--- files/patch-components_esm_spellstate.cpp	(revision 417843)
>+++ files/patch-components_esm_spellstate.cpp	(nonexistent)
>@@ -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<const int, float> random;
>-+            std::map<int, float> random;
>-             while (esm.isNextSub("INDX"))
>-             {
>-                 int index;
>-@@ -73,8 +73,8 @@ namespace ESM
>-         {
>-             esm.writeHNString("SPEL", it->first);
>- 
>--            const std::map<const int, float>& random = it->second;
>--            for (std::map<const int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
>-+            const std::map<int, float>& random = it->second;
>-+            for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
>-             {
>-                 esm.writeHNT("INDX", rIt->first);
>-                 esm.writeHNT("RAND", rIt->second);
>
>Property changes on: files/patch-components_esm_spellstate.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-components_esm_spellstate.hpp
>===================================================================
>--- files/patch-components_esm_spellstate.hpp	(revision 417843)
>+++ files/patch-components_esm_spellstate.hpp	(nonexistent)
>@@ -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<std::string, std::map<const int, float> > TContainer;
>-+        typedef std::map<std::string, std::map<int, float> > TContainer;
>-         TContainer mSpells;
>- 
>-         std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;
>
>Property changes on: files/patch-components_esm_spellstate.hpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-components_resource_bulletshape.cpp
>===================================================================
>--- files/patch-components_resource_bulletshape.cpp	(revision 417843)
>+++ files/patch-components_resource_bulletshape.cpp	(nonexistent)
>@@ -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 <stdexcept>
>-+#include <string>
>- 
>- #include <BulletCollision/CollisionShapes/btBoxShape.h>
>- #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
>
>Property changes on: files/patch-components_resource_bulletshape.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-components_sceneutil_lightcontroller.cpp
>===================================================================
>--- files/patch-components_sceneutil_lightcontroller.cpp	(revision 417843)
>+++ files/patch-components_sceneutil_lightcontroller.cpp	(nonexistent)
>@@ -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 <cmath>
>- 
>-+#include <osg/observer_ptr>
>- #include <osg/NodeVisitor>
>- 
>- #include <components/sceneutil/lightmanager.hpp>
>
>Property changes on: files/patch-components_sceneutil_lightcontroller.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 417843)
>+++ pkg-plist	(working copy)
>@@ -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 @@
> %%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

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 210729: 171984