Attachment #240891 for bug #269877

Lines 1-5 Link Here

(-)b/graphics/mesa-dri/Makefile (+1 lines)
1	PORTNAME= mesa-dri	1	PORTNAME= mesa-dri
2	PORTVERSION= ${MESAVERSION}	2	PORTVERSION= ${MESAVERSION}
		3	PORTREVISION= 1
3	CATEGORIES= graphics	4	CATEGORIES= graphics
4		5
5	COMMENT= OpenGL hardware acceleration drivers for DRI2+	6	COMMENT= OpenGL hardware acceleration drivers for DRI2+




https://gitlab.freedesktop.org/mesa/mesa/-/commit/ee5d2250fd15
https://gitlab.freedesktop.org/mesa/mesa/-/commit/689ce66a4332

--- src/egl/drivers/dri2/platform_wayland.c.orig	2023-03-08 18:37:09 UTC
+++ src/egl/drivers/dri2/platform_wayland.c
@@ -2789,10 +2789,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dp
       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);
--- src/vulkan/wsi/wsi_common_wayland.c.orig	2023-03-08 18:37:09 UTC
+++ src/vulkan/wsi/wsi_common_wayland.c
@@ -1156,17 +1156,17 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, 
    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);
 }

Lines 1-5 Link Here

(-)b/graphics/mesa-libs/Makefile (+1 lines)
1	PORTNAME= mesa-libs	1	PORTNAME= mesa-libs
2	PORTVERSION= ${MESAVERSION}	2	PORTVERSION= ${MESAVERSION}
		3	PORTREVISION= 1
3	CATEGORIES= graphics	4	CATEGORIES= graphics
4		5
5	COMMENT= OpenGL libraries that support GLX and EGL clients	6	COMMENT= OpenGL libraries that support GLX and EGL clients

Lines 1-5 Link Here

(-)b/graphics/wayland/Makefile (-1 / +1 lines)
1	PORTNAME= wayland	1	PORTNAME= wayland
2	DISTVERSION= 1.21.0	2	DISTVERSION= 1.21.92
3	CATEGORIES= graphics wayland	3	CATEGORIES= graphics wayland
4	MASTER_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/	4	MASTER_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/
5		5

Lines 1-3 Link Here

(-)b/graphics/wayland/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1656626351	1	TIMESTAMP = 1678925324
2	SHA256 (wayland-1.21.0.tar.xz) = 6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac	2	SHA256 (wayland-1.21.92.tar.xz) = d5ed46e7dca8479614a7ef0518464e49fd4fa549ed6cdba963eabe12a6bccf81
3	SIZE (wayland-1.21.0.tar.xz) = 225936	3	SIZE (wayland-1.21.92.tar.xz) = 229400




include/wayland-version.h
lib/libwayland-client.so
lib/libwayland-client.so.0
lib/libwayland-client.so.0.21.92
lib/libwayland-cursor.so
lib/libwayland-cursor.so.0
lib/libwayland-cursor.so.0.21.92
lib/libwayland-egl.so
lib/libwayland-egl.so.1
lib/libwayland-egl.so.1.21.92
lib/libwayland-server.so
lib/libwayland-server.so.0
lib/libwayland-server.so.0.21.92
libdata/pkgconfig/wayland-client.pc
libdata/pkgconfig/wayland-cursor.pc
libdata/pkgconfig/wayland-egl-backend.pc

Return to bug 269877

Added Link Here

(-)b/graphics/mesa-dri/files/patch-wayland-1.22 (+44 lines)
1	https://gitlab.freedesktop.org/mesa/mesa/-/commit/ee5d2250fd15
2	https://gitlab.freedesktop.org/mesa/mesa/-/commit/689ce66a4332
3
4	--- src/egl/drivers/dri2/platform_wayland.c.orig 2023-03-08 18:37:09 UTC
5	+++ src/egl/drivers/dri2/platform_wayland.c
6	@@ -2789,10 +2789,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dp
7	wl_shm_destroy(dri2_dpy->wl_shm);
8	if (dri2_dpy->wl_registry)
9	wl_registry_destroy(dri2_dpy->wl_registry);
10	- if (dri2_dpy->wl_queue)
11	- wl_event_queue_destroy(dri2_dpy->wl_queue);
12	if (dri2_dpy->wl_dpy_wrapper)
13	wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
14	+ if (dri2_dpy->wl_queue)
15	+ wl_event_queue_destroy(dri2_dpy->wl_queue);
16
17	if (dri2_dpy->own_device)
18	wl_display_disconnect(dri2_dpy->wl_dpy);
19	--- src/vulkan/wsi/wsi_common_wayland.c.orig 2023-03-08 18:37:09 UTC
20	+++ src/vulkan/wsi/wsi_common_wayland.c
21	@@ -1156,17 +1156,17 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface,
22	struct wsi_wl_surface *wsi_wl_surface =
23	wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base);
24
25	- if (wsi_wl_surface->surface)
26	- wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
27	-
28	- if (wsi_wl_surface->display)
29	- wsi_wl_display_destroy(wsi_wl_surface->display);
30	-
31	if (wsi_wl_surface->wl_dmabuf_feedback) {
32	zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback);
33	dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback);
34	dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback);
35	}
36	+
37	+ if (wsi_wl_surface->surface)
38	+ wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
39	+
40	+ if (wsi_wl_surface->display)
41	+ wsi_wl_display_destroy(wsi_wl_surface->display);
42
43	vk_free2(&instance->alloc, pAllocator, wsi_wl_surface);
44	}

Lines 13-28 include/wayland-util.h Link Here

(-)b/graphics/wayland/pkg-plist (-4 / +4 lines)
13	include/wayland-version.h	13	include/wayland-version.h
14	lib/libwayland-client.so	14	lib/libwayland-client.so
15	lib/libwayland-client.so.0	15	lib/libwayland-client.so.0
16	lib/libwayland-client.so.0.21.0	16	lib/libwayland-client.so.0.21.92
17	lib/libwayland-cursor.so	17	lib/libwayland-cursor.so
18	lib/libwayland-cursor.so.0	18	lib/libwayland-cursor.so.0
19	lib/libwayland-cursor.so.0.21.0	19	lib/libwayland-cursor.so.0.21.92
20	lib/libwayland-egl.so	20	lib/libwayland-egl.so
21	lib/libwayland-egl.so.1	21	lib/libwayland-egl.so.1
22	lib/libwayland-egl.so.1.21.0	22	lib/libwayland-egl.so.1.21.92
23	lib/libwayland-server.so	23	lib/libwayland-server.so
24	lib/libwayland-server.so.0	24	lib/libwayland-server.so.0
25	lib/libwayland-server.so.0.21.0	25	lib/libwayland-server.so.0.21.92
26	libdata/pkgconfig/wayland-client.pc	26	libdata/pkgconfig/wayland-client.pc
27	libdata/pkgconfig/wayland-cursor.pc	27	libdata/pkgconfig/wayland-cursor.pc
28	libdata/pkgconfig/wayland-egl-backend.pc	28	libdata/pkgconfig/wayland-egl-backend.pc