From nobody Tue Jan 31 00:57:32 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 4P5RV50QbKz3bwLJ; Tue, 31 Jan 2023 00:57:33 +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 4P5RV475N7z4YZ7; Tue, 31 Jan 2023 00:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675126653; 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=BsW7FVdPDORWuGq8X955w0baV+/A0to090mUSaOW8sQ=; b=FRuo6KWdujDncsFjxowpIMhGUUr328IQJSCUsg6Wu4MO/+qmnPyV2WzoFil+MmOlbtEUjL UGblzxzrg+mQnBqLqrPEIOpoZyrmaN80FoEtdgcwq//BwBCzoRcx2UYqQm9DL/JUD15a89 woHBrOrj8J77ADtjU+xGScvCOWWqGVfLQYY50J5Td5GIiz2fq+S2NC0PaZIPQfEH+ocwKU JbXQj4WSwDWQig3jwd5XHKlltdkKcTmU4fvbVrx4AZoruPZR7C639/RXrxAukJURiBdsZw D7z15OWj4+oBpUDjAJFJpz/Oj3/o0urvn3l3Ew5PZcQEkPqhKh+CSIDm7Omg2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675126653; 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=BsW7FVdPDORWuGq8X955w0baV+/A0to090mUSaOW8sQ=; b=daEU82Gt44ts/JvDVsUtA3LFLHH/PvPj+EI5GyN/uaUHPcE1lsLSQq48d/0jZOVeJLoZG5 5DA9CyHwVmHhqvUGgF0mZ/Zt4bqUsAbg4jkee4fSkcGWnovPuW3RLLFD9KKiKJoLgdlqqA o2nHFxGEwnSMAAa1AFqZ04vYtBiH8MPpGZ6aHRucSanG/pIL68EZFaner1a9wNkxVfKAeB drTys7pvuFPubqm5EEXyQfAuutKYlhLH+uEIhl6yhXafnC3n1IM3aID2LKGyK9OYAlx0Ye HOXqXaYy2n8T0MuMS5kuGTKe+F5FK89iixDZkSKb4oeTno0mj5oBVW/ZnoL+NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675126653; a=rsa-sha256; cv=none; b=lHlDeoit1FCpOZjSp/ZhDSxJyyEq1lZTjxPGEHB7TjFDg+s0nTmChrgcHgIeZlHlv+xwI4 wZIjDHJ8sRGHcVUUaoGqNSDuIAnqjXZA0aZQle3BwqouC9F6DZgWrPqizH2hm13IKoEkM2 bEoTblsVzKmD943a/FczuAPDboRMGwoHF+4CEJeq2web/kK59e3ouX2tghZhWoLH1ngEOE BINgAryEdEQz/Yri0xgNYdr9xXtliSB2dq4KbZvd3FGRVFX/fv+wyk/WzBlAeoyqnVBBR4 de6dJUNYxyMozNnXkL6YvbESugd/J09KfLrJt84rcViZKDg0MIOMAcHi+TDS7g== 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 4P5RV461VGzV5G; Tue, 31 Jan 2023 00:57:32 +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 30V0vWfo087637; Tue, 31 Jan 2023 00:57:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0vWb6087636; Tue, 31 Jan 2023 00:57:32 GMT (envelope-from git) Date: Tue, 31 Jan 2023 00:57:32 GMT Message-Id: <202301310057.30V0vWb6087636@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: 18db2acd8def - main - graphics/mesa-devel: update to 23.0.b.740 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: 18db2acd8def5369e93d60bb7e1b57910bb5706d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=18db2acd8def5369e93d60bb7e1b57910bb5706d commit 18db2acd8def5369e93d60bb7e1b57910bb5706d Author: Jan Beich AuthorDate: 2023-01-16 19:57:13 +0000 Commit: Jan Beich CommitDate: 2023-01-31 00:57:13 +0000 graphics/mesa-devel: update to 23.0.b.740 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/842ca284650...29010669802 --- graphics/mesa-devel/Makefile | 5 +++-- graphics/mesa-devel/distinfo | 8 +++++--- .../patch-src_compiler_nir_nir__convert__ycbcr.c | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 7521d366e101..7879f46873b7 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,12 +1,13 @@ PORTNAME= mesa -DISTVERSION= 23.0-branchpoint-54 -DISTVERSIONSUFFIX= -g842ca284650 +DISTVERSION= 23.0-branchpoint-740 +DISTVERSIONSUFFIX= -g29010669802 CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 700efacda59c.patch:-p1 PATCHFILES+= 50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881 +PATCHFILES+= 1dc263a6b038.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20992 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 4321f09ab66c..741265f6e1d4 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1673648969 -SHA256 (mesa3d-mesa-23.0-branchpoint-54-g842ca284650_GH0.tar.gz) = 1c6e78a3bdf3e4d2e18cfa66d3b30a9121d37095a3b1022d4a93d7d69566d6cb -SIZE (mesa3d-mesa-23.0-branchpoint-54-g842ca284650_GH0.tar.gz) = 27647755 +TIMESTAMP = 1675115865 +SHA256 (mesa3d-mesa-23.0-branchpoint-740-g29010669802_GH0.tar.gz) = 1710cb333fc0c8b4f5f9e7cdf99ddeec5ce17963752983d7c67e68e05c087c01 +SIZE (mesa3d-mesa-23.0-branchpoint-740-g29010669802_GH0.tar.gz) = 27698041 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 SIZE (50433886a3e3.patch) = 2008 +SHA256 (1dc263a6b038.patch) = 07a2507ea6649780ac02b9a309b1b9101ab4f283ae52135b339c63440e3a07b2 +SIZE (1dc263a6b038.patch) = 2168 diff --git a/graphics/mesa-devel/files/patch-src_compiler_nir_nir__convert__ycbcr.c b/graphics/mesa-devel/files/patch-src_compiler_nir_nir__convert__ycbcr.c new file mode 100644 index 000000000000..8fee3c2672cd --- /dev/null +++ b/graphics/mesa-devel/files/patch-src_compiler_nir_nir__convert__ycbcr.c @@ -0,0 +1,22 @@ +https://gitlab.freedesktop.org/mesa/mesa/-/issues/8193 + +--- src/compiler/nir/nir_convert_ycbcr.c.orig 2023-01-29 04:42:32 UTC ++++ src/compiler/nir/nir_convert_ycbcr.c +@@ -21,6 +21,17 @@ + * IN THE SOFTWARE. + */ + ++/* Disable all WSI flags defined project-wide in meson.build */ ++#undef VK_USE_PLATFORM_ANDROID_KHR ++#undef VK_USE_PLATFORM_DISPLAY_KHR ++#undef VK_USE_PLATFORM_MACOS_MVK ++#undef VK_USE_PLATFORM_METAL_EXT ++#undef VK_USE_PLATFORM_WAYLAND_KHR ++#undef VK_USE_PLATFORM_WIN32_KHR ++#undef VK_USE_PLATFORM_XCB_KHR ++#undef VK_USE_PLATFORM_XLIB_KHR ++#undef VK_USE_PLATFORM_XLIB_XRANDR_EXT ++ + #include "nir_vulkan.h" + #include "vulkan/util/vk_format.h" + #include "vulkan/runtime/vk_ycbcr_conversion.h"