summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartino Pilia2021-02-23 19:25:11 +0100
committerMartino Pilia2021-02-23 19:25:11 +0100
commit939f85e5678751dce8d91a3464eb91164a60e5ac (patch)
tree7316bf115a8d504cdcb364e1c9414087ff1d2118
parent11233722d0468a7d2fbfe2d917e29bab6c9cd0fb (diff)
downloadaur-openvslam-git.tar.gz
Temporary fix to a build issue with gcc 10
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD16
-rw-r--r--patch.diff11
3 files changed, 28 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f35aa87093b2..f1278c37d4cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = openvslam-git
pkgdesc = A Versatile Visual SLAM Framework
- pkgver = r428.e069085
- pkgrel = 2
+ pkgver = r474.9eb280a
+ pkgrel = 1
url = https://github.com/xdspacelab/openvslam
arch = x86_64
license = BSD2
@@ -19,8 +19,10 @@ pkgbase = openvslam-git
depends = suitesparse
depends = yaml-cpp
provides = openvslam
- source = openvslam-git-r428.e069085::git+https://github.com/xdspacelab/openvslam.git
+ source = openvslam-git-r474.9eb280a::git+https://github.com/xdspacelab/openvslam.git
+ source = patch.diff
sha256sums = SKIP
+ sha256sums = 181eb52ad721b4770263474b7c90c7f0a24cc81977a2f6b48f936b2d0559a43e
pkgname = openvslam-git
diff --git a/PKGBUILD b/PKGBUILD
index a73b470c901c..daffce6124e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer of this PKGBUILD file: Martino Pilia <martino.pilia@gmail.com>
_name=openvslam
pkgname=${_name}-git
-pkgver=r428.e069085
-pkgrel=2
+pkgver=r474.9eb280a
+pkgrel=1
pkgdesc="A Versatile Visual SLAM Framework"
arch=('x86_64')
url="https://github.com/xdspacelab/openvslam"
@@ -25,8 +25,12 @@ makedepends=(
'git'
)
provides=('openvslam')
-source=("${pkgname}-${pkgver}::git+https://github.com/xdspacelab/openvslam.git")
-sha256sums=('SKIP')
+source=(
+ "${pkgname}-${pkgver}::git+https://github.com/xdspacelab/openvslam.git"
+ "patch.diff"
+)
+sha256sums=('SKIP'
+ '181eb52ad721b4770263474b7c90c7f0a24cc81977a2f6b48f936b2d0559a43e')
pkgver() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -35,6 +39,10 @@ pkgver() {
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Fix build on gcc 10
+ git apply "${srcdir}/patch.diff"
+
[ ! -d build ] || rm -rf build
mkdir build && cd build
cmake .. \
diff --git a/patch.diff b/patch.diff
new file mode 100644
index 000000000000..01ff85fd2faa
--- /dev/null
+++ b/patch.diff
@@ -0,0 +1,11 @@
+diff --git a/src/pangolin_viewer/color_scheme.cc b/src/pangolin_viewer/color_scheme.cc
+index 90ace8b..2b180c7 100644
+--- a/src/pangolin_viewer/color_scheme.cc
++++ b/src/pangolin_viewer/color_scheme.cc
+@@ -1,5 +1,6 @@
+ #include "pangolin_viewer/color_scheme.h"
+
++#include <stdexcept>
+ namespace pangolin_viewer {
+
+ color_scheme::color_scheme(const std::string& color_set_str) {