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/mesalib/BUILD     |    1 +
 graphics-libs/mesalib/CONFIGURE |   22 +++++++++++++++-------
 graphics-libs/mesalib/DEPENDS   |    2 ++
 graphics-libs/mesalib/DETAILS   |    4 ++--
 graphics-libs/mesalib/HISTORY   |    8 ++++++++
 graphics-libs/mesalib/PRE_BUILD |    4 ++++
 6 files changed, 32 insertions(+), 9 deletions(-)

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

    mesalib: => 13.0.0

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index aa52e67..512c8e4 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -4,6 +4,7 @@
 CXXFLAGS+=" -fno-rtti" &&
 OPTS="--with-dri-drivers=${MESALIB_DRIVERS// /,} \
       --with-gallium-drivers=${MESALIB_GALLIUM// /,} \
+      --with-vulkan-drivers=${MESALIB_VULKAN// /,} \
       $MESALIB_OPTS \
       --with-egl-platforms=${MESA_EGL//\ /,}  \
       $OPTS" && 
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 63081e1..04caa06 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -1,3 +1,5 @@
+list_remove MESALIB_OPTS "--enable-r600-llvm-compiler" &&
+
 . $GRIMOIRE/config_query_multi.function                                  &&
 message "${MESSAGE_COLOR}MesaLib build types:\n"                         \
         "xlib:   Stand-alone software rendering library;\n"              \
@@ -29,7 +31,7 @@ case $MESALIB_BUILD in
 
   
 # TODO: Proper dependencies for those ... also libdrm ...
-  AVAILABLE_GALLIUM="i915 ilo nouveau r300 r600 radeonsi swrast"
+  AVAILABLE_GALLIUM="i915 ilo llvmpipe nouveau r300 r600 radeon radeonsi 
softpipe  svga  swrast virgl"
 
   config_query_multi MESALIB_GALLIUM                                       \
                    "What Gallium3D drivers woulld you like to build?"    \
@@ -38,11 +40,6 @@ case $MESALIB_BUILD in
     MESALIB_GALLIUM=$AVAILABLE_GALLIUM
   fi &&
 
-  if list_find "$MESALIB_GALLIUM" r600;then
-    config_query_option MESALIB_OPTS "LLVM backend for graphics shaders " n\
-       "--enable-r600-llvm-compiler" ""
-  fi &&
-
   if [[ $MESALIB_GALLIUM != "" ]] && [[ $MESALIB_GALLIUM != none ]]; then
     list_add MESALIB_OPTS "--enable-gallium-llvm" &&
     list_add MESALIB_OPTS "--enable-egl"  &&
@@ -82,4 +79,15 @@ case $MESALIB_BUILD in
 esac &&
 
 config_query_option MESALIB_OPTS "enable TLS support in GLX" n \
-                    "--enable-glx-tls" "--disable-glx-tls"
+                    "--enable-glx-tls" "--disable-glx-tls" &&
+# Vulkan support
+AVAILABLE_VULKAN="radeon intel"
+config_query_multi MESALIB_VULKAN \
+     "which Vulkan drivers to build" \
+     none all $AVAILABLE_VULKAN  &&
+if list_find "$MESALIB_VULKAN" all; then
+   MESALIB_VULKAN="$AVAILABLE_VULKAN"
+fi
+if list_find "$MESALIB_VULKAN" none; then
+  MESALIB_VULKAN="no"
+fi
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 355d894..e7f2667 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -14,6 +14,8 @@ depends libx11 &&
 depends glproto &&
 depends presentproto &&
 depends libxshmfence &&
+depends nettle  &&
+
 optional_depends dri3proto "--enable-dri3" "" "DRI3 support" &&
 
 case ${MESALIB_BUILD} in
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index b9ad6bc..3e220d4 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -8,8 +8,8 @@ if [[ "${MESALIB_BRANCH}" == "scm" ]]; then
    SOURCE_URL[0]="git://anongit.freedesktop.org/git/mesa/mesa:${SX}"
    SOURCE_IGNORE="volatile"
 else
-         VERSION="12.0.3"
-     
SOURCE_HASH="sha512:7d6525b5ed75e1361f3586aaf7f058de06b5038900a6379ab5f713ee879a0b3cecd253d6f3fb799673ef097bcd6866d61b46c33c0059f6636bb06fb5ceb5d750"
+         VERSION="13.0.0"
+     
SOURCE_HASH="sha512:3de56ffed1e7940bf0caf604cb9071d39684b9252e09c1c6430fe28227cd7e88d48b4a31591d5677669feca73b95b1c7958944e16c9247cf6b3c59494099e77d"
       PATCHLEVEL=0
 #              VX=`echo $VERSION | cut -d.  -f-2`
               SX="mesa-${VERSION}"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 5f8aad5..27c378f 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,11 @@
+2016-qq-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 13.0.0
+       * DEPENDS: add nettle
+       * CONFIGURE: more gallium options
+         vulkan support
+       * BUILD: vulkan support
+       * PRE_BUILD: fix vulkan build
+
 2016-10-26 Pavel Vinogradov <public AT sourcemage.org>
        * PRE_BUILD: added a fix to compile with flex 2.6.2
 
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 6e789bf..01bc4cf 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -21,5 +21,9 @@ sed '/scan_string/s;yy;glcpp_;' -i 
compiler/glsl/glcpp/glcpp-lex.l &&
 sed -r '/init_extra|scan_bytes|lex_destroy/s;yy;_mesa_program_lexer_;' \
     -i mesa/program/program_lexer.l &&
 
+# vulkan fix
+sed -i '/#include <string.h>/i \
+#include <pthread.h>' vulkan/wsi/wsi_common_wayland.c &&
+
 cd ${SOURCE_DIRECTORY} &&
 autoreconf -f -i --symlink