[arch-commits] Commit in openmw/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Monday, August 16, 2021 @ 08:40:40
  Author: svenstaro
Revision: 1000182

upgpkg: openmw 0.47.0rc-1

Modified:
  openmw/trunk/PKGBUILD
Deleted:
  openmw/trunk/openmw-0.46.0-limits-includes.patch
  openmw/trunk/openmw-0.46.0-missing-include.patch

-------------------------------------+
 PKGBUILD                            |   29 ++++++++++++---------------
 openmw-0.46.0-limits-includes.patch |   36 ----------------------------------
 openmw-0.46.0-missing-include.patch |   19 -----------------
 3 files changed, 13 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-16 08:25:44 UTC (rev 1000181)
+++ PKGBUILD	2021-08-16 08:40:40 UTC (rev 1000182)
@@ -2,33 +2,30 @@
 # Contributor: Sandy Carter <bwrsandman at gmail.com>
 
 pkgname=openmw
-pkgver=0.46.0
-pkgrel=9
+# Build from git until 0.47.0 stable is out. Sadly openmw releases are very
+# rare these days and backporting takes too much time.
+pkgver=0.47.0rc
+pkgrel=1
 pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind"
 arch=('x86_64')
 url="http://www.openmw.org"
 license=('GPL3' 'MIT' 'custom')
-depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt')
+depends=('openal' 'openscenegraph' 'mygui' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt')
 makedepends=('cmake' 'boost' 'doxygen' 'ninja' 'git')
-source=("git+https://gitlab.com/OpenMW/openmw.git#tag=openmw-$pkgver"
-        openmw-0.46.0-limits-includes.patch
-        openmw-0.46.0-missing-include.patch)
-sha512sums=('SKIP'
-            '2c13813ed11e00e2118251192ca0ef3933cce87fc4898930e590a9421d28e0b6ca2bff0edf48b0ec9da528282fcad2ee6e211f2c6692f36b360d8eb6d4f33049'
-            'd0d47fe249e8fb366e00e272dc62853f8a2aaa75d45d83d270891e76674c1382fd3405e674e3b6c383bbc17125c4471893e77251744deae4d17bc373d847a638')
+source=("git+https://gitlab.com/OpenMW/openmw.git#commit=af3b9187")
+sha512sums=('SKIP')
 
-prepare() {
-  cd openmw
-  patch -Np1 -i ${srcdir}/openmw-0.46.0-limits-includes.patch
-  patch -Np1 -i ${srcdir}/openmw-0.46.0-missing-include.patch
-}
-
 build() {
   cd openmw
-  cmake . \
+  # We can't use system bullet because openmw needs a version built with double
+  # precision but the one we ship in Arch is built with single precision for
+  # performance reasons.
+  cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
+    -DOPENMW_LTO_BUILD=ON \
     -DDESIRED_QT_VERSION=5 \
+    -DOPENMW_USE_SYSTEM_BULLET=OFF \
     -GNinja \
     -Bbuild
   ninja -C build

Deleted: openmw-0.46.0-limits-includes.patch
===================================================================
--- openmw-0.46.0-limits-includes.patch	2021-08-16 08:25:44 UTC (rev 1000181)
+++ openmw-0.46.0-limits-includes.patch	2021-08-16 08:40:40 UTC (rev 1000182)
@@ -1,36 +0,0 @@
-diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
-index cb3a1b278..653e4d3a1 100644
---- a/components/sceneutil/mwshadowtechnique.cpp
-+++ b/components/sceneutil/mwshadowtechnique.cpp
-@@ -23,6 +23,7 @@
- #include <osg/Geometry>
- #include <osg/io_utils>
- 
-+#include <limits>
- #include <sstream>
- 
- namespace {
-diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
-index 035c19a5f..1ec2b1c5e 100644
---- a/components/sceneutil/shadow.cpp
-+++ b/components/sceneutil/shadow.cpp
-@@ -1,5 +1,7 @@
- #include "shadow.hpp"
- 
-+#include <limits>
-+
- #include <osgShadow/ShadowedScene>
- 
- #include <components/sceneutil/vismask.hpp>
-diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
-index f998b7877..cadf5eaa4 100644
---- a/components/terrain/quadtreeworld.cpp
-+++ b/components/terrain/quadtreeworld.cpp
-@@ -2,6 +2,7 @@
- 
- #include <osgUtil/CullVisitor>
- 
-+#include <limits>
- #include <sstream>
- 
- #include <components/misc/constants.hpp>

Deleted: openmw-0.46.0-missing-include.patch
===================================================================
--- openmw-0.46.0-missing-include.patch	2021-08-16 08:25:44 UTC (rev 1000181)
+++ openmw-0.46.0-missing-include.patch	2021-08-16 08:40:40 UTC (rev 1000182)
@@ -1,19 +0,0 @@
-Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
-
-From 10daadefbea1f62a818c339dc7f3d69a858bc8a6 Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail at gmail.com>
-Date: Thu, 30 Apr 2020 21:57:22 +0200
-Subject: [PATCH] Add missing include
-
-diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
-index 30d7976aec..155ce32963 100644
---- a/components/detournavigator/offmeshconnectionsmanager.hpp
-+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
-@@ -13,6 +13,7 @@
- 
- #include <boost/optional.hpp>
- 
-+#include <algorithm>
- #include <map>
- #include <mutex>
- #include <unordered_map>