community/monado: rebuild against opencv-4.7

community/monado/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=monado
 pkgver=21.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc="The open source OpenXR runtime"
 url="https://monado.freedesktop.org"
 # ppc64le, s390x blocked by opencv -> vtk -> netcdf
@@ -32,6 +32,7 @@ makedepends="
 	"
 source="https://gitlab.freedesktop.org/monado/monado/-/archive/v$pkgver/monado-v$pkgver.tar.gz
 	fix-build.patch
+	vulkan-1.2.174-compat.patch
 	"
 builddir="$srcdir/$pkgname-v$pkgver"
 
@@ -57,4 +58,5 @@ package() {
 sha512sums="
 d4f723da9d4b6b62bef4e4c4553e1573fa23a239e01337087859a1395c5cfe9fb10e89474e0e6d2747206e463bcded6fc9e85d5bbd37e082828216cc0d8e9933  monado-v21.0.0.tar.gz
 58b19c33f32d958934683250b381f00f52c530f83c6ae512225f1dff61a42534839a7a778fc3e0ee7d5ce51dc0f01cc6effc69b727b9f969dab06edd6d9825e5  fix-build.patch
+df9958375997ac24c20992a492c0b2e74294d06513eff5043eb6263ce9c07dbe557e838b990b754ded03a08644ff9e7216bbe6989098cdd1bbe2f16b47de9b1e  vulkan-1.2.174-compat.patch
 "

community/monado/vulkan-1.2.174-compat.patch

+From c47775a95d8e139a2f234063793eb6726f830510 Mon Sep 17 00:00:00 2001
+From: Christoph Haag <christoph.haag@collabora.com>
+Date: Mon, 19 Apr 2021 13:04:59 +0200
+Subject: [PATCH] comp: Fix warning after Vulkan 1.2.174 VK_NULL_HANDLE change
+
+../src/xrt/compositor/main/comp_layer_renderer.c:317:17: warning: initialization of 'unsigned int' from 'void *' makes integer from pointer without a cast [-Wint-conversion]
+  317 |      .subpass = VK_NULL_HANDLE,
+      |                 ^~~~~~~~~~~~~~
+---
+ src/xrt/compositor/main/comp_layer_renderer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xrt/compositor/main/comp_layer_renderer.c b/src/xrt/compositor/main/comp_layer_renderer.c
+index c59232a94..d8a0a6321 100644
+--- a/src/xrt/compositor/main/comp_layer_renderer.c
++++ b/src/xrt/compositor/main/comp_layer_renderer.c
+@@ -314,7 +314,7 @@ _init_graphics_pipeline(struct comp_layer_renderer *self,
+ 	                    VK_DYNAMIC_STATE_SCISSOR,
+ 	                },
+ 	        },
+-	    .subpass = VK_NULL_HANDLE,
++	    .subpass = 0,
+ 	};
+ 
+ 	VkResult res;
+-- 
+GitLab
+