From nobody Tue Apr 04 09:22:27 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PrMjb6GRpz43GlJ; Tue, 4 Apr 2023 09:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PrMjb5r9hz3sNw; Tue, 4 Apr 2023 09:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680600147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mcMuuYn0oZm7WRQ31VkhVM7dobbBdU2a5foXkH9zNnQ=; b=rH1MbAYQ+2b4zBOFCOn/HRDBfMz3aIzd7LdlBDtnwVD9q6/YW+CR/qTe20fru1/FRoIb4d UrgxEYKV56w0XBgBvterNHreaqYkwXI7R8q8XXrty5lfzwnkZ1jx4IPydhqqHEL6KnWnxR NLyVhOTPzjb0IvJGp2CYhFEPkUaRLUKyHH1RKIBplLTj0Y18NjuN4w5NRF+qhrzisssgbr wkELDPGeKerOTtQwkEzvk2e2ivpwzBebgSV80UzRbhCDSJx+ir39MEAatDayjhEPsGRrGd B70HkqSiON4BU+uxjFzVszdJMWlPK1YHLBi2lC5XUsKwL9hmg856AX4IXTLekw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680600147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mcMuuYn0oZm7WRQ31VkhVM7dobbBdU2a5foXkH9zNnQ=; b=gVFutEIoM+lx9nJ9rCtpgqVt7P3grplEG5m8jasKE5lBp6wlw7mzzNzeUq3PTaaT7YwiDr b9gQ095ycyMTQdryetvJDK52dDQd4SUGrjudfjY5QZdLdHDW1/JFjucFjgrymPbsXVKFyG 5EX6B+XnweTB3UL/Hd6mokGhjMolS95wBs/yTt0Sgt2r6AHsI6EuihTOuX8EUgPvaAjJsE wz0TPoiNLLgkSwbFm6tVbwz3NpmW5hEXFCqJqKSU8EK4lfRDtMMM7NobSyIiKRXn56MWOS xhPnaqEttiKsgmn7A4BWARdE24iZ9zaoOdm59mMoSzTZ8uUdgMXN5UVq3sKHWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680600147; a=rsa-sha256; cv=none; b=gui3OC2TzRZXwnzc8FsxvUH3HSW1df9tEZhZF3DRCmv9jsC/HmPf3j5Zc791k5uGNpqnFf C05b1YqKQ8XYDKGistwdLlZajUpkQaeHA2zV97ETh/Zk2pbamY5aDbnUVkAMU5EJVnhOfj RcNxyMktFidbUknShKnwLcja/uSlcV7NT1a4fa9hw5r2YjWsFofIKFBKnYLdzAS1UYJAA3 f4+lG/rJxk0o6BArsuLtf+sVubnKOZ0rMnKnMOqZbwadSuKIb+Y+A3hfzCaKAH7q2uX1dH MEBCf581VwHL555vnopx05lWaarMKA8pAGc572KhtJO76tK2IQCjZcuiwTBclw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PrMjb4vTgzYqx; Tue, 4 Apr 2023 09:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3349MR1W005116; Tue, 4 Apr 2023 09:22:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3349MRKw005115; Tue, 4 Apr 2023 09:22:27 GMT (envelope-from git) Date: Tue, 4 Apr 2023 09:22:27 GMT Message-Id: <202304040922.3349MRKw005115@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f880209f7ec5 - main - graphics/mesa-dri: fix Wayland warnings on exit after d2c3c81a5310 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f880209f7ec5adb91ff10488a08c5f2292aa651f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f880209f7ec5adb91ff10488a08c5f2292aa651f commit f880209f7ec5adb91ff10488a08c5f2292aa651f Author: Jan Beich AuthorDate: 2023-02-28 16:15:31 +0000 Commit: Jan Beich CommitDate: 2023-04-04 09:22:20 +0000 graphics/mesa-dri: fix Wayland warnings on exit after d2c3c81a5310 warning: queue 0x562a5ed2cd20 destroyed while proxies still attached: wl_display@1 still attached warning: queue 0x557a4efbcf70 destroyed while proxies still attached: zwp_linux_dmabuf_feedback_v1@18 still attached PR: 269877 Obtained from: upstream (mesa-23.1.0) Exp-run by: antoine Approved by: manu --- graphics/mesa-dri/files/patch-wayland-1.22 | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) 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); + }