install layers and test apps

2 files changed, 56 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c43ebc805b7..4b98a26f1b88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = openxr-loader-git
-	pkgver = 1.0.2.r0.g69bb150
+	pkgver = 1.0.5.r7.ge4b4611
 	pkgrel = 1
-	url = https://github.com/KhronosGroup/OpenXR-SDK
+	url = https://github.com/KhronosGroup/OpenXR-SDK-Source
 	arch = i686
 	arch = x86_64
 	license = apache
 	makedepends = cmake
 	makedepends = git
 	makedepends = vulkan-headers
-	source = openxr-loader::git+https://github.com/KhronosGroup/OpenXR-SDK.git
+	source = openxr-loader::git+https://github.com/KhronosGroup/OpenXR-SDK-Source.git#branch=master
 	md5sums = SKIP
 
 pkgname = openxr-loader-git
@@ -19,3 +19,13 @@ pkgname = openxr-headers-git
 	pkgdesc = OpenXR headers
 	provides = openxr-headers
 
+pkgname = openxr-layers-git
+	pkgdesc = OpenXR Layers, including XR_APILAYER_LUNARG_core_validation
+	depends = openxr-loader
+	provides = openxr-layers
+
+pkgname = openxr-utils-git
+	pkgdesc = OpenXR Utils: hello_xr, runtime_list
+	depends = openxr-loader
+	provides = openxr-utils
+
diff --git a/PKGBUILD b/PKGBUILD
index 0cdc7bc573b0..3372097e0624 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Christoph Haag <christoph.haag@collabora.com>
 
-pkgname=("openxr-loader-git" "openxr-headers-git")
+pkgname=("openxr-loader-git" "openxr-headers-git" "openxr-layers-git" "openxr-utils-git")
 _dirname="openxr-loader"
-pkgver=1.0.2.r0.g69bb150
+pkgver=1.0.5.r7.ge4b4611
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://github.com/KhronosGroup/OpenXR-SDK'
+url='https://github.com/KhronosGroup/OpenXR-SDK-Source'
 depends=()
 makedepends=('cmake' 'git' 'vulkan-headers')
 license=('apache')
-source=("$_dirname::git+https://github.com/KhronosGroup/OpenXR-SDK.git")
+source=("$_dirname::git+https://github.com/KhronosGroup/OpenXR-SDK-Source.git#branch=master")
 md5sums=('SKIP')
 
 #options=('debug' '!strip')
@@ -31,7 +31,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTS=OFF \
+    -DBUILD_TESTS=ON \
     -DPRESENTATION_BACKEND=xlib \
     -DDYNAMIC_LOADER=ON \
     ../"$_dirname"
@@ -43,16 +43,50 @@ package_openxr-loader-git() {
   pkgdesc='OpenXR loader'
 
   cd "$_dirname"-build
-  make DESTDIR="$pkgdir" install openxr_loader
 
+  make DESTDIR="$pkgdir" install
   rm -rf "$pkgdir"/usr/include/
+  rm -rf "$pkgdir"/usr/bin/
+  rm -rf "$pkgdir"/usr/share/openxr
+  rm -rf "$pkgdir"/usr/lib/*ApiLayer*
 }
 
 package_openxr-headers-git() {
   provides=("openxr-headers")
   pkgdesc='OpenXR headers'
 
-  # TODO install target for headers
-  install -d "$pkgdir"/usr/include/openxr/
-  cp "$srcdir"/"$_dirname"/include/openxr/*.h "$pkgdir"/usr/include/openxr
+  cd "$_dirname"-build
+
+  make DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir"/usr/lib/
+  rm -rf "$pkgdir"/usr/share/
+  rm -rf "$pkgdir"/usr/bin/
+}
+
+package_openxr-layers-git() {
+  depends=("openxr-loader")
+  provides=("openxr-layers")
+  pkgdesc='OpenXR Layers, including XR_APILAYER_LUNARG_core_validation'
+
+  cd "$_dirname"-build
+
+  make DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir"/usr/include
+  rm -rf "$pkgdir"/usr/share/doc
+  rm -rf "$pkgdir"/usr/lib/pkgconfig
+  rm -rf "$pkgdir"/usr/bin/
+  rm -rf "$pkgdir"/usr/lib/*loader*
+}
+
+package_openxr-utils-git() {
+  depends=("openxr-loader")
+  provides=("openxr-utils")
+  pkgdesc='OpenXR Utils: hello_xr, runtime_list'
+
+  cd "$_dirname"-build
+
+  make DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir"/usr/include
+  rm -rf "$pkgdir"/usr/share/
+  rm -rf "$pkgdir"/usr/lib/
 }