From 29ff1415cbf79e4b0ebec6523abc6ff74cc054be Mon Sep 17 00:00:00 2001
From: Talos Thoren <talosthoren@gmail.com>
Date: Thu, 20 Apr 2017 14:10:24 +0100
Subject: games/openmw: Updated for version 0.41.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 games/openmw/bullet-2.85.1.patch | 77 ----------------------------------------
 games/openmw/openmw.SlackBuild   |  6 +---
 games/openmw/openmw.info         |  6 ++--
 3 files changed, 4 insertions(+), 85 deletions(-)
 delete mode 100644 games/openmw/bullet-2.85.1.patch

(limited to 'games/openmw')

diff --git a/games/openmw/bullet-2.85.1.patch b/games/openmw/bullet-2.85.1.patch
deleted file mode 100644
index af68dcc05d..0000000000
--- a/games/openmw/bullet-2.85.1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 5ccbabc27d7f1ec02447680e4bed28d12333fb77 Mon Sep 17 00:00:00 2001
-From: scrawl <scrawl@baseoftrash.de>
-Date: Fri, 14 Oct 2016 20:59:55 +0200
-Subject: [PATCH] Fix build against bullet with profiler disabled (Fixes #3592)
-
----
- apps/openmw/mwgui/debugwindow.cpp       | 7 +++++++
- apps/openmw/mwphysics/physicssystem.cpp | 3 +++
- 2 files changed, 10 insertions(+)
-
-diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
-index 37ea347..a29910f 100644
---- a/apps/openmw/mwgui/debugwindow.cpp
-+++ b/apps/openmw/mwgui/debugwindow.cpp
-@@ -7,6 +7,8 @@
- 
- #include <LinearMath/btQuickprof.h>
- 
-+#ifndef BT_NO_PROFILE
-+
- namespace
- {
-     void bulletDumpRecursive(CProfileIterator* pit, int spacing, std::stringstream& os)
-@@ -71,6 +73,7 @@ namespace
-     }
- }
- 
-+#endif // BT_NO_PROFILE
- 
- namespace MWGui
- {
-@@ -92,10 +95,13 @@ namespace MWGui
- 
-         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
-         mMainWidget->setSize(viewSize);
-+
-+
-     }
- 
-     void DebugWindow::onFrame(float dt)
-     {
-+#ifndef BT_NO_PROFILE
-         if (!isVisible())
-             return;
- 
-@@ -115,6 +121,7 @@ namespace MWGui
-         size_t previousPos = mBulletProfilerEdit->getVScrollPosition();
-         mBulletProfilerEdit->setCaption(stream.str());
-         mBulletProfilerEdit->setVScrollPosition(std::min(previousPos, mBulletProfilerEdit->getVScrollRange()-1));
-+#endif
-     }
- 
- }
-diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
-index 954d195..e442fbd 100644
---- a/apps/openmw/mwphysics/physicssystem.cpp
-+++ b/apps/openmw/mwphysics/physicssystem.cpp
-@@ -14,6 +14,7 @@
- #include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
- #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
- #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
-+
- #include <LinearMath/btQuickprof.h>
- 
- #include <components/nifbullet/bulletnifloader.hpp>
-@@ -1363,8 +1364,10 @@ namespace MWPhysics
-         for (std::set<Object*>::iterator it = mAnimatedObjects.begin(); it != mAnimatedObjects.end(); ++it)
-             (*it)->animateCollisionShapes(mCollisionWorld);
- 
-+#ifndef BT_NO_PROFILE
-         CProfileManager::Reset();
-         CProfileManager::Increment_Frame_Counter();
-+#endif
-     }
- 
-     void PhysicsSystem::debugDraw()
-
diff --git a/games/openmw/openmw.SlackBuild b/games/openmw/openmw.SlackBuild
index fd3591efb5..25bc48a8eb 100644
--- a/games/openmw/openmw.SlackBuild
+++ b/games/openmw/openmw.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmw
-VERSION=${VERSION:-0.40.0}
+VERSION=${VERSION:-0.41.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -69,10 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Patch against bullet 2.85.1
-# Thanks to ARCH Linux
-patch -p1 < $CWD/bullet-2.85.1.patch
-
 mkdir -p build
 cd build
   cmake \
diff --git a/games/openmw/openmw.info b/games/openmw/openmw.info
index 523b3076fa..8e7ffddf3f 100644
--- a/games/openmw/openmw.info
+++ b/games/openmw/openmw.info
@@ -1,8 +1,8 @@
 PRGNAM="openmw"
-VERSION="0.40.0"
+VERSION="0.41.0"
 HOMEPAGE="https://openmw.org"
-DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.40.0.tar.gz"
-MD5SUM="2891b97df0fa5bc9d24879de66d65e8f"
+DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.41.0.tar.gz"
+MD5SUM="8a939016d489b9cffdcd82aa36ed4973"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FreeImage OpenAL unshield ffmpeg OpenSceneGraph SDL2 MyGUI bullet"
-- 
cgit v1.2.3-65-gdbad