Attachment #165977 for bug #206508

View | Details | Raw Unified | Return to bug 206508
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openmw	4	PORTNAME= openmw
5	PORTVERSION= 0.37.0	5	PORTVERSION= 0.38.0
6	DISTVERSIONPREFIX= openmw-	6	DISTVERSIONPREFIX= openmw-
7	CATEGORIES= games	7	CATEGORIES= games
8		8

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (OpenMW-openmw-openmw-0.37.0_GH0.tar.gz) = a2c4dd7926cf156d993e20a3914c1708c9c43d3fb8aae4c17ccf03d50beffc27	1	SHA256 (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = c16a44ee9a787dcae61a373625d39733868d213fd6e8ccd86ab9e7ac00ecb85a
2	SIZE (OpenMW-openmw-openmw-0.37.0_GH0.tar.gz) = 4118094	2	SIZE (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = 4137263




--- CMakeLists.txt.orig	2016-01-12 16:11:28 UTC
+++ CMakeLists.txt
@@ -224,7 +224,7 @@ if (USE_QT)
     set (OSG_QT osgQt)
 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})
 
 if(OSG_STATIC)

Lines 1-6 Link Here

(-)files/patch-apps_essimporter_converter.hpp (-2 / +2 lines)
1	--- apps/essimporter/converter.hpp.orig 2015-11-22 18:54:17 UTC	1	--- apps/essimporter/converter.hpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/essimporter/converter.hpp	2	+++ apps/essimporter/converter.hpp
3	@@ -118,7 +118,7 @@ public:	3	@@ -121,7 +121,7 @@ public:
4	{	4	{
5	mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;	5	mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
6	mContext->mPlayerBase = npc;	6	mContext->mPlayerBase = npc;




--- 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

Lines 1-4 Link Here

(-)files/patch-apps_openmw_crashcatcher.cpp (-1 / +1 lines)
1	--- apps/openmw/crashcatcher.cpp.orig 2015-11-24 02:42:35 UTC	1	--- apps/openmw/crashcatcher.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/openmw/crashcatcher.cpp	2	+++ apps/openmw/crashcatcher.cpp
3	@@ -24,7 +24,7 @@	3	@@ -24,7 +24,7 @@
4	#ifndef PR_SET_PTRACER	4	#ifndef PR_SET_PTRACER




--- apps/openmw/engine.cpp.orig	2015-11-24 02:42:35 UTC
+++ apps/openmw/engine.cpp
@@ -473,8 +473,9 @@ void OMW::Engine::prepareEngine (Setting
     }
 
     // find correct path to the game controller bindings
-    const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.cfg";
-    const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.cfg";
+    const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.txt";
+    const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.txt";
+
     std::string gameControllerdb;
     if (boost::filesystem::exists(localdefault))
         gameControllerdb = localdefault;

Lines 1-7 Link Here

(-)files/patch-apps_openmw_mwinput_inputmanagerimp.cpp (-3 / +18 lines)
1	--- apps/openmw/mwinput/inputmanagerimp.cpp.orig 2015-11-22 18:54:17 UTC	1	--- apps/openmw/mwinput/inputmanagerimp.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/openmw/mwinput/inputmanagerimp.cpp	2	+++ apps/openmw/mwinput/inputmanagerimp.cpp
3	@@ -374,6 +374,8 @@ namespace MWInput	3	@@ -119,11 +119,12 @@ namespace MWInput
		4	SDL_ControllerDeviceEvent evt;
		5	evt.which = i;
		6	controllerAdded(mFakeDeviceID, evt);
		7	- std::cout << "Detected game controller: " << SDL_GameControllerNameForIndex(i) << std::endl;
		8	+ //Bug in FreeBSD's SDL? SDL_GameControllerNameForIndex returns NULL
		9	+ std::cout << "Detected game controller" << std::endl;
		10	}
		11	else
4	{	12	{
		13	- std::cout << "Detected unusable controller: " << SDL_JoystickNameForIndex(i) << std::endl;
		14	+ //std::cout << "Detected unusable controller: " << SDL_JoystickNameForIndex(i) << std::endl;
		15	}
		16	}
		17
		18	@@ -389,6 +390,8 @@ namespace MWInput
		19	{
5	float xAxis = mInputBinder->getChannel(A_MoveLeftRight)->getValue()*2.0f-1.0f;	20	float xAxis = mInputBinder->getChannel(A_MoveLeftRight)->getValue()*2.0f-1.0f;
6	float yAxis = mInputBinder->getChannel(A_MoveForwardBackward)->getValue()*2.0f-1.0f;	21	float yAxis = mInputBinder->getChannel(A_MoveForwardBackward)->getValue()*2.0f-1.0f;
7	+ if (mInvertY)	22	+ if (mInvertY)
Lines 9-15 Link Here
9	float zAxis = mInputBinder->getChannel(A_LookUpDown)->getValue()*2.0f-1.0f;	24	float zAxis = mInputBinder->getChannel(A_LookUpDown)->getValue()*2.0f-1.0f;
10	const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();	25	const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
11		26
12	@@ -441,13 +443,13 @@ namespace MWInput	27	@@ -456,13 +459,13 @@ namespace MWInput
13	{	28	{
14	triedToMove = true;	29	triedToMove = true;
15	mPlayer->setAutoMove (false);	30	mPlayer->setAutoMove (false);

Lines 1-8 Link Here

(-)files/patch-apps_openmw_mwmechanics_spells.cpp (-3 / +3 lines)
1	--- apps/openmw/mwmechanics/spells.cpp.orig 2015-11-24 02:42:35 UTC	1	--- apps/openmw/mwmechanics/spells.cpp.orig 2016-01-19 22:26:03 UTC
2	+++ apps/openmw/mwmechanics/spells.cpp	2	+++ apps/openmw/mwmechanics/spells.cpp
3	@@ -29,7 +29,7 @@ namespace MWMechanics	3	@@ -44,7 +44,7 @@ namespace MWMechanics
4	{	4	{
5	if (mSpells.find (spell->mId)==mSpells.end())	5	if (mSpells.find (spell)==mSpells.end())
6	{	6	{
7	- std::map<const int, float> random;	7	- std::map<const int, float> random;
8	+ std::map<int, float> random;	8	+ std::map<int, float> random;




--- apps/openmw/mwmechanics/spells.hpp.orig	2016-01-19 22:25:34 UTC
+++ apps/openmw/mwmechanics/spells.hpp
@@ -33,7 +33,7 @@ namespace MWMechanics
     {
         public:
 
             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

Line 0 Link Here

(-)files/patch-apps_openmw_mwworld_projectilemanager.hpp (+10 lines)
	1	--- apps/openmw/mwworld/projectilemanager.hpp.orig 2016-01-12 16:11:28 UTC
	2	+++ apps/openmw/mwworld/projectilemanager.hpp
	3	@@ -3,6 +3,7 @@
	4
	5	#include <string>
	6
	7	+#include <osg/observer_ptr>
	8	#include <osg/ref_ptr>
	9	#include <osg/PositionAttitudeTransform>
	10

Lines 1-4 Link Here

(-)files/patch-apps_openmw_mwworld_refdata.hpp (-2 / +2 lines)
1	--- apps/openmw/mwworld/refdata.hpp.orig 2015-11-22 18:54:17 UTC	1	--- apps/openmw/mwworld/refdata.hpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/openmw/mwworld/refdata.hpp	2	+++ apps/openmw/mwworld/refdata.hpp
3	@@ -5,6 +5,7 @@	3	@@ -5,6 +5,7 @@
4		4
Lines 7-10 Link Here
7	+#include <string>	7	+#include <string>
8	#include <osg/Vec3f>	8	#include <osg/Vec3f>
9		9
10	namespace osg	10	namespace SceneUtil




--- apps/openmw/mwworld/weather.cpp.orig	2015-11-22 18:54:17 UTC
+++ apps/openmw/mwworld/weather.cpp
@@ -95,9 +95,10 @@ T TimeOfDayInterpolator<T>::getValue(con
 }
 
 
-
-template class TimeOfDayInterpolator<float>;
-template class TimeOfDayInterpolator<osg::Vec4f>;
+namespace MWWorld {
+    template class TimeOfDayInterpolator<float>;
+    template class TimeOfDayInterpolator<osg::Vec4f>;
+};
 
 Weather::Weather(const std::string& name,
                  const MWWorld::Fallback& fallback,
@@ -1133,4 +1134,3 @@ inline void WeatherManager::calculateTra
         mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
     }
 }
-

Lines 1-4 Link Here

(-)files/patch-apps_openmw_mwworld_worldimp.cpp (-1 / +1 lines)
1	--- apps/openmw/mwworld/worldimp.cpp.orig 2015-11-22 18:54:17 UTC	1	--- apps/openmw/mwworld/worldimp.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/openmw/mwworld/worldimp.cpp	2	+++ apps/openmw/mwworld/worldimp.cpp
3	@@ -108,7 +108,7 @@ namespace MWWorld	3	@@ -108,7 +108,7 @@ namespace MWWorld
4	}	4	}

Lines 1-4 Link Here

(-)files/patch-apps_wizard_CMakeLists.txt (-1 / +1 lines)
1	--- apps/wizard/CMakeLists.txt.orig 2015-11-24 02:42:35 UTC	1	--- apps/wizard/CMakeLists.txt.orig 2016-01-12 16:11:28 UTC
2	+++ apps/wizard/CMakeLists.txt	2	+++ apps/wizard/CMakeLists.txt
3	@@ -150,6 +150,7 @@ endif()	3	@@ -150,6 +150,7 @@ endif()
4		4

Lines 1-4 Link Here

(-)files/patch-components_esm_spellstate.cpp (-1 / +1 lines)
1	--- components/esm/spellstate.cpp.orig 2015-11-24 02:42:35 UTC	1	--- components/esm/spellstate.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ components/esm/spellstate.cpp	2	+++ components/esm/spellstate.cpp
3	@@ -12,7 +12,7 @@ namespace ESM	3	@@ -12,7 +12,7 @@ namespace ESM
4	{	4	{

Lines 1-4 Link Here

(-)files/patch-components_esm_spellstate.hpp (-1 / +1 lines)
1	--- components/esm/spellstate.hpp.orig 2015-11-24 02:42:35 UTC	1	--- components/esm/spellstate.hpp.orig 2016-01-12 16:11:28 UTC
2	+++ components/esm/spellstate.hpp	2	+++ components/esm/spellstate.hpp
3	@@ -28,7 +28,7 @@ namespace ESM	3	@@ -28,7 +28,7 @@ namespace ESM
4	float mMagnitude;	4	float mMagnitude;




--- components/files/configurationmanager.hpp.orig	2015-11-24 02:42:35 UTC
+++ components/files/configurationmanager.hpp
@@ -52,11 +52,7 @@ struct ConfigurationManager
         typedef Files::FixedPath<> FixedPathType;
 
         typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
-    #if defined HAVE_UNORDERED_MAP
         typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
-    #else
-        typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
-    #endif
 
         void loadConfig(const boost::filesystem::path& path,
             boost::program_options::variables_map& variables,

Line 0 Link Here

(-)files/patch-components_resource_bulletshape.cpp (+10 lines)
	1	--- components/resource/bulletshape.cpp.orig 2016-01-12 16:11:28 UTC
	2	+++ components/resource/bulletshape.cpp
	3	@@ -1,6 +1,7 @@
	4	#include "bulletshape.hpp"
	5
	6	#include <stdexcept>
	7	+#include <string>
	8
	9	#include <BulletCollision/CollisionShapes/btBoxShape.h>
	10	#include <BulletCollision/CollisionShapes/btTriangleMesh.h>

Lines 1-4 Link Here

(-)files/patch-components_sceneutil_lightcontroller.cpp (-1 / +1 lines)
1	--- components/sceneutil/lightcontroller.cpp.orig 2015-11-24 02:42:35 UTC	1	--- components/sceneutil/lightcontroller.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ components/sceneutil/lightcontroller.cpp	2	+++ components/sceneutil/lightcontroller.cpp
3	@@ -2,6 +2,7 @@	3	@@ -2,6 +2,7 @@
4		4

Lines 1-4 Link Here

(-)files/patch-files_gamecontrollerdb.txt (-1 / +1 lines)
1	--- files/gamecontrollerdb.txt.orig 2015-11-24 02:42:35 UTC	1	--- files/gamecontrollerdb.txt.orig 2016-01-12 16:11:28 UTC
2	+++ files/gamecontrollerdb.txt	2	+++ files/gamecontrollerdb.txt
3	@@ -99,3 +99,7 @@ ff113133000000000000504944564944,SVEN X-	3	@@ -99,3 +99,7 @@ ff113133000000000000504944564944,SVEN X-
4	05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,	4	05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,

Return to bug 206508

Lines 1-11 Link Here

(-)files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2015-11-22 18:54:17 UTC	1	--- CMakeLists.txt.orig 2016-01-12 16:11:28 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -191,7 +191,7 @@ IF(BOOST_STATIC)	3	@@ -224,7 +224,7 @@ if (USE_QT)
4	set(Boost_USE_STATIC_LIBS ON)	4	set (OSG_QT osgQt)
5	endif()	5	endif()
6		6
7	-find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgQt osgUtil osgFX)	7	-find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX)
8	+find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX)	8	+find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX)
		9
9	include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})	10	include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
10		11
11	if(OSG_STATIC)

Line 0 Link Here

(-)files/patch-apps_essimporter_convertinventory.cpp (+21 lines)
	1	--- apps/essimporter/convertinventory.cpp.orig 2016-01-12 16:11:28 UTC
	2	+++ apps/essimporter/convertinventory.cpp
	3	@@ -1,6 +1,7 @@
	4	#include "convertinventory.hpp"
	5
	6	#include <components/misc/stringops.hpp>
	7	+#include <cstdlib>
	8
	9	namespace ESSImport
	10	{
	11	@@ -15,8 +16,8 @@ namespace ESSImport
	12	objstate.blank();
	13	objstate.mRef = *it;
	14	objstate.mRef.mRefID = Misc::StringUtils::lowerCase(it->mId);
	15	- objstate.mCount = std::abs(it->mCount); // restocking items have negative count in the savefile
	16	- // openmw handles them differently, so no need to set any flags
	17	+ objstate.mCount = abs(it->mCount); // restocking items have negative count in the savefile
	18	+ // openmw handles them differently, so no need to set any flags
	19	state.mItems.push_back(objstate);
	20	if (it->mRelativeEquipmentSlot != -1)
	21	// Note we should really write the absolute slot here, which we do not know about

Lines 1-14 Link Here

(-)files/patch-apps_openmw_engine.cpp (-14 lines)
1	--- apps/openmw/engine.cpp.orig 2015-11-24 02:42:35 UTC
2	+++ apps/openmw/engine.cpp
3	@@ -473,8 +473,9 @@ void OMW::Engine::prepareEngine (Setting
4	}
5
6	// find correct path to the game controller bindings
7	- const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.cfg";
8	- const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.cfg";
9	+ const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.txt";
10	+ const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.txt";
11	+
12	std::string gameControllerdb;
13	if (boost::filesystem::exists(localdefault))
14	gameControllerdb = localdefault;

Lines 1-11 Link Here

(-)files/patch-apps_openmw_mwmechanics_spells.hpp (-6 / +6 lines)
1	--- apps/openmw/mwmechanics/spells.hpp.orig 2015-11-24 02:42:35 UTC	1	--- apps/openmw/mwmechanics/spells.hpp.orig 2016-01-19 22:25:34 UTC
2	+++ apps/openmw/mwmechanics/spells.hpp	2	+++ apps/openmw/mwmechanics/spells.hpp
3	@@ -31,7 +31,7 @@ namespace MWMechanics	3	@@ -33,7 +33,7 @@ namespace MWMechanics
4	{
5	public:
6		4
7	- typedef std::map<std::string, std::map<const int, float> > TContainer; // ID, <effect index, normalised random magnitude>	5	typedef const ESM::Spell* SpellKey;
8	+ typedef std::map<std::string, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>	6
		7	- typedef std::map<SpellKey, std::map<const int, float> > TContainer; // ID, <effect index, normalised random magnitude>
		8	+ typedef std::map<SpellKey, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>
9	typedef TContainer::const_iterator TIterator;	9	typedef TContainer::const_iterator TIterator;
10		10
11	struct CorprusStats	11	struct CorprusStats

Lines 1-21 Link Here

(-)files/patch-apps_openmw_mwworld_weather.cpp (-21 lines)
1	--- apps/openmw/mwworld/weather.cpp.orig 2015-11-22 18:54:17 UTC
2	+++ apps/openmw/mwworld/weather.cpp
3	@@ -95,9 +95,10 @@ T TimeOfDayInterpolator<T>::getValue(con
4	}
5
6
7	-
8	-template class TimeOfDayInterpolator<float>;
9	-template class TimeOfDayInterpolator<osg::Vec4f>;
10	+namespace MWWorld {
11	+ template class TimeOfDayInterpolator<float>;
12	+ template class TimeOfDayInterpolator<osg::Vec4f>;
13	+};
14
15	Weather::Weather(const std::string& name,
16	const MWWorld::Fallback& fallback,
17	@@ -1133,4 +1134,3 @@ inline void WeatherManager::calculateTra
18	mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
19	}
20	}
21	-

Lines 1-14 Link Here

(-)files/patch-components_files_configurationmanager.hpp (-14 lines)
1	--- components/files/configurationmanager.hpp.orig 2015-11-24 02:42:35 UTC
2	+++ components/files/configurationmanager.hpp
3	@@ -52,11 +52,7 @@ struct ConfigurationManager
4	typedef Files::FixedPath<> FixedPathType;
5
6	typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
7	- #if defined HAVE_UNORDERED_MAP
8	typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
9	- #else
10	- typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
11	- #endif
12
13	void loadConfig(const boost::filesystem::path& path,
14	boost::program_options::variables_map& variables,