6 files changed, 20 insertions, 24 deletions

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 96b650db6d07..2f57b3e5c328 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 1095a78d359c..9c76d24a46a9 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -12,7 +12,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	23.1.8
+MESABASEVERSION=	23.3.0
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -24,7 +24,6 @@ MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
 DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	https://gitlab.freedesktop.org/mesa/mesa/-/commit/
-PATCHFILES+=	9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671
 PATCHFILES+=	4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
index de765e7b28f9..839b3ee47f15 100644
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1700484156
-SHA256 (mesa-23.1.8.tar.xz) = 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad
-SIZE (mesa-23.1.8.tar.xz) = 18566724
-SHA256 (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = aac0f0bc9454d177729109103e4e851ee4bc894ba7cc28ea1712ed87b4660e85
-SIZE (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = 1511
+TIMESTAMP = 1701441510
+SHA256 (mesa-23.3.0.tar.xz) = 50f729dd60ed6335b989095baad81ef5edf7cfdd4b4b48b9b955917cb07d69c5
+SIZE (mesa-23.3.0.tar.xz) = 19234688
 SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a
 SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626
diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c
deleted file mode 100644
index 98a7bbeb9ac4..000000000000
--- a/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gallium/drivers/llvmpipe/lp_setup_tri.c.orig	2022-10-11 18:53:31 UTC
-+++ src/gallium/drivers/llvmpipe/lp_setup_tri.c
-@@ -46,7 +46,9 @@
- #if defined(PIPE_ARCH_SSE)
- #include <emmintrin.h>
- #elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN
-+#undef bool
- #include <altivec.h>
-+#define bool _Bool
- #include "util/u_pwr8.h"
- #endif
- 
diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c
new file mode 100644
index 000000000000..2bb9b9119097
--- /dev/null
+++ b/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c
@@ -0,0 +1,12 @@
+--- src/gallium/drivers/zink/zink_screen.c.orig	2023-12-01 14:18:25 UTC
++++ src/gallium/drivers/zink/zink_screen.c
+@@ -55,7 +55,9 @@
+ #include <xf86drm.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#if DETECT_OS_LINUX
+ #include <sys/sysmacros.h>
++#endif
+ #endif
+ 
+ static int num_screens = 0;
diff --git a/graphics/mesa-dri/files/patch-src_util_u__memory.h b/graphics/mesa-dri/files/patch-src_util_u__memory.h
index 27c553b712a7..fcaec0a4a2d2 100644
--- a/graphics/mesa-dri/files/patch-src_util_u__memory.h
+++ b/graphics/mesa-dri/files/patch-src_util_u__memory.h
@@ -1,7 +1,7 @@
---- src/util/u_memory.h.orig	2023-09-06 23:29:52 UTC
+--- src/util/u_memory.h.orig	2023-11-29 19:30:57 UTC
 +++ src/util/u_memory.h
-@@ -90,7 +90,7 @@ mem_dup(const void *src, size_t size)
- #define Offset(TYPE, MEMBER) ((uintptr_t)&(((TYPE *)NULL)->MEMBER))
+@@ -84,7 +84,7 @@ mem_dup(const void *src, size_t size)
+ }
  
  /* TODO: this could be different on non-x86 architectures. */
 -#define CACHE_LINE_SIZE 64
@@ -9,7 +9,7 @@
  
  /**
   * Declare a variable on its own cache line.
-@@ -107,12 +107,12 @@ mem_dup(const void *src, size_t size)
+@@ -101,12 +101,12 @@ mem_dup(const void *src, size_t size)
   *       aligned, but we only want to align the field.
   */
  #define EXCLUSIVE_CACHELINE(decl) \