gentoo auto-resync : 27:04:2023 - 12:17:07

4 files changed, 94 insertions, 1 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 29c696b7c70f..88c5c5c07312 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,8 @@
+AUX mesa-23.0.2-wayland-crash-warnings-2.patch 1854 BLAKE2B e0aaa149f3a3c45dc4ea57b28146b19774d386bfd070ad22344596caa8fbba1eaed37ce6938792be448bb1adb1a37fc3c004bdca486592db84aea26dacf4d167 SHA512 762f2917aead5ead4586a0875cb79f56c5a1becc80fa37e15e46bfb432a679f8e31025cca55c1d5068efebb60367eb11223e24c729406a9ce56ba536796acb0d
+AUX mesa-23.0.2-wayland-crash-warnings.patch 1430 BLAKE2B a7c7ef4a34ac9c76c4c5af783510887705a1d6acbc62978b2cc8a021534e215404de3d5828d9c052dccc85808da5b0553f9172fa8edccb40ed7fdc6bc1df35c3 SHA512 98b8a3de99c96474a07615b225b00773c9988a05e25a70cc6586c60762bea8d1a0bbbb47d45e8a38d780951a83abd2c6bbda19180b2457a686625b140b570014
 DIST mesa-22.3.7.tar.xz 17136476 BLAKE2B 291e94302d3a177f842def9339d1ba012bf10de792b7120985255168faac6b87a73d1d59d8b430f56ea2a2640ca0890a5c3721188b70c528b9aad9788d7e139d SHA512 c37bbcb3c0be1908726d6f83bfe98126d681935e401e03946e8b540611f832d2f272a2ac470600c2b77caa5b9a3a9059eb34bd9a93fcf88df114bedf8c39bf5a
 DIST mesa-23.0.3.tar.xz 17627728 BLAKE2B e716d9ddce3da649239c1bc37ec208b9669f316f6b547ca0c69937043f371f0d59ead34fec427297171916045061ddb8783d126f6dec5ece90a0719003fe2c40 SHA512 52c778de61daa406c6a1e96a657e9b6fdcc71c8cfda80b7f53acc6470556c7d502c057b9481bb0c3d57ef0263263413fd0d25d53ebf5aa0246fbcc3309de64ae
 EBUILD mesa-22.3.7-r1.ebuild 12130 BLAKE2B a735afabb891b4b8600c5f00046496b12f845670b461f7fa078987368a2e0600729d45031dab04a7ad65a877df37445d33b25111ad43a65c0847f5a241bdf3d0 SHA512 c115092f8a8583f5f5bd71791541a6ff989b78b612a90ed95b9c189acb4ba9e3676269ad19e68df24b78dde8f84ad549e4976da7d50d9e6ca5c963d4c163192f
-EBUILD mesa-23.0.3.ebuild 12152 BLAKE2B 29d5a5df3e9222d41402b7a530264178d6c786b99334dca52b198a3ae0c49e5d1bb6d562fe3df718d78936b76592eebec5803efd5da2120d0ff464a0bcc69ffc SHA512 aa422813ae441467a77bc3e8af3c69a371788c80691f7e120b017b4a1cb0a609846c3661506d6ccce469ad1315c78f7431e479e703661ab0c8b59c3db7bc21dd
+EBUILD mesa-23.0.3-r1.ebuild 12281 BLAKE2B ee33a702a829d5d4e06c6e13999cd9e1778eb5a97d8ca38a319173b4bfb9f369f1936cfbb2efdd30a48faffe4c824f0252bd57eb0773ee79d1ab528d620b30ec SHA512 2cd60b52f55fb0cbcfd5ac0c27942ae3671ac85b27d6fbf2fb968fd0ed064ca74ab57a4bbd83d942bb68d4408662bfda62436e948d8e98184952d0dedb48d66b
 EBUILD mesa-9999.ebuild 12152 BLAKE2B 29d5a5df3e9222d41402b7a530264178d6c786b99334dca52b198a3ae0c49e5d1bb6d562fe3df718d78936b76592eebec5803efd5da2120d0ff464a0bcc69ffc SHA512 aa422813ae441467a77bc3e8af3c69a371788c80691f7e120b017b4a1cb0a609846c3661506d6ccce469ad1315c78f7431e479e703661ab0c8b59c3db7bc21dd
 MISC metadata.xml 1606 BLAKE2B 0f0d0be785aef5042a0a0ae6ce0855dea4ff0105db96339f6f81ac8e3e956f363a90d08bf087924e33873e9bf0182487cdd7ba7baa72b97d17db8afdc375b7e5 SHA512 cf6fe4938eef2e6bccbea43e63b271b5f55ad73b3201a36c484b0f72cd56efb70df6502296828a778477d72848474d8bdbf5ab270dc1dbe96b7464716a1bdc82
diff --git a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch
new file mode 100644
index 000000000000..5992583a1fa0
--- /dev/null
+++ b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/904072
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647
+
+From 689ce66a4332524b4eb98877de6f75d05dd05c60 Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+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 <alexandros.frantzis@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647>
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -1157,18 +1157,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);
+ }
+ 
+-- 
+GitLab
diff --git a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch
new file mode 100644
index 000000000000..537d070c091e
--- /dev/null
+++ b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/904072
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646
+
+From ee5d2250fd159689aae3f7d632a6226971bea85c Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Date: Thu, 2 Mar 2023 09:35:08 +0200
+Subject: [PATCH] egl/wayland: Fix destruction of event queue with proxies
+ still attached.
+
+Destroy the display wrapper 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
+EGL/Wayland:
+
+warning: queue 0x562a5ed2cd20 destroyed while proxies still attached:
+  wl_display@1 still attached
+
+Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646>
+--- a/src/egl/drivers/dri2/platform_wayland.c
++++ b/src/egl/drivers/dri2/platform_wayland.c
+@@ -2865,10 +2865,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy)
+       wl_shm_destroy(dri2_dpy->wl_shm);
+    if (dri2_dpy->wl_registry)
+       wl_registry_destroy(dri2_dpy->wl_registry);
+-   if (dri2_dpy->wl_queue)
+-      wl_event_queue_destroy(dri2_dpy->wl_queue);
+    if (dri2_dpy->wl_dpy_wrapper)
+       wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
++   if (dri2_dpy->wl_queue)
++      wl_event_queue_destroy(dri2_dpy->wl_queue);
+ 
+    if (dri2_dpy->own_device)
+       wl_display_disconnect(dri2_dpy->wl_dpy);
+-- 
+GitLab
diff --git a/media-libs/mesa/mesa-23.0.3.ebuild b/media-libs/mesa/mesa-23.0.3-r1.ebuild
index 1d4bb730495f..767e5341ebf6 100644
--- a/media-libs/mesa/mesa-23.0.3.ebuild
+++ b/media-libs/mesa/mesa-23.0.3-r1.ebuild
@@ -206,6 +206,11 @@ x86? (
 	usr/lib/libGLX_mesa.so.0.0.0
 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.2-wayland-crash-warnings.patch
+	"${FILESDIR}"/${PN}-23.0.2-wayland-crash-warnings-2.patch
+)
+
 llvm_check_deps() {
 	local flags=${MULTILIB_USEDEP}
 	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi