Bump mesa to 18.0.0-rc4

projects/unix/mesa.cmake

-set(mesa_type_args --disable-gallium-osmesa --enable-glx --with-platforms=x11)
+set(mesa_type_args --disable-osmesa --disable-gallium-osmesa --enable-glx --with-platforms=x11)
 set(mesa_type_deps glproto)
 include(mesa.common)
 

projects/unix/mesa.common.cmake

@@ -8,9 +8,16 @@ endif ()
 option(mesa_USE_SWR "Enable the OpenSWR driver" "${mesa_swr_default}")
 mark_as_advanced(mesa_USE_SWR)
 
+set(mesa_SWR_ARCH "avx,avx2"
+  CACHE STRING "backend architectures to be used by Sthe SWR driver")
+mark_as_advanced(mesa_USE_SWR_ARCH)
+set_property(CACHE mesa_SWR_ARCH PROPERTY STRINGS
+  "avx" "avx,avx2" "avx,avx2,knl" "avx,avx2,skx" "avx,avx2,knl,skx")
+
 set(mesa_drivers swrast)
 if (mesa_USE_SWR)
   list(APPEND mesa_drivers swr)
+  set(mesa_swr_arch "--with-swr-arch=${mesa_USE_SWR_ARCH}")
 endif ()
 
 option(mesa_USE_TEXTURE_FLOAT
@@ -41,12 +48,13 @@ set(mesa_common_config_args
   --prefix=<INSTALL_DIR>
   --enable-opengl --disable-gles1 --disable-gles2
   --disable-va --disable-gbm --disable-xvmc --disable-vdpau
-  --enable-shared-glapi
+  --disable-shared-glapi
   ${mesa_texture_float_args}
   --disable-dri --with-dri-drivers=
-  --enable-llvm --enable-llvm-shared-libs
+  --enable-llvm
   --with-llvm-prefix=${llvm_dir}
   --with-gallium-drivers=${mesa_drivers}
+  ${mesa_swr_arch}
   --disable-egl --disable-gbm)
 
 if (BUILD_SHARED_LIBS)

projects/unix/osmesa.cmake

-set(mesa_type_args --enable-gallium-osmesa --disable-glx --with-platforms=)
+set(mesa_type_args --disable-osmesa --enable-gallium-osmesa --disable-glx --with-platforms=)
 set(mesa_type_deps)
 include(mesa.common)
 

versions.cmake

@@ -7,8 +7,8 @@ superbuild_set_revision(glproto
   URL_MD5 5565f1b0facf4a59c2778229c1f70d10)
 
 superbuild_set_revision(mesa
-    URL     "http://www.paraview.org/files/dependencies/mesa-17.1.4.tar.xz"
-    URL_MD5 be2ef7c9edec23b07f74f6512a6a6fa5)
+    URL     "http://www.paraview.org/files/dependencies/mesa-18.0.0-rc4.tar.xz"
+    URL_MD5 195889b71ee88785d55b03d99e0034d3)
 get_property(mesa_revision GLOBAL PROPERTY mesa_revision)
 superbuild_set_revision(osmesa ${mesa_revision})