summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-12-09 15:40:28 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-12-09 15:40:28 -0800
commit22d0a26717d6984d98c43f38a2bc7d5af4c62f3f (patch)
tree001e3156fd9d9e9798ab748eded890edcd33e819
parentRebuild for bullet 2.89 (diff)
downloadopenmw-22d0a26717d6984d98c43f38a2bc7d5af4c62f3f.tar.xz
Rebuild for boost 1.74 and bullet 3.0.7
-rw-r--r--PKGBUILD15
-rw-r--r--openmw-0.46.0-missing-include.patch19
2 files changed, 30 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3d3e417..d8f62db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,22 @@
pkgname=openmw
pkgver=0.46.0
-pkgrel=2
+pkgrel=4
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' 'libvdpau')
-makedepends=('cmake' 'boost' 'doxygen' 'ninja' 'git')
-source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz")
-b2sums=('8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c')
+makedepends=('cmake' 'boost' 'doxygen' 'ninja')
+source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz"
+ "openmw-0.46.0-missing-include.patch")
+b2sums=('8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c'
+ 'fa80b94d9ce91e1b05b96c02e80f32f1e9066ba6f8ada4a1e5150cf3a278d3a233eda42269b3027c56aaa7be98dd33cbcc3932d1e0930a51bd6b5744a73d6b6e')
+
+prepare() {
+ cd ${pkgname}-${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/openmw-0.46.0-missing-include.patch
+}
build() {
cd ${pkgname}-${pkgname}-${pkgver}
diff --git a/openmw-0.46.0-missing-include.patch b/openmw-0.46.0-missing-include.patch
new file mode 100644
index 0000000..8037074
--- /dev/null
+++ b/openmw-0.46.0-missing-include.patch
@@ -0,0 +1,19 @@
+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@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>