Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 graphics-libs/mesa/CONFIGURE       |   16 ++++++++++++----
 graphics-libs/mesa/DEPENDS         |   20 ++++++++++----------
 graphics-libs/mesa/DETAILS         |    4 ++--
 graphics-libs/mesa/HISTORY         |    4 ++++
 graphics-libs/mesa/PRE_SUB_DEPENDS |    2 +-
 5 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit aca1aec7e727954210606f7a2da1584d949f7b36
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    mesa: => 20.2.0

diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 8532cc5..3a9a010 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -4,18 +4,25 @@ persistent_remove MESALIB_BUILD
 persistent_remove MESALIB_GALLIUM
 persistent_remove MESALIB_DRIVERS
 
+# adjust some flags
+MESA_GLES1=${MESA_GLES1/true/enabled}
+MESA_GLES2=${MESA_GLES2/true/enabled}
+MESA_GLES1=${MESA_GLES1/false/disabled}
+MESA_GLES2=${MESA_GLES2/false/disabled}
+MESA_EGL=${MESA_EGL/drm/}
+
 . $GRIMOIRE/config_query_multi.function &&
 . $GRIMOIRE/MESON_CONFIGURE &&
 
 config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib 
gallium-xlib &&
-config_query_multi MESA_EGL "window systems to support,recommend x11+drm" 
x11 drm surfaceless wayland &&
+config_query_multi MESA_EGL "window systems to support,recommend x11" x11 
wayland &&
 config_query_multi MESA_OSMESA "Build OSmesa - not usually needed, except by 
swrast " none classic gallium
 
 
 config_query_multi MESA_DRM "which libdrm hardware" AMD INTEL NOUVEAU RADEON 
&&
 # only suggest drivers for specified hardware
 local AVAILABLE_DRIVERS="swrast"
-local AVAILABLE_GALLIUM="svga swrast virgl"
+local AVAILABLE_GALLIUM="svga swrast virgl zink"
 local AVAILABLE_VULKAN=""
 if list_find "$MESA_DRM" AMD;then
   AVAILABLE_VULKAN+=" amd"
@@ -79,13 +86,14 @@ config_query_multi MESA_VULKAN \
 if list_find "$MESA_VULKAN" all; then
    MESA_VULKAN="$AVAILABLE_VULKAN"
 fi &&
-config_query_option MESA_GLES1 "support GLES1 - embedded systems" n 
gles1=true gles1=false &&
-config_query_option MESA_GLES2 "support GLES2/3 - embedded systems" n 
gles2=true gles2=false &&
+config_query_option MESA_GLES1 "support GLES1 - embedded systems" n 
gles1=enabled gles1=disabled &&
+config_query_option MESA_GLES2 "support GLES2/3 - embedded systems" n 
gles2=enabled gles2=disabled &&
 config_query_multi MESA_TOOLS  "which tools to build" \
        etnaviv \
        freedreno \
        glsl \
        intel \
+       intel-ui \
        nir \
        nouveau \
        xvmc &&
diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
index 4d7b3a7..f282e00 100755
--- a/graphics-libs/mesa/DEPENDS
+++ b/graphics-libs/mesa/DEPENDS
@@ -42,23 +42,23 @@ if list_find "$MESA_EGL" wayland;then
   depends wayland-protocols
 fi &&
 
-if [[ "${MESA_BRANCH}" == "scm" ]]; then
-  depends git
-fi &&
-
-optional_depends libvdpau 'gallium-vdpau=true' 'gallium-vdpau=false' 
'gallium vdpau state tracker' &&
-optional_depends libxvmc  'gallium-xvmc=true'  'gallium-xvmc=false'  
'gallium xvmc state tracker(obsolete)' &&
-optional_depends libva    'gallium-va=true'    'gallium-va=false'    
'gallium va state tracker' &&
+optional_depends libvdpau 'gallium-vdpau=enabled' 'gallium-vdpau=disabled' 
'gallium vdpau state tracker' &&
+optional_depends libxvmc  'gallium-xvmc=enabled'  'gallium-xvmc=disabled'  
'gallium xvmc state tracker(obsolete)' &&
+optional_depends libva    'gallium-va=enabled'    'gallium-va=disabled'    
'gallium va state tracker' &&
 #optional_depends libomxil 'gallium-omx=bellagio'   'gallium-omx=disabled'   
'gallium omx bellagio state tracker' &&
 #optional_depends tizonia  'gallium-omx=tizonia'   'gallium-omx=disabled'   
'gallium omx state tracker' &&
 #optional_depends libxa    '' '' 'gallium xa state tracker' &&
-optional_depends lm_sensors "lmsensors=true" "lmsensors=false" "HUD Sensor 
support" &&
-optional_depends valgrind "valgrind=true" "valgrind=false" "debugging" &&
-optional_depends libunwind "libunwind=true" "libunwind=false" "for 
stack-traces" &&
+optional_depends lm_sensors "lmsensors=enabled" "lmsensors=disabled" "HUD 
Sensor support" &&
+optional_depends valgrind "valgrind=enabled" "valgrind=disabled" "debugging" 
&&
+optional_depends libunwind "libunwind=enabled" "libunwind=disabled" "for 
stack-traces" &&
 optional_depends libselinux "selinux=true" "selinux=false" "SELinux-aware 
Mesa" &&
 optional_depends libglvnd "glvnd=true" "glvnd=false" "enable GLVND support'" 
&&
 optional_depends zstd     "" "" "to compress disk cache" &&
 
 if ! is_depends_enabled "${SPELL}" "libglvnd"; then
   optional_depends smgl-gl_select '' '' 'allow select OPENGL provider'
+fi &&
+
+if list_find "$MESA_TOOLS" intel-ui;then
+  depends gtk+3
 fi
diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS
index 70b2599..d240968 100755
--- a/graphics-libs/mesa/DETAILS
+++ b/graphics-libs/mesa/DETAILS
@@ -9,8 +9,8 @@ if [[ "${MESA_BRANCH}" == "scm" ]]; then
    SOURCE_IGNORE="volatile"
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
 else
-         VERSION=20.1.5
-     
SOURCE_HASH=sha512:47796bf2cccfd054ff25f571747754e0ab9b42fe87644ea320b3d9497d63b3013e9b7e59ea0516bbd1a38b5594e0d185bf5a36230ea5c5974e7ff889cee2601e
+         VERSION=20.2.0
+     
SOURCE_HASH=sha512:3dd7def04ba4f196be8fd59999285febb10366e89d6e649c518b436b732c62d3f1bd235fc470de7fda4b4cc09a1baaadca4222dcdc2449225d789b151cea69d7
           SOURCE=mesa-$VERSION.tar.xz
    SOURCE_URL[0]="https://mesa.freedesktop.org/archive/${SOURCE}";
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesa-${VERSION}
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 786ee18..2a36848 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2020-09-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 20.2.0
+       * PRE_SUB_DEPENDS CONFIGURE DEPENDS: fix flags
+
 2020-08-12 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS: Added depenency on LLVM RTTI support for nouveau
 
diff --git a/graphics-libs/mesa/PRE_SUB_DEPENDS 
b/graphics-libs/mesa/PRE_SUB_DEPENDS
index 01e6590..ca989e8 100755
--- a/graphics-libs/mesa/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesa/PRE_SUB_DEPENDS
@@ -5,7 +5,7 @@ case $THIS_SUB_DEPENDS in
     fi
     ;;
   GLES2)
-    if [[ "$MESA_GLES2" == "gles2=true" ]];then
+    if [[ "$MESA_GLES2" == "gles2=enabled" ]];then
       return 0
     fi
     ;;