v3.1.0

2 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79e9fefc0d05..338f1dab5647 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = valhalla
 	pkgdesc = Routing engine for OpenStreetMap.
-	pkgver = 3.0.7
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://github.com/valhalla/valhalla
 	arch = x86_64
@@ -10,14 +10,13 @@ pkgbase = valhalla
 	makedepends = vim
 	makedepends = jq
 	makedepends = boost
-	makedepends = rapidjson
 	depends = prime_server
 	depends = boost-libs
 	depends = protobuf
 	depends = python
 	depends = lua
 	depends = libspatialite
-	source = valhalla-3.0.7::git+https://github.com/valhalla/valhalla#tag=3.0.7
+	source = valhalla-3.1.0::git+https://github.com/valhalla/valhalla#tag=3.1.0
 	sha256sums = SKIP
 
 pkgname = valhalla
diff --git a/PKGBUILD b/PKGBUILD
index 69f2a110f9fb..877980c1d502 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer: Aleksandar Trifunović <akstrfn@gmail.com>
 
 pkgname=valhalla
-pkgver=3.0.7
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="Routing engine for OpenStreetMap."
 arch=('x86_64')
 url="https://github.com/valhalla/valhalla"
 license=('custom:MIT')
 depends=('prime_server' 'boost-libs' 'protobuf' 'python' 'lua' 'libspatialite')
-makedepends=('cmake' 'git' 'vim' 'jq' 'boost' 'rapidjson')
+makedepends=('cmake' 'git' 'vim' 'jq' 'boost')
 source=("$pkgname-$pkgver::git+${url}#tag=$pkgver")
 sha256sums=('SKIP')
 
 prepare() {
   cd "$pkgname-$pkgver"
   git submodule update --init --recursive
-  rm -rf third_party/rapidjson
 }
 
 build() {
   cd "$pkgname-$pkgver"
-  cmake -H. -Bbuild \
+  cmake -S. -Bbuild \
     -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
     -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
     -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
@@ -29,26 +28,26 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_DATA_TOOLS=On \
     -DENABLE_PYTHON_BINDINGS=On \
-    -DENABLE_NODE_BINDINGS=Off \
     -DENABLE_SERVICES=On \
     -DENABLE_CCACHE=Off \
     -DENABLE_HTTP=On \
     -DBUILD_SHARED_LIBS=On \
-    -DENABLE_TESTS=Off
+    -DENABLE_BENCHMARKS=OFF \
+    -DENABLE_TESTS=OFF
 
-  cmake --build build
+  cmake --build build -- "${MAKEFLAGS}"
 }
 
+# no tests built but ctest does not fail
 check() {
-  cd "$pkgname-$pkgver"
-  # cmake --build build -- check
+  cd "$pkgname-$pkgver/build"
+  ctest --parallel `nproc`
 }
 
 package() {
   cd "$pkgname-$pkgver"
   cmake --build build -- DESTDIR="$pkgdir/" install
   rm -rf "$pkgdir/usr/share/doc/"{libvalhalla-dev,libvalhalla0,python-valhalla}
-  rm "$pkgdir/usr/share/doc/$pkgname/ChangeLog"
 
   install -Dm644 COPYING README.md CHANGELOG.md -t "$pkgdir/usr/share/licenses/$pkgname"
   cp -a docs/* "$pkgdir/usr/share/doc/$pkgname/"