kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

games/openmw: Update to openmw-0.46.0

Browse source 
Changes:	https://github.com/OpenMW/openmw/releases/tag/openmw-0.46.0
This commit is contained in:
Tobias Kortkamp 2020-06-09 15:51:12 +00:00
parent d6d0160981
commit 1ea806ecfa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=538322
15 changed files with 18 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
games/openmw/Makefile
View file

@ -3,13 +3,9 @@
PORTNAME= openmw
DISTVERSIONPREFIX= openmw-
DISTVERSION= 0.45.0
PORTREVISION= 9
DISTVERSION= 0.46.0
CATEGORIES= games
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES= a78d98df273e266c05c73837a5961fbf6a875ccf.patch:-p1
MAINTAINER= tobik@FreeBSD.org
COMMENT= Unofficial open source engine reimplementation of the game Morrowind
@ -27,9 +23,9 @@ USES= cmake compiler:c++14-lang gl openal pkgconfig qt:5 sdl xorg
USE_GITHUB= yes
GH_ACCOUNT= OpenMW
USE_GL= gl
USE_SDL= sdl2
USE_QT= core gui network opengl printsupport widgets buildtools_build \
qmake_build
USE_SDL= sdl2
CMAKE_ARGS= -DDESIRED_QT_VERSION=5 \
-DGLOBAL_DATA_PATH="${PREFIX}/share" \

8
games/openmw/distinfo
View file

@ -1,5 +1,3 @@
TIMESTAMP = 1553179501
SHA256 (OpenMW-openmw-openmw-0.45.0_GH0.tar.gz) = b63cf971f406ef5f28019f65e9e2bd9641a227459ede45d147562917f67e1c64
SIZE (OpenMW-openmw-openmw-0.45.0_GH0.tar.gz) = 4711103
SHA256 (a78d98df273e266c05c73837a5961fbf6a875ccf.patch) = 8699417cfc00b305dccaba11f97e8462b57323990001a0409d4c5f8b44d15f86
SIZE (a78d98df273e266c05c73837a5961fbf6a875ccf.patch) = 4879
TIMESTAMP = 1591668250
SHA256 (OpenMW-openmw-openmw-0.46.0_GH0.tar.gz) = 07a35a8f15f67f5aa7210c2a307a6db5660a9b61fe34983c35b172c8671afd58
SIZE (OpenMW-openmw-openmw-0.46.0_GH0.tar.gz) = 5155004

10
games/openmw/files/patch-apps_openmw_mwgui_alchemywindow.hpp
View file

@ -1,10 +0,0 @@
--- apps/openmw/mwgui/alchemywindow.hpp.orig 2019-05-07 12:08:49 UTC
+++ apps/openmw/mwgui/alchemywindow.hpp
@@ -1,6 +1,7 @@
#ifndef MWGUI_ALCHEMY_H
#define MWGUI_ALCHEMY_H
+#include <memory>
#include <vector>
#include <MyGUI_ControllerManager.h>

10
games/openmw/files/patch-apps_openmw_mwgui_bookpage.hpp
View file

@ -1,10 +0,0 @@
--- apps/openmw/mwgui/bookpage.hpp.orig 2019-05-07 12:12:37 UTC
+++ apps/openmw/mwgui/bookpage.hpp
@@ -6,6 +6,7 @@
#include "MyGUI_FontManager.h"
#include <functional>
+#include <memory>
#include <stdint.h>
#include <components/settings/settings.hpp>

11
games/openmw/files/patch-apps_openmw_mwgui_loadingscreen.hpp
View file

@ -1,11 +0,0 @@
--- apps/openmw/mwgui/loadingscreen.hpp.orig 2019-05-07 12:33:38 UTC
+++ apps/openmw/mwgui/loadingscreen.hpp
@@ -1,6 +1,8 @@
#ifndef MWGUI_LOADINGSCREEN_H
#define MWGUI_LOADINGSCREEN_H
+#include <memory>
+
#include <osg/Timer>
#include <osg/ref_ptr>

10
games/openmw/files/patch-apps_openmw_mwgui_mapwindow.hpp
View file

@ -1,10 +0,0 @@
--- apps/openmw/mwgui/mapwindow.hpp.orig 2019-05-07 12:05:04 UTC
+++ apps/openmw/mwgui/mapwindow.hpp
@@ -1,6 +1,7 @@
#ifndef MWGUI_MAPWINDOW_H
#define MWGUI_MAPWINDOW_H
+#include <memory>
#include <stdint.h>
#include "windowpinnablebase.hpp"

10
games/openmw/files/patch-apps_openmw_mwgui_race.hpp
View file

@ -1,10 +0,0 @@
--- apps/openmw/mwgui/race.hpp.orig 2019-05-07 12:14:37 UTC
+++ apps/openmw/mwgui/race.hpp
@@ -4,6 +4,7 @@
#include "windowbase.hpp"
#include <MyGUI_RenderManager.h>
+#include <memory>
namespace MWGui
{

11
games/openmw/files/patch-apps_openmw_mwgui_savegamedialog.hpp
View file

@ -1,11 +0,0 @@
--- apps/openmw/mwgui/savegamedialog.hpp.orig 2019-05-07 12:38:02 UTC
+++ apps/openmw/mwgui/savegamedialog.hpp
@@ -1,6 +1,8 @@
#ifndef OPENMW_MWGUI_SAVEGAMEDIALOG_H
#define OPENMW_MWGUI_SAVEGAMEDIALOG_H
+#include <memory>
+
#include "windowbase.hpp"
namespace MWState

10
games/openmw/files/patch-apps_openmw_mwgui_screenfader.hpp
View file

@ -1,10 +0,0 @@
--- apps/openmw/mwgui/screenfader.hpp.orig 2019-05-07 12:35:15 UTC
+++ apps/openmw/mwgui/screenfader.hpp
@@ -2,6 +2,7 @@
#define OPENMW_MWGUI_SCREENFADER_H
#include <deque>
+#include <memory>
#include "windowbase.hpp"

10
games/openmw/files/patch-apps_openmw_mwgui_spellview.hpp
View file

@ -1,10 +0,0 @@
--- apps/openmw/mwgui/spellview.hpp.orig 2019-05-07 12:34:32 UTC
+++ apps/openmw/mwgui/spellview.hpp
@@ -1,6 +1,7 @@
#ifndef OPENMW_GUI_SPELLVIEW_H
#define OPENMW_GUI_SPELLVIEW_H
+#include <memory>
#include <tuple>
#include <MyGUI_Widget.h>

10
games/openmw/files/patch-apps_openmw_mwgui_videowidget.hpp
View file

@ -1,10 +0,0 @@
--- apps/openmw/mwgui/videowidget.hpp.orig 2019-05-07 12:36:32 UTC
+++ apps/openmw/mwgui/videowidget.hpp
@@ -1,6 +1,7 @@
#ifndef OPENMW_MWGUI_VIDEOWIDGET_H
#define OPENMW_MWGUI_VIDEOWIDGET_H
+#include <memory>
#include <MyGUI_Widget.h>
namespace Video

10
games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp
View file

@ -1,10 +0,0 @@
--- components/crashcatcher/crashcatcher.cpp.orig 2019-05-07 13:04:04 UTC
+++ components/crashcatcher/crashcatcher.cpp
@@ -11,6 +11,7 @@
#include <limits.h>
#include <pthread.h>
+#include <memory>
#include <stdbool.h>
#include <sys/ptrace.h>

11
games/openmw/files/patch-components_esm_custommarkerstate.hpp
View file

@ -1,11 +0,0 @@
--- components/esm/custommarkerstate.hpp.orig 2019-03-10 10:50:29 UTC
+++ components/esm/custommarkerstate.hpp
@@ -16,7 +16,7 @@ struct CustomMarker
std::string mNote;
- bool operator == (const CustomMarker& other)
+ bool operator == (const CustomMarker& other) const
{
return mNote == other.mNote && mCell == other.mCell && mWorldX == other.mWorldX && mWorldY == other.mWorldY;
}

62
games/openmw/files/patch-osg3.6.5
View file

@ -1,62 +0,0 @@
See https://github.com/OpenMW/openmw/pull/2676
From 4eb330b4ed794fd6201f7954a517dec29678c285 Mon Sep 17 00:00:00 2001
From: Julien Valentin <julienvalentin51@gmail.Com>
Date: Mon, 27 Jan 2020 23:44:22 +0100
Subject: [PATCH] comply with new OQN API
---
apps/openmw/mwrender/sky.cpp | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 3996f472c2..009b9d935f 100644
--- apps/openmw/mwrender/sky.cpp
+++ apps/openmw/mwrender/sky.cpp
@@ -2,6 +2,7 @@
#include <cmath>
+#include <osg/Version>
#include <osg/ClipPlane>
#include <osg/Fog>
#include <osg/Transform>
@@ -557,27 +558,33 @@ class Sun : public CelestialBody
{
osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
oqn->setQueriesEnabled(true);
-
+#if OSG_VERSION_LESS_THAN(3,6,5)
+ osg::Geometry* queryGeom = oqn->getQueryGeometry();
+#else
+ osg::ref_ptr<osg::QueryGeometry> queryGeom(new osg::QueryGeometry());
+#endif
// Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is rendered after all the other geometry,
// so that would be pretty bad). STATIC should be safe, since our node's local bounds are static, thus computeBounds() which modifies the queryGeometry
// is only called once.
// Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
- oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
+ queryGeom->setDataVariance(osg::Object::STATIC);
// Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
// normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
// circumvent this.
- osg::Geometry* queryGeom = oqn->getQueryGeometry();
queryGeom->setVertexArray(mGeom->getVertexArray());
queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
- queryGeom->removePrimitiveSet(0, oqn->getQueryGeometry()->getNumPrimitiveSets());
+ queryGeom->removePrimitiveSet(0, queryGeom->getNumPrimitiveSets());
queryGeom->addPrimitiveSet(mGeom->getPrimitiveSet(0));
+#if OSG_VERSION_LESS_THAN(3,6,5)
// Hack to disable unwanted awful code inside OcclusionQueryNode::computeBound.
oqn->setComputeBoundingSphereCallback(new DummyComputeBoundCallback);
// Still need a proper bounding sphere.
oqn->setInitialBound(queryGeom->getBound());
-
+#else
+ oqn->setQueryGeometry(queryGeom);
+#endif
osg::StateSet* queryStateSet = new osg::StateSet;
if (queryVisible)
{

17
games/openmw/pkg-plist
View file

@ -1,5 +1,6 @@
bin/bsatool
bin/esmtool
bin/niftest
bin/openmw
bin/openmw-cs
bin/openmw-essimporter
@ -7,14 +8,12 @@ bin/openmw-iniimporter
bin/openmw-launcher
bin/openmw-wizard
%%ETCDIR%%/gamecontrollerdb.txt
%%ETCDIR%%/gamecontrollerdb_204.txt
%%ETCDIR%%/gamecontrollerdb_205.txt
%%ETCDIR%%/openmw-cs.cfg
%%ETCDIR%%/openmw.cfg
%%ETCDIR%%/settings-default.cfg
%%ETCDIR%%/version
share/applications/openmw-cs.desktop
share/applications/openmw.desktop
share/applications/org.openmw.cs.desktop
share/applications/org.openmw.launcher.desktop
share/metainfo/openmw.appdata.xml
%%DATADIR%%/resources/defaultfilters
%%DATADIR%%/resources/mygui/DejaVuLGCSansMono.ttf
@ -109,12 +108,22 @@ share/metainfo/openmw.appdata.xml
%%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/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
%%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
%%DATADIR%%/resources/vfs/textures/omw_menu_scroll_left.dds
%%DATADIR%%/resources/vfs/textures/omw_menu_scroll_right.dds
%%DATADIR%%/resources/vfs/textures/omw_menu_scroll_up.dds
share/pixmaps/openmw-cs.png
share/pixmaps/openmw.png
@dir %%DATADIR%%/data