From eddb68f2fafdc45a8133a1c07f31ec61f14b2767 Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Mon, 23 Mar 2026 17:50:48 +0200
Subject: [PATCH] ports/mesa: Build with x support

---
 ports/mesa/build.sh                                  |  6 +++---
 .../0006-dont-require-per-thread-clockid.patch       | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 ports/mesa/patches/0006-dont-require-per-thread-clockid.patch

diff --git a/ports/mesa/build.sh b/ports/mesa/build.sh
index e7308a24..32861977 100755
--- a/ports/mesa/build.sh
+++ b/ports/mesa/build.sh
@@ -3,14 +3,14 @@
 NAME='mesa'
 VERSION='25.0.7'
 DOWNLOAD_URL="https://archive.mesa3d.org/mesa-$VERSION.tar.xz#592272df3cf01e85e7db300c449df5061092574d099da275d19e97ef0510f8a6"
-DEPENDENCIES=('zlib' 'zstd' 'expat')
+DEPENDENCIES=('zlib' 'zstd' 'expat' 'libX11' 'libXext')
 CONFIGURE_OPTIONS=(
 	'-Dprefix=/usr'
 	'-Dosmesa=true'
 	'-Dvulkan-drivers=[]'
 	'-Dgallium-drivers=llvmpipe'
-	'-Dplatforms=[]'
-	'-Dglx=disabled'
+	'-Dplatforms=x11'
+	'-Dglx=xlib'
 	'-Dbuildtype=release'
 )
 
diff --git a/ports/mesa/patches/0006-dont-require-per-thread-clockid.patch b/ports/mesa/patches/0006-dont-require-per-thread-clockid.patch
new file mode 100644
index 00000000..9997f99c
--- /dev/null
+++ b/ports/mesa/patches/0006-dont-require-per-thread-clockid.patch
@@ -0,0 +1,12 @@
+diff -ruN mesa-25.0.7/src/util/u_thread.c mesa-25.0.7-banan_os/src/util/u_thread.c
+--- mesa-25.0.7/src/util/u_thread.c	2025-05-28 18:20:23.000000000 +0300
++++ mesa-25.0.7-banan_os/src/util/u_thread.c	2026-03-04 18:59:55.591754019 +0200
+@@ -154,7 +154,7 @@
+ int64_t
+ util_thread_get_time_nano(thrd_t thread)
+ {
+-#if defined(HAVE_PTHREAD) && !defined(__APPLE__) && !defined(__HAIKU__) && !defined(__managarm__)
++#if defined(HAVE_PTHREAD) && !defined(__APPLE__) && !defined(__HAIKU__) && !defined(__managarm__) && !defined(__banan_os__)
+    struct timespec ts;
+    clockid_t cid;
+