Skip to content

Commit 02da12f

Browse files
committed
Bump mesa
1 parent 5fb4564 commit 02da12f

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -e -x
44
cd $(dirname `readlink -f "$0"`)
55

66
# pin for build stability, remember to keep updated
7-
python3 -m pip install mako==1.3.5
7+
python3 -m pip install mako==1.3.5 PyYAML==6.0.2

buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd $(dirname `readlink -f "$0"`)
77
# wayland driver needs this) and glx (SDL needs it)
88
# we don't support vulkan yet
99

10-
MESA_VER="mesa-24.0.1"
10+
MESA_VER="mesa-24.2.3"
1111
MESA="mesa-$MESA_VER" # yes mesa comes twice in the name
1212

1313
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
1616
tar xzf $MESA.tar.gz
1717
cd $MESA
1818

19-
# For now, we don't compile in LLVM because of its weight. Because of this, we
20-
# can't compile in support for the radeonsi driver
21-
if [ `uname -m` == "aarch64" ]; then
22-
# On aarch64 we allow mesa to use all drivers it wants to pick by default
23-
# (because radeonsi is not used on arm platforms)
24-
GALLIUM_DRIVERS="auto"
25-
else
26-
# all default except radeonsi
27-
GALLIUM_DRIVERS="r300,r600,nouveau,virgl,svga,swrast,iris,crocus,i915"
28-
fi
29-
30-
# build with meson+ninja
31-
meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=$GALLIUM_DRIVERS -Dvulkan-drivers=[]
19+
# build with meson+ninja, a very minimal install will do because this is not actually
20+
# being installed in the wheel
21+
meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=softpipe -Dvulkan-drivers=[]
3222
ninja -C build/ install
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
66a6cea1712f3b20744c0865c10523313653be39fc5a75e8201dbf50188cad819bd52a6013d1bd7be3d622de948b750ceb41dc73649cdea2abbaa6bb016cc4a7 mesa-mesa-24.0.1.tar.gz
1+
be99f38318509a864212c600a8b14e9615ef7d2cfbda8d020b0059585d05dcb850601200a139b2adaf04d8d7df9c4e2661014fafab15647f3d02e3db1196c998 mesa-mesa-24.2.3.tar.gz

0 commit comments

Comments
 (0)