update for cmake and add some stuff

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 509b6175f2ee..4ee1035a8405 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = monado-git
 	pkgdesc = The open source OpenXR runtime.
-	pkgver = 21.0.0.r1187.g1203cf38
+	pkgver = 21.0.0.r1747.g7a039543d
 	pkgrel = 1
 	url = https://monado.dev
 	install = monado.install
@@ -10,7 +10,7 @@ pkgbase = monado-git
 	makedepends = eigen
 	makedepends = ninja
 	makedepends = shaderc
-	makedepends = meson
+	makedepends = cmake
 	makedepends = git
 	makedepends = vulkan-headers
 	depends = openxr
@@ -20,8 +20,11 @@ pkgbase = monado-git
 	depends = xr-hardware
 	depends = libcap
 	depends = libbsd
+	depends = libdrm
 	optdepends = libuvc: optical tracking support
 	optdepends = opencv: optical tracking support
+	optdepends = onnxruntime: optical hand tracking support
+	optdepends = librealsense: intel realsense camera support
 	optdepends = libsurvive-git: lighthouse positional tracking support
 	optdepends = openhmd: additional hardware support (Oculus Rift, Nolo)
 	optdepends = basalt-monado-git: experimental SLAM tracking through basalt
diff --git a/PKGBUILD b/PKGBUILD
index 52ef2b273e07..f025469e5a5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,18 @@
  
 pkgname="monado-git"
 _dirname="monado"
-pkgver=21.0.0.r1187.g1203cf38
+pkgver=21.0.0.r1747.g7a039543d
 pkgrel=1
 pkgdesc='The open source OpenXR runtime.'
 arch=('i686' 'x86_64')
 url='https://monado.dev'
-depends=('openxr' 'vulkan-icd-loader' 'libgl' 'wayland' 'xr-hardware' 'libcap' 'libbsd')
-makedepends=('eigen' 'ninja' 'shaderc' 'meson' 'git' 'vulkan-headers')
+depends=('openxr' 'vulkan-icd-loader' 'libgl' 'wayland' 'xr-hardware' 'libcap' 'libbsd' 'libdrm')
+#'doxygen' #When building docs
+makedepends=('eigen' 'ninja' 'shaderc' 'cmake' 'git' 'vulkan-headers')
 optdepends=('libuvc: optical tracking support'
             'opencv: optical tracking support'
+            'onnxruntime: optical hand tracking support'
+            'librealsense: intel realsense camera support'
             'libsurvive-git: lighthouse positional tracking support'
             'openhmd: additional hardware support (Oculus Rift, Nolo)'
             'basalt-monado-git: experimental SLAM tracking through basalt'
@@ -19,9 +22,6 @@ optdepends=('libuvc: optical tracking support'
 provides=("openxr-runtime")
 install=monado.install
 
-#'doxygen' #When building docs
-makedepend=('cmake' 'eigen' 'git')
-
 license=('boost')
 source=("$_dirname::git+https://gitlab.freedesktop.org/monado/monado.git#branch=main")
 md5sums=('SKIP')
@@ -39,7 +39,7 @@ prepare() {
 
 build() {
   cd "$_dirname"
-  meson --prefix=/usr/ --libdir=lib -Dbuildtype=debugoptimized "$srcdir"/"$_dirname"-build
+  cmake -DCMAKE_LIBDIR=lib -DCMAKE_INSTALL_PREFIX=/usr/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja -B"$srcdir"/"$_dirname"-build
   ninja -C "$srcdir"/"$_dirname"-build
 }