From nobody Sat Aug 26 04:08:53 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 4RXjxK44ZHz4rFCq; Sat, 26 Aug 2023 04:08:53 +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 4RXjxK37GYz3JFc; Sat, 26 Aug 2023 04:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693022933; 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=oasXAQO74ArUXdCypEtNB2BvcrNyxyZ7gKo9Xewrmoo=; b=no6X+ZDB1IwxhnMFJ2z3Bnuy69eFXmGAJ/KeZvlfAefhjCxOpCXVEMACLcyvhluhdWEeUU S07oQ7w+3ptCooBsZwshhoRodokyQlkAHRudlh5nqoulS02IClCoib8P2jwhqXRU3FyVme heP4imsnvxHPyp6en2M5QB8CY8p3W7V7fY1K4cYJoXsi4otdNA4y+RABisTkf7m6ChOSPv g1ROvCyQ3JCTe+RcMWpTGNUT0NrrJaA6nho0Amv6juAMdYdaeruOYw+NT3O1AtlaBB29+d ZUs3VH8mN6HHcWEhAjtnqTIzIX5m0ZXg6ugUKv3IUCBlexl6VRJXB+xCMvDZaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693022933; 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=oasXAQO74ArUXdCypEtNB2BvcrNyxyZ7gKo9Xewrmoo=; b=q6HZ1rRff7mQqDjYbisLnUCAf66hZ0F/tBxjOgfhz3gexAv+BV05sDMDzhJbsAJehU/Hh7 yVV8uECY6DCjHGJNy1xC6sCVaCvpF6xAeD2qsLl1aEVY3fOUmq3hHEoBLtWfcN40dTkKAb AiYiNbAlAB0Z3unXOD1zvO2RTiWnnnO0cF/7STbn5UAJS39dHDaDpMQv/lGNeBXpNt6l5F Vl7VwrMC23rYeWHTWb/ukGF1xAnjvy9k7WTXap2tK9dDGPIHJ5D58yG3lRwlp8GlLyK43A HuRXg9Ujh3o9VDw0Yrm0vfNBem1R0WStjQh5iF3CxdLK0cWgBm1irg1cEAXnVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693022933; a=rsa-sha256; cv=none; b=MqBmW0OJxiWAb6VHUe+0RvUNdbqUKuazIMGCNHAgUsFX7HKrrOfDNw2zmtucFvdfewY4s+ sRyTApZcNhDT1BT+ABC6lfh1O25NJEpSWUVOf3MVAqJw0MHBm+ba/uGxEhowKaJXDLsgnH jqWK4/alFGkf3EbtJhh4ukujo8CAYSONmXkh24VnolZZHhF5JIvyHbbqFaXQWYd77RHFfn fJ+SMCyMkHwzlYI04xwJ+WI6i1fDY5oaJ0vtOX1no92SerOF2br9cXFSNbPtZIhOipJPii xGpaA7iN8YdaQ8xBAqgJ0XJeYjEYGg1gJiF/iwqlOi8kyoZW6sm1+8CPiPqj0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RXjxK2Bf9z5ml; Sat, 26 Aug 2023 04:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37Q48ruS048991; Sat, 26 Aug 2023 04:08:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37Q48re9048988; Sat, 26 Aug 2023 04:08:53 GMT (envelope-from git) Date: Sat, 26 Aug 2023 04:08:53 GMT Message-Id: <202308260408.37Q48re9048988@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: f429513358d3 - main - graphics/mesa-devel: unbreak Vulkan on Wayland after 157c391cc1f5 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: f429513358d3820dafd4b7494230fa3b7a52755e Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f429513358d3820dafd4b7494230fa3b7a52755e commit f429513358d3820dafd4b7494230fa3b7a52755e Author: Jan Beich AuthorDate: 2023-08-26 03:56:00 +0000 Commit: Jan Beich CommitDate: 2023-08-26 04:08:18 +0000 graphics/mesa-devel: unbreak Vulkan on Wayland after 157c391cc1f5 $ vkcube-wayland Selected GPU 0: Intel(R) HD Graphics 530 (SKL GT2), type: IntegratedGpu Segmentation fault (lldb) bt * thread #1, name = 'vkcube-wayland', stop reason = signal SIGSEGV: invalid address (fault address: 0x40) * frame #0: 0x000000082114a4dc libwayland-client.so`wl_proxy_get_version(proxy=0x0000000000000000) at wayland-client.c:2248:16 frame #1: 0x000000082b8543e1 libvulkan_intel.so`wp_tearing_control_manager_v1_get_tearing_control(wp_tearing_control_manager_v1=0x0000000000000000, surface=0x0000245a71e110a0) at tearing-control-v1-client-protocol.h:191:90 frame #2: 0x000000082b852016 libvulkan_intel.so`wsi_wl_surface_create_swapchain(icd_surface=0x0000245a71e32e00, device=0x0000245a71f47400, wsi_device=0x0000245a71eb1ae0, pCreateInfo=0x0000000820617900, pAllocator=0x0000245a71f47440, swapchain_out=0x00000008206178d8) at wsi_common_wayland.c:2277:10 frame #3: 0x000000082b842be4 libvulkan_intel.so`wsi_CreateSwapchainKHR(_device=0x0000245a71f47400, pCreateInfo=0x0000000820617900, pAllocator=0x0000000000000000, pSwapchain=0x0000000820618700) at wsi_common.c:930:22 frame #4: 0x0000000822051bef libvulkan.so.1`terminator_CreateSwapchainKHR + 223 frame #5: 0x000000000021136b vkcube-wayland`demo_prepare_buffers(demo=0x0000000820617c30) at cube.c:1408:11 frame #6: 0x000000000020c679 vkcube-wayland`demo_prepare(demo=0x0000000820617c30) at cube.c:2302:5 frame #7: 0x000000000020af7a vkcube-wayland`main(argc=1, argv=0x0000000820618a38) at cube.c:4592:5 frame #8: 0x000000082356e5fa libc.so.7`__libc_start1(argc=1, argv=0x0000000820618a38, env=0x0000000820618a48, cleanup=, mainX=(vkcube-wayland`main at cube.c:4574)) at libc_start1.c:157:7 frame #9: 0x00000000002085d0 vkcube-wayland`_start at crt1_s.S:83 (lldb) f 2 frame #2: 0x000000082b852016 libvulkan_intel.so`wsi_wl_surface_create_swapchain(icd_surface=0x0000245a71e32e00, device=0x0000245a71f47400, wsi_device=0x0000245a71eb1ae0, pCreateInfo=0x0000000820617900, pAllocator=0x0000245a71f47440, swapchain_out=0x00000008206178d8) at wsi_common_wayland.c:2277:10 2274 2275 if (chain->base.present_mode == VK_PRESENT_MODE_IMMEDIATE_KHR) { 2276 chain->tearing_control = -> 2277 wp_tearing_control_manager_v1_get_tearing_control(wsi_wl_surface->display->tearing_control_manager, 2278 wsi_wl_surface->surface); 2279 if (!chain->tearing_control) { 2280 result = VK_ERROR_OUT_OF_HOST_MEMORY; (lldb) p wsi_wl_surface->display->tearing_control_manager (wp_tearing_control_manager_v1 *) $0 = NULL --- graphics/mesa-devel/Makefile | 2 ++ graphics/mesa-devel/distinfo | 2 ++ 2 files changed, 4 insertions(+) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 8c841da4c34a..09c3216b8603 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= mesa DISTVERSION= 23.2.0-branchpoint-2949 DISTVERSIONSUFFIX= -g5ce6e09ffc7 +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -8,6 +9,7 @@ PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 700efacda59c.patch:-p1 PATCHFILES+= 3043f16d66bf.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881 PATCHFILES+= 2930dcbb3329.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246 +PATCHFILES+= 63003b7bf9cb.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24885 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan) diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 847390fb1c56..cc9db1ee4dc1 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -7,3 +7,5 @@ SHA256 (3043f16d66bf.patch) = b596e02eb42d2cdd0b47cc4de98db4981b36069d0ab857c6f1 SIZE (3043f16d66bf.patch) = 2052 SHA256 (2930dcbb3329.patch) = 4fb8c49aed648ec299ce976db7d783a5bd93953807de7f0ee3858ecf777faa25 SIZE (2930dcbb3329.patch) = 1624 +SHA256 (63003b7bf9cb.patch) = 18f44a358471ffbe70a803024bb98fc6715b5b84f7882af6e108aa2e564cf951 +SIZE (63003b7bf9cb.patch) = 1987