--- a/mesa.SlackBuild	2021-08-22 18:29:08.190054855 +0000
+++ b/mesa.SlackBuild	2021-08-22 20:41:44.853241900 +0000
@@ -31,8 +31,9 @@
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 # Be sure this list is up-to-date:
-DRI_DRIVERS="i915,i965,r100,r200,nouveau"
-GALLIUM_DRIVERS="nouveau,r300,r600,svga,radeonsi,swrast,virgl,iris,crocus,zink"
+DRI_DRIVERS="nouveau"
+GALLIUM_DRIVERS="freedreno,nouveau,swrast,virgl,kmsro,lima,panfrost,v3d,vc4"
+VULKAN_DRIVERS="amd,intel,swrast"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -67,6 +68,12 @@
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "riscv64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -108,6 +115,11 @@
   done
 fi
 
+if [[ $ARCH = "aarch64" || $ARCH = "riscv64" ]]; then
+#    MESON_OPT="-Dasm=false"
+    VULKAN_DRIVERS="amd,swrast,broadcom"
+fi
+
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -131,7 +143,7 @@
   -Dosmesa=true \
   -Ddri-drivers=$DRI_DRIVERS \
   -Dgallium-drivers=$GALLIUM_DRIVERS \
-  -Dvulkan-drivers=amd,intel,swrast \
+  -Dvulkan-drivers=$VULKAN_DRIVERS \
   -Dvulkan-layers=device-select,intel-nullhw,overlay \
   -Dglvnd=true \
   -Dllvm=enabled \
@@ -142,6 +154,10 @@
   -Dgles2=enabled \
   -Dopengl=true \
   -Dglx=dri \
+  -Ddri3=enabled \
+  -Dgbm=enabled \
+  -Dlibunwind=disabled \
+  $MESON_OPT \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG $NINJA install || exit 1
@@ -175,6 +191,7 @@
     CFLAGS="$SLKCFLAGS" \
     ./configure \
       --prefix=/usr \
+      --disable-gles1 \
       --build=$ARCH-slackware-linux || exit 1
     make $NUMJOBS || exit 1
     # Install all the demos (including the pointless ones) at first, in a
@@ -182,7 +199,8 @@
     make install DESTDIR=$PKG/cruft || exit 1
     # Install gears and glinfo, as well as a few other demos:
     mkdir -p $PKG/usr/bin
-    for demo in gears glinfo glthreads glxcontexts glxdemo glxgears \
+    for demo in eglinfo es2_info es2gears_x11 \
+      gears glinfo glthreads glxcontexts glxdemo glxgears \
       glxgears_fbconfig glxheads glxinfo glxpbdemo glxpixmap ; do
       mv --verbose $PKG/cruft/usr/bin/$demo $PKG/usr/bin
   done