Attachment #171984 for bug #210729

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




# $FreeBSD$

PORTNAME=	openmw
PORTVERSION=	0.39.0
DISTVERSIONPREFIX=	openmw-
CATEGORIES=	games


USE_GITHUB=	yes
GH_ACCOUNT=	OpenMW

USES=		cmake:outsource compiler:c++14-lang ninja openal pkgconfig
USE_GL=		gl
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 \

		-DBUILD_LAUNCHER=ON \
		-DBUILD_MWINIIMPORTER=ON \
		-DBUILD_ESSIMPORTER=ON \
		-DBUILD_OPENCS=ON \
		-DBUILD_WIZARD=ON \
		-DBUILD_WITH_CODE_COVERAGE=OFF \
		-DBUILD_UNITTEST=OFF \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = c16a44ee9a787dcae61a373625d39733868d213fd6e8ccd86ab9e7ac00ecb85a	1	SHA256 (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = b0d294b0814099bd93326f7b86dd84fb727d38dd536bf104272112e6d70ae720
2	SIZE (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = 4137263	2	SIZE (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = 4764754




--- CMakeLists.txt.orig	2016-06-30 21:09:52 UTC
+++ CMakeLists.txt
@@ -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})
 

Lines 1-11 Link Here

(-)files/patch-apps_essimporter_converter.hpp (-11 lines)
1	--- apps/essimporter/converter.hpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/essimporter/converter.hpp
3	@@ -121,7 +121,7 @@ public:
4	{
5	mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
6	mContext->mPlayerBase = npc;
7	- std::map<const int, float> empty;
8	+ std::map<int, float> empty;
9	// FIXME: player start spells and birthsign spells aren't listed here,
10	// need to fix openmw to account for this
11	for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)




--- 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-11 Link Here

(-)files/patch-apps_openmw_crashcatcher.cpp (-11 lines)
1	--- apps/openmw/crashcatcher.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/openmw/crashcatcher.cpp
3	@@ -24,7 +24,7 @@
4	#ifndef PR_SET_PTRACER
5	#define PR_SET_PTRACER 0x59616d61
6	#endif
7	-#elif defined (__APPLE__)
8	+#elif defined (__APPLE__) \|\| defined (__FreeBSD__)
9	#include <signal.h>
10	#endif
11

Lines 1-11 Link Here

(-)files/patch-apps_openmw_mwmechanics_spells.cpp (-11 lines)
1	--- apps/openmw/mwmechanics/spells.cpp.orig 2016-01-19 22:26:03 UTC
2	+++ apps/openmw/mwmechanics/spells.cpp
3	@@ -44,7 +44,7 @@ namespace MWMechanics
4	{
5	if (mSpells.find (spell)==mSpells.end())
6	{
7	- std::map<const int, float> random;
8	+ std::map<int, float> random;
9
10	// Determine the random magnitudes (unless this is a castable spell, in which case
11	// they will be determined when the spell is cast)

Lines 1-11 Link Here

(-)files/patch-apps_openmw_mwmechanics_spells.hpp (-11 lines)
1	--- apps/openmw/mwmechanics/spells.hpp.orig 2016-01-19 22:25:34 UTC
2	+++ apps/openmw/mwmechanics/spells.hpp
3	@@ -33,7 +33,7 @@ namespace MWMechanics
4
5	typedef const ESM::Spell* SpellKey;
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;
10
11	struct CorprusStats

Lines 1-10 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-10 Link Here

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

Lines 1-11 Link Here

(-)files/patch-apps_openmw_mwworld_worldimp.cpp (-11 lines)
1	--- apps/openmw/mwworld/worldimp.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ apps/openmw/mwworld/worldimp.cpp
3	@@ -108,7 +108,7 @@ namespace MWWorld
4	}
5
6	private:
7	- typedef std::tr1::unordered_map<std::string, ContentLoader*> LoadersContainer;
8	+ typedef std::unordered_map<std::string, ContentLoader*> LoadersContainer;
9	LoadersContainer mLoaders;
10	};
11

Lines 1-6 Link Here

(-)files/patch-apps_wizard_CMakeLists.txt (-2 / +2 lines)
1	--- apps/wizard/CMakeLists.txt.orig 2016-01-12 16:11:28 UTC	1	--- apps/wizard/CMakeLists.txt.orig 2016-04-06 11:40:42 UTC
2	+++ apps/wizard/CMakeLists.txt	2	+++ apps/wizard/CMakeLists.txt
3	@@ -150,6 +150,7 @@ endif()	3	@@ -147,6 +147,7 @@ endif()
4		4
5	# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream	5	# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
6	if (UNIX AND NOT APPLE)	6	if (UNIX AND NOT APPLE)




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

Lines 1-11 Link Here

(-)files/patch-components_esm_spellstate.hpp (-11 lines)
1	--- components/esm/spellstate.hpp.orig 2016-01-12 16:11:28 UTC
2	+++ components/esm/spellstate.hpp
3	@@ -28,7 +28,7 @@ namespace ESM
4	float mMagnitude;
5	};
6
7	- typedef std::map<std::string, std::map<const int, float> > TContainer;
8	+ typedef std::map<std::string, std::map<int, float> > TContainer;
9	TContainer mSpells;
10
11	std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;

Lines 1-10 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-10 Link Here

(-)files/patch-components_sceneutil_lightcontroller.cpp (-10 lines)
1	--- components/sceneutil/lightcontroller.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ components/sceneutil/lightcontroller.cpp
3	@@ -2,6 +2,7 @@
4
5	#include <cmath>
6
7	+#include <osg/observer_ptr>
8	#include <osg/NodeVisitor>
9
10	#include <components/sceneutil/lightmanager.hpp>




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

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

Return to bug 210729

Lines 2-8 Link Here

(-)Makefile (-4 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openmw	4	PORTNAME= openmw
5	PORTVERSION= 0.38.0	5	PORTVERSION= 0.39.0
6	DISTVERSIONPREFIX= openmw-	6	DISTVERSIONPREFIX= openmw-
7	CATEGORIES= games	7	CATEGORIES= games
8		8
Lines 24-33 Link Here
24	USE_GITHUB= yes	24	USE_GITHUB= yes
25	GH_ACCOUNT= OpenMW	25	GH_ACCOUNT= OpenMW
26		26
27	USES= cmake:outsource compiler:c++11-lib ninja openal pkgconfig	27	USES= cmake:outsource compiler:c++14-lang ninja openal pkgconfig
28	USE_GL= gl	28	USE_GL= gl
29	USE_QT5= qmake_build buildtools_build core widgets network opengl	29	USE_QT5= qmake_build buildtools_build core gui network opengl printsupport widgets
30	USE_SDL= sdl2	30	USE_SDL= sdl2
		31	USE_XORG= xt
31		32
32	CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \	33	CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \
33	-DDESIRED_QT_VERSION=5 \	34	-DDESIRED_QT_VERSION=5 \
Lines 37-43 Link Here
37	-DBUILD_LAUNCHER=ON \	38	-DBUILD_LAUNCHER=ON \
38	-DBUILD_MWINIIMPORTER=ON \	39	-DBUILD_MWINIIMPORTER=ON \
39	-DBUILD_ESSIMPORTER=ON \	40	-DBUILD_ESSIMPORTER=ON \
40	-DBUILD_OPENCS=OFF \	41	-DBUILD_OPENCS=ON \
41	-DBUILD_WIZARD=ON \	42	-DBUILD_WIZARD=ON \
42	-DBUILD_WITH_CODE_COVERAGE=OFF \	43	-DBUILD_WITH_CODE_COVERAGE=OFF \
43	-DBUILD_UNITTEST=OFF \	44	-DBUILD_UNITTEST=OFF \

Lines 1-11 Link Here

(-)files/patch-CMakeLists.txt (-8 / +8 lines)
1	--- CMakeLists.txt.orig 2016-01-12 16:11:28 UTC	1	--- CMakeLists.txt.orig 2016-06-30 21:09:52 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -224,7 +224,7 @@ if (USE_QT)	3	@@ -296,7 +296,7 @@ find_package(Boost REQUIRED COMPONENTS $
4	set (OSG_QT osgQt)	4	find_package(SDL2 REQUIRED)
		5	find_package(OpenAL REQUIRED)
		6	find_package(Bullet REQUIRED)
		7	-if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 283)
		8	+if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 282)
		9	message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later")
5	endif()	10	endif()
6		11
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)
9
10	include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
11

Lines 1-21 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-22 Link Here

(-)files/patch-components_esm_spellstate.cpp (-22 lines)
1	--- components/esm/spellstate.cpp.orig 2016-01-12 16:11:28 UTC
2	+++ components/esm/spellstate.cpp
3	@@ -12,7 +12,7 @@ namespace ESM
4	{
5	std::string id = esm.getHString();
6
7	- std::map<const int, float> random;
8	+ std::map<int, float> random;
9	while (esm.isNextSub("INDX"))
10	{
11	int index;
12	@@ -73,8 +73,8 @@ namespace ESM
13	{
14	esm.writeHNString("SPEL", it->first);
15
16	- const std::map<const int, float>& random = it->second;
17	- for (std::map<const int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
18	+ const std::map<int, float>& random = it->second;
19	+ for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
20	{
21	esm.writeHNT("INDX", rIt->first);
22	esm.writeHNT("RAND", rIt->second);

Lines 1-15 Link Here

(-)pkg-plist (+10 lines)
1	bin/bsatool	1	bin/bsatool
2	bin/esmtool	2	bin/esmtool
3	bin/openmw	3	bin/openmw
		4	bin/openmw-cs
4	bin/openmw-essimporter	5	bin/openmw-essimporter
5	bin/openmw-iniimporter	6	bin/openmw-iniimporter
6	bin/openmw-launcher	7	bin/openmw-launcher
7	bin/openmw-wizard	8	bin/openmw-wizard
8	%%ETCDIR%%/gamecontrollerdb.txt	9	%%ETCDIR%%/gamecontrollerdb.txt
		10	%%ETCDIR%%/openmw-cs.cfg
9	%%ETCDIR%%/openmw.cfg	11	%%ETCDIR%%/openmw.cfg
10	%%ETCDIR%%/settings-default.cfg	12	%%ETCDIR%%/settings-default.cfg
11	%%ETCDIR%%/version	13	%%ETCDIR%%/version
12	share/appdata/openmw.appdata.xml	14	share/appdata/openmw.appdata.xml
		15	share/applications/openmw-cs.desktop
13	share/applications/openmw.desktop	16	share/applications/openmw.desktop
14	%%DATADIR%%/resources/defaultfilters	17	%%DATADIR%%/resources/defaultfilters
15	%%DATADIR%%/resources/mygui/DejaVuLGCSansMono.ttf	18	%%DATADIR%%/resources/mygui/DejaVuLGCSansMono.ttf
Lines 97-105 Link Here
97	%%DATADIR%%/resources/mygui/openmw_wait_dialog_progressbar.layout	100	%%DATADIR%%/resources/mygui/openmw_wait_dialog_progressbar.layout
98	%%DATADIR%%/resources/mygui/openmw_windows.skin.xml	101	%%DATADIR%%/resources/mygui/openmw_windows.skin.xml
99	%%DATADIR%%/resources/mygui/skins.xml	102	%%DATADIR%%/resources/mygui/skins.xml
		103	%%DATADIR%%/resources/shaders/lighting.glsl
		104	%%DATADIR%%/resources/shaders/objects_fragment.glsl
		105	%%DATADIR%%/resources/shaders/objects_vertex.glsl
		106	%%DATADIR%%/resources/shaders/parallax.glsl
		107	%%DATADIR%%/resources/shaders/terrain_fragment.glsl
		108	%%DATADIR%%/resources/shaders/terrain_vertex.glsl
100	%%DATADIR%%/resources/shaders/water_fragment.glsl	109	%%DATADIR%%/resources/shaders/water_fragment.glsl
101	%%DATADIR%%/resources/shaders/water_nm.png	110	%%DATADIR%%/resources/shaders/water_nm.png
102	%%DATADIR%%/resources/shaders/water_vertex.glsl	111	%%DATADIR%%/resources/shaders/water_vertex.glsl
103	%%DATADIR%%/resources/version	112	%%DATADIR%%/resources/version
		113	share/pixmaps/openmw-cs.png
104	share/pixmaps/openmw.png	114	share/pixmaps/openmw.png
105	@dir %%DATADIR%%/data	115	@dir %%DATADIR%%/data