Index: head/games/openmw/Makefile =================================================================== --- head/games/openmw/Makefile (revision 526185) +++ head/games/openmw/Makefile (revision 526186) @@ -1,42 +1,42 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= openmw DISTVERSIONPREFIX= openmw- DISTVERSION= 0.45.0 -PORTREVISION= 8 +PORTREVISION= 9 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 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libboost_thread.so:devel/boost-libs \ libBulletCollision.so:devel/bullet \ libMyGUIEngine.so:x11-toolkits/mygui \ libosg.so:graphics/osg \ libunshield.so:archivers/unshield 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 CMAKE_ARGS= -DDESIRED_QT_VERSION=5 \ -DGLOBAL_DATA_PATH="${PREFIX}/share" \ -DMORROWIND_DATA_FILES="${DATADIR}/data" \ -DOPENMW_RESOURCE_FILES="${DATADIR}/resources" post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include Index: head/games/openmw/files/patch-components_esm_custommarkerstate.hpp =================================================================== --- head/games/openmw/files/patch-components_esm_custommarkerstate.hpp (nonexistent) +++ head/games/openmw/files/patch-components_esm_custommarkerstate.hpp (revision 526186) @@ -0,0 +1,11 @@ +--- 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; + } Property changes on: head/games/openmw/files/patch-components_esm_custommarkerstate.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/openmw/files/patch-osg3.6.5 =================================================================== --- head/games/openmw/files/patch-osg3.6.5 (nonexistent) +++ head/games/openmw/files/patch-osg3.6.5 (revision 526186) @@ -0,0 +1,62 @@ +See https://github.com/OpenMW/openmw/pull/2676 + +From 4eb330b4ed794fd6201f7954a517dec29678c285 Mon Sep 17 00:00:00 2001 +From: Julien Valentin +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 + ++#include + #include + #include + #include +@@ -557,27 +558,33 @@ class Sun : public CelestialBody + { + osg::ref_ptr oqn = new osg::OcclusionQueryNode; + oqn->setQueriesEnabled(true); +- ++#if OSG_VERSION_LESS_THAN(3,6,5) ++ osg::Geometry* queryGeom = oqn->getQueryGeometry(); ++#else ++ osg::ref_ptr 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) + { Property changes on: head/games/openmw/files/patch-osg3.6.5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property