git: 58633340e9ed - main - graphics/mesa-devel: update to 23.0.b.1241

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 09 Feb 2023 00:24:22 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=58633340e9ed87070919abfe1115fc5e1904d22a

commit 58633340e9ed87070919abfe1115fc5e1904d22a
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-08 10:52:54 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-09 00:23:54 +0000

    graphics/mesa-devel: update to 23.0.b.1241
    
    Changes:        https://gitlab.freedesktop.org/mesa/mesa/-/compare/79caf8a44b6...20d4c592c96
---
 graphics/mesa-devel/Makefile                       |  6 ++++--
 graphics/mesa-devel/distinfo                       | 10 +++++++---
 .../patch-src_compiler_nir_nir__convert__ycbcr.c   | 22 ----------------------
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index ec37457715f0..982370419676 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	23.0-branchpoint-1109
-DISTVERSIONSUFFIX=	-g79caf8a44b6
+DISTVERSION=	23.0-branchpoint-1241
+DISTVERSIONSUFFIX=	-g20d4c592c96
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -8,6 +8,8 @@ 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+=	4c7408374e3d.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21052
+PATCHFILES+=	bad0a8c5e02b.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21185
+PATCHFILES+=	2c78f6e521ef.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21185
 
 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 32b629222f27..524044686704 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,9 +1,13 @@
-TIMESTAMP = 1675725715
-SHA256 (mesa3d-mesa-23.0-branchpoint-1109-g79caf8a44b6_GH0.tar.gz) = 7fbd07d93f0a9fd3112b1b7be03953030d620a55654509c2e42df221a315775f
-SIZE (mesa3d-mesa-23.0-branchpoint-1109-g79caf8a44b6_GH0.tar.gz) = 27741385
+TIMESTAMP = 1675896952
+SHA256 (mesa3d-mesa-23.0-branchpoint-1241-g20d4c592c96_GH0.tar.gz) = 02959fcd19c448663e49a68f4d426d52dfe60cae051a5921881391ea8a99e4de
+SIZE (mesa3d-mesa-23.0-branchpoint-1241-g20d4c592c96_GH0.tar.gz) = 27797074
 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
 SIZE (700efacda59c.patch) = 983
 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470
 SIZE (50433886a3e3.patch) = 2008
 SHA256 (4c7408374e3d.patch) = f3d7eaf30117cdb23b2dba75009c707ae61cde3f2f3e918cfb5fc54f3f37ead1
 SIZE (4c7408374e3d.patch) = 1431
+SHA256 (bad0a8c5e02b.patch) = 12ab3c355069a798d53a1589bc810e22c95d4ebc8c5a0d0e09d87aaec7de8a95
+SIZE (bad0a8c5e02b.patch) = 5933
+SHA256 (2c78f6e521ef.patch) = a250b3a56eab2ea8685089ba6093bc5dbba4e5a42173a29364e8ed673cac6329
+SIZE (2c78f6e521ef.patch) = 11833
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
deleted file mode 100644
index 8fee3c2672cd..000000000000
--- a/graphics/mesa-devel/files/patch-src_compiler_nir_nir__convert__ycbcr.c
+++ /dev/null
@@ -1,22 +0,0 @@
-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"