Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 graphics-libs/mesa/DEPENDS   |    9 ++++++---
 graphics-libs/mesa/FINAL     |    3 +++
 graphics-libs/mesa/HISTORY   |    4 ++++
 graphics-libs/mesa/PRE_BUILD |    4 +++-
 4 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit ed6293ef4d20aaa190dda6856cd71d740923271a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    graphics-libs/mesa: added option to use either libglvnd or smgl-gl_select

diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
index 70c9b45..0ddea50 100755
--- a/graphics-libs/mesa/DEPENDS
+++ b/graphics-libs/mesa/DEPENDS
@@ -2,7 +2,6 @@
 depends meson &&
 depends ninja-build-system &&
 depends python3 &&
-#depends smgl-gl_select &&
 depends -sub "CXX" gcc &&
 depends bison &&
 depends flex  &&
@@ -27,7 +26,6 @@ if (list_find "${MESA_GALLIUM}" "radeonsi") ||
 else
   optional_depends llvm 'llvm=true' 'llvm=false' 'LLVM support'
 fi &&
-#fi  &&
 
 if list_find "$MESA_GLX" dri;then
   depends libxext &&
@@ -55,4 +53,9 @@ optional_depends libva    'gallium-va=true'    
'gallium-va=false'    'gallium va
 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 libselinux "selinux=true" "selinux=false" "SELinux-aware 
Mesa"
+optional_depends libselinux "selinux=true" "selinux=false" "SELinux-aware 
Mesa" &&
+optional_depends libglvnd "glvnd=true" "glvnd=false" "enable GLVND support'" 
&&
+
+if ! is_depends_enabled "${SPELL}" "libglvnd"; then
+  depends smgl-gl_select
+fi
diff --git a/graphics-libs/mesa/FINAL b/graphics-libs/mesa/FINAL
new file mode 100755
index 0000000..b55521f
--- /dev/null
+++ b/graphics-libs/mesa/FINAL
@@ -0,0 +1,3 @@
+if ! is_depends_enabled "${SPELL}" "libglvnd"; then
+  glselect mesa
+fi
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 620ce31..da7cb5c 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2018-08-29 Pavel Vinogradov <public AT sourcemage.org>
+       * DEPENDS, FINAL, PRE_BUILD: added option to use either libglvnd or
+         smgl-gl_select
+
 2018-08-22 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 18.2.0-rc4
 
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index 922c0ab..92dd222 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
+if ! is_depends_enabled "${SPELL}" "libglvnd"; then
+  apply_patch_dir patches
+fi