Source Mage code commit list

[Justin Boffemmyer <scm AT sourcemage.org>]

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

 graphics-libs/mesa/CONFIGURE |   21 +++++++++++++--------
 graphics-libs/mesa/HISTORY   |    4 ++++
 2 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 3a393f1f0d87592e1dfdd61512788121e7030a67
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

    graphics-libs/mesa: fix driver variable usage
    
    Remove leading spaces from all driver list variables before passing them
    on to later build scripts. This specifically fixes a bug when a user
    selects "all" DRI drivers, since that driver list is initialized to an
    empty string before appending drivers in a loop, leading to an
    extraneous leading space that, unless culled, gets replaced with a comma
    via the BUILD regex. This results in an explicit null option in the
    dri-drivers array, which the meson build script treats as an error,
    causing the build to fail.
    
    Additionally, make driver messages more consistent. DRI, gallium, and
    Vulkan are all different drivers, but the DRI selection remained as
    simply selecting which drivers to build (not specifically DRI drivers),
    which can be confusing. Now all three driver selections present the same
    messages except for replacing the name of the type of drivers to choose.

diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 4997d2a..f06e3dc 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -22,34 +22,34 @@ config_query_multi MESA_EGL "window systems to 
support,recommend x11" x11 waylan
 
 config_query_multi MESA_DRM "which libdrm hardware" AMD INTEL NOUVEAU RADEON 
&&
 # only suggest drivers for specified hardware
-local AVAILABLE_DRIVERS=""
+local AVAILABLE_DRI=""
 local AVAILABLE_GALLIUM="svga swrast virgl zink"
 local AVAILABLE_VULKAN="swrast"
 if list_find "$MESA_DRM" AMD;then
   AVAILABLE_VULKAN+=" amd"
 fi &&
 if list_find "$MESA_DRM" RADEON;then
-  AVAILABLE_DRIVERS+=" r100 r200"
+  AVAILABLE_DRI+=" r100 r200"
   AVAILABLE_GALLIUM+=" r300 r600 radeonsi"
 fi &&
 if list_find "$MESA_DRM" INTEL;then
-  AVAILABLE_DRIVERS+=" i915 i965"
+  AVAILABLE_DRI+=" i915 i965"
   AVAILABLE_GALLIUM+=" i915 iris"
   AVAILABLE_VULKAN+=" intel"
 fi &&
 if list_find "$MESA_DRM" NOUVEAU;then
-  AVAILABLE_DRIVERS+=" nouveau"
+  AVAILABLE_DRI+=" nouveau"
   AVAILABLE_GALLIUM+=" nouveau"
 fi &&
 
 
 if list_find "$MESA_GLX" dri;then
   config_query_multi MESA_DRI \
-                   "Which drivers would you like to build?" \
-                   all $AVAILABLE_DRIVERS &&
+                   "which DRI drivers to build?" \
+                   all $AVAILABLE_DRI &&
 
   if list_find "$MESA_DRI" all; then
-    MESA_DRI="$AVAILABLE_DRIVERS"
+    MESA_DRI="$AVAILABLE_DRI"
   fi
 fi &&
 # Gallium support
@@ -57,7 +57,7 @@ fi &&
 message "${MESSAGE_COLOR}If you want to enable VDPAU you have to select at 
least one of the r300, r600,$DEFAULT_COLOR" &&
 message "${MESSAGE_COLOR}radeonsi or nouveau gallium 
drivers:${DEFAULT_COLOR}"                                         &&
 config_query_multi MESA_GALLIUM \
-        "which gallium (accellerated) drivers" \
+        "which gallium (accellerated) drivers to build" \
         none all $AVAILABLE_GALLIUM &&
 if list_find "$MESA_GALLIUM" all;then
   MESA_GALLIUM="$AVAILABLE_GALLIUM"
@@ -83,3 +83,8 @@ config_query_multi MESA_TOOLS  "which tools to build" \
        xvmc &&
 config_query_multi MESA_ARCH   "which arch" avx avx2 knl skx &&
 config_query_multi MESA_OMX    "OMax support" auto disabled tizonia bellagio
+
+# strip any leading spaces from the driver lists
+MESA_DRI="${MESA_DRI# }"
+MESA_GALLIUM="${MESA_GALLIUM# }"
+MESA_VULKAN="${MESA_VULKAN# }"
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 8ec8386..6761277 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2021-08-07 Justin Boffemmyer <flux AT sourcemage.org>
+       * CONFIGURE: strip leading spaces from driver lists,
+         make DRI, Gallium, and Vulkan naming/messges consistent
+
 2021-08-04 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 21.2.0
        * PRE_BUILD, patches/*: dropped the patches