diff --git a/mesa-32/.signature b/mesa-32/.signature
index 4ecc1922..b241bae1 100644
--- a/mesa-32/.signature
+++ b/mesa-32/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXXjAm9Lx4Apqbo/8WED9T5wCm5s7yU4ZLYVEiSI+mr+0ORz6Wn2B23DQS/J5VJ8FBouyJqa3dw+UJ/8LLvHkhQE=
-SHA256 (Pkgfile) = 63812cc4e47335310120c2dd78ad113127cdac7ff7cc5196f0039d802025d3c3
+RWSwxGo/zH7eXVuhZ3kD3rphvOV+wl5jHi+5jvqLH2h4HxPpknuGfwGj1TzCVBKetx5JpphebzRw41ZH7hQM3ocwj4LqLcKAMQE=
+SHA256 (Pkgfile) = 50eac6a638ea8fd049ea278ddd9098f446aa9c527108eaf621058ba8535c2dcd
 SHA256 (.footprint) = 780b1525e8bf8a789c2aa204c5970636473be4cc1a6eb1925996af6df2842b84
 SHA256 (mesa-21.2.1.tar.xz) = 2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787
 SHA256 (x86-linux-gnu) = 448877bbe3efe8bdfe6282c8e730fe8a8b6bf3c07f659e71b7292aceca22d8bd
diff --git a/mesa-32/Pkgfile b/mesa-32/Pkgfile
index a341f23a..c2a2d2d1 100644
--- a/mesa-32/Pkgfile
+++ b/mesa-32/Pkgfile
@@ -2,6 +2,7 @@
 # URL: https://www.mesa3d.org/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 # Depends on: elfutils-32 expat-32 libdrm-32 libglvnd-32 libvdpau-32 llvm-32 mesa xorg-libxdamage-32 xorg-libxrandr-32 xorg-libxshmfence-32 xorg-libxvmc-32 xorg-libxxf86vm-32 zstd-32
+# Optional: glslang-32 wayland-32 wayland-protocols
 
 name=mesa-32
 version=21.2.1
@@ -10,24 +11,32 @@ source=(https://archive.mesa3d.org/mesa-$version.tar.xz
 	x86-linux-gnu)
 
 build() {
-	meson setup build mesa-$version \
+	prt-get isinst wayland-32 wayland-protocols && PKGMK_MESA_PLATFORMS+=',wayland'
+	prt-get isinst glslang-32 && PKGMK_MESA_PLATFORMS+=' -D vulkan-overlay-layer=true -D vulkan-device-select-layer=true'
+
+	meson setup mesa-$version build $PKGMK_MESA3D \
 		--cross-file=$SRC/x86-linux-gnu \
 		--prefix=/usr \
 		--libdir=/usr/lib32 \
 		--sysconfdir=/etc \
 		--buildtype=plain \
+		--wrap-mode nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
 		-D llvm=enabled \
 		-D shared-llvm=enabled \
 		-D gbm=enabled \
-		-D gles1=enabled \
+		-D gles1=disabled \
 		-D gles2=enabled \
 		-D osmesa=true \
+		-D platforms=x11$PKGMK_MESA_PLATFORMS \
 		-D gallium-xa=enabled \
 		-D gallium-vdpau=enabled \
-		-D platforms=x11 \
 		-D gallium-drivers=r300,r600,svga,swrast,radeonsi,nouveau,iris,virgl \
 		-D vulkan-drivers=amd,intel \
-		-D glvnd=true
+		-D glvnd=true \
+		-D dri3=enabled \
+		-D egl=enabled
 
 	meson compile -C build -j ${JOBS:-1}
 	DESTDIR=$PKG meson install -C build