--- a/graphics/mesa/mesa.sh	Thu Aug 01 21:00:00 2019 +0200
+++ b/graphics/mesa/mesa.sh	Thu Aug 01 11:26:30 2019 +0200
@@ -22,25 +22,27 @@
 PKGSUMMARY="opensource OpenGL implementation"
 PKGDOWNLOAD="https://mesa.freedesktop.org/archive/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="dev/meson:build"
-PKGOPTIONS="DRM EGL GALLIUM GLVND LLVM PLATFORMS SELINUX VULKAN WAYLAND X"
+PKGOPTIONS="DRI DRM EGL GALLIUM GLVND LLVM PLATFORMS SELINUX VULKAN WAYLAND X"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}
+: ${DRI:=i965 r100 r200 nouveau}                        # driver list or "no"
 : ${DRM:=yes}
 : ${EGL:=yes}
-: ${GALLIUM:=radeonsi r300 r600 virgl svga swrast}      # drivers list or "no"
-: ${GLVND:=yes}
+: ${GALLIUM:=i915 radeonsi r300 r600 virgl swrast}      # driver list or "no"
+: ${GLVND:=no}
 : ${LLVM:=yes}
 : ${SELINUX:=no}
-: ${VULKAN:=intel amd}                                  # drivers list or "no"
+: ${VULKAN:=intel amd}                                  # driver list or "no"
 : ${WAYLAND:=yes}
 : ${X:=yes}
 
 # Convert user options separated by spaces to comma.
 with_platforms=""
+with_dri_drivers=""
 with_gallium_drivers=""
 with_vulkan_drivers=""
 
@@ -49,6 +51,10 @@
 	with_platforms="drm"
 fi
 
+if [ "$DRI" != "no" ]; then
+	with_dri_drivers=$(echo $DRI | sed -e "s/ /,/g")
+fi
+
 if [ "$EGL" = "yes" ]; then
 	with_egl="-D egl=true"
 else
@@ -56,7 +62,7 @@
 fi
 
 if [ "$GALLIUM" != "no" ]; then
-	with_gallium_drivers=$(echo $GALLIUM | sed -e "s/ /,/")
+	with_gallium_drivers=$(echo $GALLIUM | sed -e "s/ /,/g")
 fi
 
 if [ "$GLVND" = "yes" ]; then
@@ -73,7 +79,7 @@
 fi
 
 if [ "$VULKAN" != "no" ]; then
-	with_vulkan_drivers=$(echo $VULKAN | sed -e "s/ /,/")
+	with_vulkan_drivers=$(echo $VULKAN | sed -e "s/ /,/g")
 fi
 
 if [ "$WAYLAND" = "yes" ]; then
@@ -117,9 +123,10 @@
 		--default-library shared \
 		-D libdir=lib \
 		-D bpm=true \
-		-D platforms=$with_platforms \
-		-D gallium-drivers=$with_gallium_drivers \
-		-D vulkan-drivers=$with_vulkan_drivers \
+		-D platforms="$with_platforms" \
+		-D dri-drivers="$with_dri_drivers" \
+		-D gallium-drivers="$with_gallium_drivers" \
+		-D vulkan-drivers="$with_vulkan_drivers" \
 		$with_dri \
 		$with_egl \
 		$with_glvnd \