1 files changed, 21 insertions, 24 deletions
diff --git a/extra/mesa/build b/extra/mesa/build
index e640260e..64bc5128 100755
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -1,5 +1,9 @@
 #!/bin/sh -e
 
+# Support for vulkan drivers of intel, amd, and broadcom. Change if you just
+# want to specify your own graphics card.
+vulkan_drivers=amd,intel,broadcom
+
 # Temporarily install python-mako to build mesa
 (
     cd mako
@@ -11,40 +15,33 @@
 
 )
 
-pyver=$(python3 --version) pyver=${pyver##* }
-PYTHONPATH="$PWD/mako/dist/usr/lib/python${pyver%.*}/site-packages:$(python -c "import sys; print(':'.join(sys.path))")"
+PYTHONPATH=$(./pythonpath)
 
 export PYTHONPATH
 export DESTDIR="$1"
-export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS"
 
 # Fix issues with musl and firefox.
 # https://bugs.freedesktop.org/show_bug.cgi?id=35268
 # https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2
-sed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build >_
-cat _ > meson.build; rm -f _
+clsed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build
 
 python3 bin/git_sha1_gen.py --output include/git_sha1.h
 
-platforms=x11
-cpt l wayland-protocols >/dev/null 2>&1 && platforms=$platforms,wayland
-
-# Fix broken radeon object links
-(
-    cd src/mesa/drivers/dri/r200
-    find . -type l | while read -r link; do
-        ln -sf "$PWD/../radeon/$link" "$link"
-    done
-)
-
-meson \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --localstatedir=/var \
-    --buildtype=release \
-    -Dplatforms="$platforms" \
-    -Dzstd=false \
+cl-meson \
+    -Dplatforms=x11,wayland \
+    -Dexpat=enabled \
+    -Ddri3=enabled \
+    -Degl=enabled \
+    -Dgbm=enabled \
+    -Dgles1=enabled \
+    -Dgles2=enabled \
+    -Dglx-read-only-text=true \
+    -Dglx=dri \
+    -Dllvm=enabled \
+    -Dshared-glapi=enabled \
+    -Dvulkan-drivers="$vulkan_drivers" \
+    -Dxmlconfig=enabled \
+    -Dzstd=disabled \
     . output
 
 ninja -C output