diff --git a/mesa/.signature b/mesa/.signature
index e156e95f..75fb91ec 100644
--- a/mesa/.signature
+++ b/mesa/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndLDv3sJN/yOd6eFK1htF0aCItjZUOfICVV0zNFzYS552ZKJzeiLCgX5Imc1nai04TK/eM3/EUw1eVcnx/Zx/RQM=
-SHA256 (Pkgfile) = f0d6e4944dd8188475f5e972975b003dda6a24f1fe25b699ee3667fb71e411d8
+RWTSGWF5Q7TndMZUh6CtS1yMoEogtMQajMu9S9dkm18VhfmV+wUhI7zVlgVRSTCCjcSgJU6O9EBNcqy2DmSPJOn7bzQH3QvGPQY=
+SHA256 (Pkgfile) = bb3a938d94e9a807d4cb46464cf215cdf2e123f7a84a8e57a41ea318151ee8bb
 SHA256 (.footprint) = 0a096e4a6066d23884d972266fbb66a32fe44c44877cebc2b82d4a9c694ece1e
 SHA256 (mesa-23.1.8.tar.xz) = 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad
diff --git a/mesa/Pkgfile b/mesa/Pkgfile
index e793ec06..f230ca9a 100644
--- a/mesa/Pkgfile
+++ b/mesa/Pkgfile
@@ -6,7 +6,7 @@
 
 name=mesa
 version=23.1.8
-release=1
+release=2
 source=(https://archive.mesa3d.org/$name-$version.tar.xz)
 
 build() {
@@ -20,6 +20,9 @@ build() {
 	CFLAGS+=' -mtls-dialect=gnu'
 	CXXFLAGS+=' -mtls-dialect=gnu'
 
+	sed '/Scalar.h/d;/Utils.h/d' \
+		-i mesa-$version/src/gallium/auxiliary/gallivm/lp_bld_init.c
+
 	meson setup build mesa-$version $PKGMK_MESA \
 		--prefix=/usr \
 		--sysconfdir=/etc \