summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Haag2020-08-05 15:14:05 +0200
committerChristoph Haag2020-08-05 15:15:00 +0200
commitcd5a27bb07c0e6df4ef236e558140ea215c36d56 (patch)
tree7b5c855629147e1e273b79b2080ced68fd2a872c
parentcc82072398a957b7717af485e008266d39e5fed2 (diff)
downloadaur-cd5a27bb07c0e6df4ef236e558140ea215c36d56.tar.gz
build with meson
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD26
2 files changed, 17 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1fbb328b2641..80e3a03eed3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = monado-git
pkgdesc = The open source OpenXR runtime.
- pkgver = r1103.ec076a0d
+ pkgver = r1678.4a0aa434
pkgrel = 1
url = https://monado.dev
arch = i686
@@ -9,6 +9,7 @@ pkgbase = monado-git
makedepends = eigen
makedepends = ninja
makedepends = shaderc
+ makedepends = meson
depends = openxr-loader
depends = openhmd
depends = vulkan-icd-loader
diff --git a/PKGBUILD b/PKGBUILD
index aa87198aba6c..0965ccdbd53c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
pkgname="monado-git"
_dirname="monado"
-pkgver=r1103.ec076a0d
+pkgver=r1678.4a0aa434
pkgrel=1
pkgdesc='The open source OpenXR runtime.'
arch=('i686' 'x86_64')
url='https://monado.dev'
depends=('openxr-loader' 'openhmd' 'vulkan-icd-loader' 'libgl' 'wayland')
-makedepends=('eigen' 'ninja' 'shaderc')
+makedepends=('eigen' 'ninja' 'shaderc' 'meson')
optdepends=('libuvc: optical tracking support'
'opencv: optical tracking support'
'xr-hardware: udev permissions for popular XR hardware')
@@ -33,15 +33,19 @@ prepare() {
}
build() {
- mkdir -p "$_dirname"-build
- cd "$_dirname"-build
- cmake \
- -G Ninja \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- ../"$_dirname"
- ninja
+ cd "$_dirname"
+ meson --prefix=/usr/ --libdir=lib -Dbuildtype=debugoptimized "$srcdir"/"$_dirname"-build
+
+# mkdir -p "$_dirname"-build
+# cd "$_dirname"-build
+# cmake \
+# -G Ninja \
+# -DCMAKE_INSTALL_LIBDIR=lib \
+# -DCMAKE_INSTALL_PREFIX=/usr \
+# -DCMAKE_BUILD_TYPE=Release \
+# ../"$_dirname"
+
+ ninja -C "$srcdir"/"$_dirname"-build
}
package() {