summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormajor major2017-08-22 18:10:51 +0200
committermajor major2017-08-22 18:10:51 +0200
commite063933db307979305fbacb3baf452dcc28e97c0 (patch)
treef60a10baae05c40e6f31a49673847f4b74a56e97
parent0deb8ceded5d9aef0462af8ad3379833fd9346c6 (diff)
downloadaur-e063933db307979305fbacb3baf452dcc28e97c0.tar.gz
added patch and updated to new MRPT Version 1.5.2
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD27
2 files changed, 21 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5b536a464ec..3912ca35008 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
pkgbase = mrpt
pkgdesc = Provides an extensive set of libraries, algorithms, and applications employed in a number of mobile robotics research areas.
- pkgver = 1.5.0
+ pkgver = 1.5.2
pkgrel = 1
url = http://www.mrpt.org
install = mrpt.install
arch = i686
arch = x86_64
+ arch = armv7h
license = GPL3
makedepends = subversion
makedepends = cmake
@@ -21,7 +22,7 @@ pkgbase = mrpt
optdepends = libusb: Kinect support
optdepends = pcl
optdepends = assimp
- source = mrpt-1.5.0::git+https://github.com/MRPT/mrpt.git
+ source = mrpt-1.5.2::git+https://github.com/MRPT/mrpt.git#tag=1.5.2
md5sums = SKIP
pkgname = mrpt
diff --git a/PKGBUILD b/PKGBUILD
index 3381aa2b899..cde93600d0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
pkgname=mrpt
-pkgver=1.5.0
+pkgver=1.5.2
pkgrel=1
pkgdesc="Provides an extensive set of libraries, algorithms, and applications employed in a number of mobile robotics research areas."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
url="http://www.mrpt.org"
license=('GPL3')
depends=('opencv' 'wxgtk' 'desktop-file-utils')
@@ -13,20 +13,29 @@ optdepends=('ffmpeg: Video Support' 'freeglut' 'zlib'
install=mrpt.install
_dir=${pkgname}-${pkgver}
-source=("${_dir}"::"git+https://github.com/MRPT/mrpt.git")
+_tag=${pkgver}
+source=("${_dir}"::"git+https://github.com/MRPT/mrpt.git"#tag=${_tag})
md5sums=('SKIP')
+prepare() {
+ #patch howMany() to howMany
+ sed -i "s/howMany[(][)]/howMany/g" ${srcdir}/${pkgname}-${pkgver}/libs/base/include/mrpt/math/matrix_adaptors.h
+}
+
build() {
- cd $srcdir/$pkgname-$pkgver
- echo "$srcdir/$pkgname-$pkgver"
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ # Create build directory
+ [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+ cd ${srcdir}/build
+
+ cmake ${srcdir}/$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_CXX_FLAGS="-fpermissive" \
- -DMRPT_OPTIMIZE_NATIVE=ON $srcdir/$pkgname-$pkgver
- make -j2
+ -DMRPT_OPTIMIZE_NATIVE=ON
+ make -j1
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd "${srcdir}/build"
make DESTDIR="$pkgdir/" install
}