FreeBSD Bugzilla – Attachment 240891 Details for
Bug 269877
graphics/wayland: update to 1.22.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v0.1 (beta)
bug269877.diff (text/plain), 5.19 KB, created by
Jan Beich
on 2023-03-16 10:10:33 UTC
(
hide
)
Description:
v0.1 (beta)
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2023-03-16 10:10:33 UTC
Size:
5.19 KB
patch
obsolete
>From 9245aab6abdf117fe46452bb42c5855fa43f35c3 Mon Sep 17 00:00:00 2001 >From: Jan Beich <jbeich@FreeBSD.org> >Date: Tue, 28 Feb 2023 16:15:31 +0000 >Subject: [PATCH] graphics/wayland: update to 1.22.0 > >Changes: https://gitlab.freedesktop.org/wayland/wayland/-/compare/1.21.0...1.21.92 >Reported by: GitLab (notify releases) >PR: 269877 >Exp-run by: antoine >Approved by: manu >--- > graphics/mesa-dri/Makefile | 1 + > graphics/mesa-dri/files/patch-wayland-1.22 | 44 ++++++++++++++++++++++ > graphics/mesa-libs/Makefile | 1 + > graphics/wayland/Makefile | 2 +- > graphics/wayland/distinfo | 6 +-- > graphics/wayland/pkg-plist | 8 ++-- > 6 files changed, 54 insertions(+), 8 deletions(-) > create mode 100644 graphics/mesa-dri/files/patch-wayland-1.22 > >diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile >index 94c8503053a7..9528ab8b625d 100644 >--- a/graphics/mesa-dri/Makefile >+++ b/graphics/mesa-dri/Makefile >@@ -1,5 +1,6 @@ > PORTNAME= mesa-dri > PORTVERSION= ${MESAVERSION} >+PORTREVISION= 1 > CATEGORIES= graphics > > COMMENT= OpenGL hardware acceleration drivers for DRI2+ >diff --git a/graphics/mesa-dri/files/patch-wayland-1.22 b/graphics/mesa-dri/files/patch-wayland-1.22 >new file mode 100644 >index 000000000000..b02fed65996b >--- /dev/null >+++ b/graphics/mesa-dri/files/patch-wayland-1.22 >@@ -0,0 +1,44 @@ >+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); >+ } >diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile >index 35b31e771f4d..dcc7b5422b80 100644 >--- a/graphics/mesa-libs/Makefile >+++ b/graphics/mesa-libs/Makefile >@@ -1,5 +1,6 @@ > PORTNAME= mesa-libs > PORTVERSION= ${MESAVERSION} >+PORTREVISION= 1 > CATEGORIES= graphics > > COMMENT= OpenGL libraries that support GLX and EGL clients >diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile >index 943d4c92c020..b5e056217aaa 100644 >--- a/graphics/wayland/Makefile >+++ b/graphics/wayland/Makefile >@@ -1,5 +1,5 @@ > PORTNAME= wayland >-DISTVERSION= 1.21.0 >+DISTVERSION= 1.21.92 > CATEGORIES= graphics wayland > MASTER_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/ > >diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo >index 969fbc344523..afec164fb9ea 100644 >--- a/graphics/wayland/distinfo >+++ b/graphics/wayland/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1656626351 >-SHA256 (wayland-1.21.0.tar.xz) = 6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac >-SIZE (wayland-1.21.0.tar.xz) = 225936 >+TIMESTAMP = 1678925324 >+SHA256 (wayland-1.21.92.tar.xz) = d5ed46e7dca8479614a7ef0518464e49fd4fa549ed6cdba963eabe12a6bccf81 >+SIZE (wayland-1.21.92.tar.xz) = 229400 >diff --git a/graphics/wayland/pkg-plist b/graphics/wayland/pkg-plist >index 5afbd4f41b72..2268beaafd17 100644 >--- a/graphics/wayland/pkg-plist >+++ b/graphics/wayland/pkg-plist >@@ -13,16 +13,16 @@ include/wayland-util.h > include/wayland-version.h > lib/libwayland-client.so > lib/libwayland-client.so.0 >-lib/libwayland-client.so.0.21.0 >+lib/libwayland-client.so.0.21.92 > lib/libwayland-cursor.so > lib/libwayland-cursor.so.0 >-lib/libwayland-cursor.so.0.21.0 >+lib/libwayland-cursor.so.0.21.92 > lib/libwayland-egl.so > lib/libwayland-egl.so.1 >-lib/libwayland-egl.so.1.21.0 >+lib/libwayland-egl.so.1.21.92 > lib/libwayland-server.so > lib/libwayland-server.so.0 >-lib/libwayland-server.so.0.21.0 >+lib/libwayland-server.so.0.21.92 > libdata/pkgconfig/wayland-client.pc > libdata/pkgconfig/wayland-cursor.pc > libdata/pkgconfig/wayland-egl-backend.pc
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 269877
:
240482
|
240891
|
241291