summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Haag2022-02-15 18:40:27 +0100
committerChristoph Haag2022-02-15 18:40:27 +0100
commite16896dccb2bbe5f5bc61cedd6c67e8e08f8fc31 (patch)
tree56240dacfb90ff08e66e87c205c3a5b0236cab7c
parented9cc4197d40dff27e63c934d45ac0e8d68ee074 (diff)
downloadaur-e16896dccb2bbe5f5bc61cedd6c67e8e08f8fc31.tar.gz
Fix build after updates
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD14
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6ff2ff4ef55c..e8335d49c9a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = basalt-monado-git
pkgdesc = Visual-Inertial Mapping with Non-Linear Factor Recovery
- pkgver = r395.973b0d7
+ pkgver = r457.4daa7f4
pkgrel = 1
url = https://gitlab.freedesktop.org/mateosss/basalt
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 25fb49bded83..7afd00948f5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# MAINTAINER: haagch <christoph.haag@collabora.com>
pkgname=basalt-monado-git
-pkgver=r395.973b0d7
+pkgver=r457.4daa7f4
pkgrel=1
pkgdesc="Visual-Inertial Mapping with Non-Linear Factor Recovery"
arch=('i686' 'x86_64')
@@ -30,11 +30,13 @@ prepare() {
cd "$_pkgname"
git submodule update --init --recursive
- git checkout thirdparty/CMakeLists.txt
- git apply ../fix_basalt_passed_cxx_flags.patch
+ # Merged by Mateo
+ #git checkout thirdparty/CMakeLists.txt
+ #git apply ../fix_basalt_passed_cxx_flags.patch
- git checkout CMakeLists.txt
- git apply ../disable-werror.patch
+ # Merged by Mateo
+ #git checkout CMakeLists.txt
+ #git apply ../disable-werror.patch
# https://github.com/stevenlovegrove/Pangolin/issues/657
cd thirdparty/Pangolin
@@ -63,7 +65,7 @@ package() {
DESTDIR="${pkgdir}/" ninja -C build install
cp -Ra "${srcdir}/${_pkgname}"/data/monado/ "${pkgdir}"/usr/etc/basalt/
- for i in "${pkgdir}"/usr/etc/basalt/monado/*
+ for i in "${pkgdir}"/usr/etc/basalt/monado/*.toml
do
sed -i "s#/home/mateo/Documents/apps/bsltdeps/basalt/data/#/usr/etc/basalt/#" "$i"
done