From 02da12fd271f3ee5df410ac90ce090089c314266 Mon Sep 17 00:00:00 2001
From: Ankith <itsankith26@gmail.com>
Date: Wed, 25 Sep 2024 01:32:19 +0530
Subject: [PATCH] Bump mesa

---
 .../docker_base/mesa/mako/build-mako.sh        |  2 +-
 .../docker_base/mesa/mesa/build-mesa.sh        | 18 ++++--------------
 .../docker_base/mesa/mesa/mesa.sha512sum       |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh b/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh
index 02e3ff2d4f..555519e75c 100644
--- a/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh
+++ b/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh
@@ -4,4 +4,4 @@ set -e -x
 cd $(dirname `readlink -f "$0"`)
 
 # pin for build stability, remember to keep updated
-python3 -m pip install mako==1.3.5
+python3 -m pip install mako==1.3.5 PyYAML==6.0.2
diff --git a/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh b/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh
index db5c5c94bd..c98311fcbf 100644
--- a/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh
+++ b/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh
@@ -7,7 +7,7 @@ cd $(dirname `readlink -f "$0"`)
 # wayland driver needs this) and glx (SDL needs it)
 # we don't support vulkan yet
 
-MESA_VER="mesa-24.0.1"
+MESA_VER="mesa-24.2.3"
 MESA="mesa-$MESA_VER" # yes mesa comes twice in the name
 
 curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/mesa/-/archive/$MESA_VER/$MESA.tar.gz > $MESA.tar.gz
@@ -16,17 +16,7 @@ sha512sum -c mesa.sha512sum
 tar xzf $MESA.tar.gz
 cd $MESA
 
-# For now, we don't compile in LLVM because of its weight. Because of this, we
-# can't compile in support for the radeonsi driver
-if [ `uname -m` == "aarch64" ]; then
-    # On aarch64 we allow mesa to use all drivers it wants to pick by default
-    # (because radeonsi is not used on arm platforms)
-    GALLIUM_DRIVERS="auto"
-else
-    # all default except radeonsi
-    GALLIUM_DRIVERS="r300,r600,nouveau,virgl,svga,swrast,iris,crocus,i915"
-fi
-
-# build with meson+ninja
-meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=$GALLIUM_DRIVERS -Dvulkan-drivers=[]
+# build with meson+ninja, a very minimal install will do because this is not actually
+# being installed in the wheel
+meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=softpipe -Dvulkan-drivers=[]
 ninja -C build/ install
diff --git a/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum b/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum
index bca5798299..41825beb9e 100644
--- a/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum
+++ b/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum
@@ -1 +1 @@
-66a6cea1712f3b20744c0865c10523313653be39fc5a75e8201dbf50188cad819bd52a6013d1bd7be3d622de948b750ceb41dc73649cdea2abbaa6bb016cc4a7  mesa-mesa-24.0.1.tar.gz
+be99f38318509a864212c600a8b14e9615ef7d2cfbda8d020b0059585d05dcb850601200a139b2adaf04d8d7df9c4e2661014fafab15647f3d02e3db1196c998  mesa-mesa-24.2.3.tar.gz