Date: Saturday, April 8, 2023 @ 11:38:53
Author: heftig
Revision: 473306
23.0.2-2: add patch for FS#78142
Added:
mesa/trunk/0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
Modified:
mesa/trunk/PKGBUILD
-----------------------------------------------------------------+
0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch | 50
++++++++++
PKGBUILD | 9 +
2 files changed, 58 insertions(+), 1 deletion(-)
Added: 0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
===================================================================
--- 0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
(rev 0)
+++ 0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
2023-04-08 11:38:53 UTC (rev 473306)
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis <[email protected]>
+Date: Thu, 2 Mar 2023 10:10:42 +0200
+Subject: [PATCH] vulkan/wsi/wayland: Fix destruction of event queue with
+ proxies still attached.
+
+Destroy the surface dmabuf feedback proxy before destroying the event
+queue that the proxy is attached to.
+
+This silences a warning that libwayland 1.22 emits for programs that use
+Vulkan/Wayland:
+
+warning: queue 0x557a4efbcf70 destroyed while proxies still attached:
+ zwp_linux_dmabuf_feedback_v1@18 still attached
+
+Signed-off-by: Alexandros Frantzis <[email protected]>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647>
+---
+ src/vulkan/wsi/wsi_common_wayland.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/vulkan/wsi/wsi_common_wayland.c
b/src/vulkan/wsi/wsi_common_wayland.c
+index 0c6560371f75..6a241bcfabe1 100644
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -1156,18 +1156,18 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface,
VkInstance _instance,
+ struct wsi_wl_surface *wsi_wl_surface =
+ wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface,
base);
+
+- if (wsi_wl_surface->surface)
+- wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
+-
+- if (wsi_wl_surface->display)
+- wsi_wl_display_destroy(wsi_wl_surface->display);
+-
+ if (wsi_wl_surface->wl_dmabuf_feedback) {
+
zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback);
+ dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback);
+ dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback);
+ }
+
++ if (wsi_wl_surface->surface)
++ wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
++
++ if (wsi_wl_surface->display)
++ wsi_wl_display_destroy(wsi_wl_surface->display);
++
+ vk_free2(&instance->alloc, pAllocator, wsi_wl_surface);
+ }
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-08 11:31:31 UTC (rev 473305)
+++ PKGBUILD 2023-04-08 11:38:53 UTC (rev 473306)
@@ -7,7 +7,7 @@
pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon'
'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
pkgdesc="An open-source implementation of the OpenGL specification"
pkgver=23.0.2
-pkgrel=1
+pkgrel=2
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm'
'libxshmfence' 'libxxf86vm'
'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
'zstd' 'elfutils' 'llvm'
@@ -19,16 +19,19 @@
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
0001-intel-fs-fix-scheduling-of-HALT-instructions.patch
0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
+ 0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
LICENSE)
sha256sums=('1b7d3399fc6f16f030361f925d33ebc7600cbf98094582f54775b6a1180529e7'
'SKIP'
'dc6790b5be0e80c23e74ae18ca1a2b40f57f4211cc7b645bf22b63af3b790e40'
'c25493de3e5930702acf833d182aeca0895d6a9d9e830dca15c42d130e25c41c'
+ 'db2be7ae0540d65e77449eda1af66200e27af382183fdcd0c87f99db3520b80a'
'7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
b2sums=('5a90fcd8b7096dde1e6c82b9bb5b00622cc1cf35e4308419441d3489d66ed322843db89f2f1162c8c30f6bcddbce867447f83425a29145bd42a742b773ec1258'
'SKIP'
'37d1d070c45c85bce8abe3524a3f8d9ac9ed6326a3eec653cd89fffce3630b08eb9b96b11aeb495488230449c99f9b508f73a15e53265d2b159286b0e2dda7cc'
'ae891637318fdbb8dd58285098af7bea709fb032969a5671eb225a4a471bf9422fac2a6cb0fd188aad96ea5a03eb043f646f5d371dd655a100046adb1c91bd7d'
+
'a7312e0931904e659b3d33fcb37b13bcadab943c6040dd2b58ea191db350b50c1ba588e334b7e59b513bd6155797e29dc1bd1a6a35a278b3824d06534f2c9d17'
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<[email protected]>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<[email protected]>
@@ -48,6 +51,10 @@
# https://bugzilla.mozilla.org/show_bug.cgi?id=1826583
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646
patch -Np1 -i
../0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
+
+ # https://bugs.archlinux.org/task/78142
+ # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647
+ patch -Np1 -i
../0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
}
build() {
