libre/openmw: updated to 0.43.0

2 files changed, 19 insertions, 93 deletions

diff --git a/libre/openmw/PKGBUILD b/libre/openmw/PKGBUILD
index 72e070d5b..920db706a 100644
--- a/libre/openmw/PKGBUILD
+++ b/libre/openmw/PKGBUILD
@@ -1,32 +1,34 @@
+# $Id:
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor (Arch): Sandy Carter <bwrsandman@gmail.com>
 # Maintainer: André Silva <emulatorman@hyperbola.info>
-
 pkgname=openmw
-pkgver=0.41.0
-pkgrel=4.parabola1
-pkgdesc="A libre engine reimplementation for Morrowind-based role-playing games, without wizard installation support to install nonfree assets from Morrowind to run Morrowind"
-arch=('i686' 'x86_64')
+pkgver=0.43.0
+pkgrel=2.parabola1
+pkgdesc="A libe  engine reimplementation for the role-playing game Morrowind, without without wizard installation support to install nonfree assets from Morrowind to run Morrowind"
+arch=('x86_64' 'i686' 'armv7h')
 url="http://www.openmw.org"
 license=('GPL3' 'MIT' 'custom')
 depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt')
-makedepends=('cmake' 'boost' 'doxygen')
+makedepends=('cmake' 'boost' 'doxygen' 'ninja')
 source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz")
-sha512sums=('a47a7af3c6d3252e22206eb776069ef87f698acbe133b0e0294db307486c28cb300085fcf45b436af541dbb22f6d45f2ee3998e50a1c711f667f8a738813255d')
+sha512sums=('e902dd2274c05838bb1171f07d7a673fc7b85d1290a9e01c8ab89f1c279bd236332ecdc0f2b7944ec7209a0e6022ff472639b5724bf26904e3a2d338c7be401a')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DDESIRED_QT_VERSION=5 \
-        -DBUILD_ESSIMPORTER=OFF \
-        -DBUILD_WIZARD=OFF
-  make
+  mkdir -p build
+  cd build
+  cmake "../$pkgname-$pkgname-$pkgver" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DDESIRED_QT_VERSION=5 \
+    -DBUILD_ESSIMPORTER=OFF \
+    -DBUILD_WIZARD=OFF \
+    -GNinja
+  ninja
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C build install
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
diff --git a/libre/openmw/bullet-251.patch b/libre/openmw/bullet-251.patch
deleted file mode 100644
index 27f66dd82..000000000
--- a/libre/openmw/bullet-251.patch
+++ /dev/null
@@ -1,76 +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()