diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-06-11 04:02:07 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-06-11 04:02:07 -0700 |
commit | 6ece93d5b9b386db42e86dd9b900d2b27ad8f7f2 (patch) | |
tree | 422b35fef4986f088e127759e053081bce6e7ebb | |
parent | Rebuild for bullet 3.17 (diff) | |
download | openmw-6ece93d5b9b386db42e86dd9b900d2b27ad8f7f2.tar.xz |
Add gcc11 fix
Rebuild for boost 1.76
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | openmw-0.46.0-limits-includes.patch | 36 |
2 files changed, 42 insertions, 3 deletions
@@ -7,7 +7,7 @@ pkgname=openmw pkgver=0.46.0 -pkgrel=8 +pkgrel=9 pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind" arch=('x86_64') url="http://www.openmw.org" @@ -15,12 +15,15 @@ license=('GPL3' 'MIT' 'custom') depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt' 'libvdpau') makedepends=('cmake' 'boost' 'doxygen' 'ninja') source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz" - "openmw-0.46.0-missing-include.patch") + "openmw-0.46.0-missing-include.patch" + "openmw-0.46.0-limits-includes.patch") b2sums=('8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c' - 'fa80b94d9ce91e1b05b96c02e80f32f1e9066ba6f8ada4a1e5150cf3a278d3a233eda42269b3027c56aaa7be98dd33cbcc3932d1e0930a51bd6b5744a73d6b6e') + 'fa80b94d9ce91e1b05b96c02e80f32f1e9066ba6f8ada4a1e5150cf3a278d3a233eda42269b3027c56aaa7be98dd33cbcc3932d1e0930a51bd6b5744a73d6b6e' + 'fb90611f909ac0abaa4af00129091730196634791240e0c92e40c6c584a419503f8ec7e1d775e201ff53b5c9ff49047a6409b012f121ee76b769ac14fd56eb98') prepare() { cd ${pkgname}-${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/openmw-0.46.0-limits-includes.patch patch -Np1 -i ${srcdir}/openmw-0.46.0-missing-include.patch } diff --git a/openmw-0.46.0-limits-includes.patch b/openmw-0.46.0-limits-includes.patch new file mode 100644 index 0000000..8a07df2 --- /dev/null +++ b/openmw-0.46.0-limits-includes.patch @@ -0,0 +1,36 @@ +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> |