diff --git a/BUILD.md b/BUILD.md index 539da48..98e09f9 100644 --- a/BUILD.md +++ b/BUILD.md @@ -418,7 +418,7 @@ The minimum gcc/g++ requirements for building various components. [newer ParaView-52]: http://www.paraview.org/files/v5.2/ParaView-v5.2.0.tar.gz [page mesa]: http://mesa3d.org/ -[link mesa]: ftp://ftp.freedesktop.org/pub/mesa/13.0.1/mesa-13.0.1.tar.xz +[link mesa]: ftp://ftp.freedesktop.org/pub/mesa/13.0.3/mesa-13.0.3.tar.xz [older mesa]: ftp://ftp.freedesktop.org/pub/mesa/11.2.2/mesa-11.2.2.tar.xz [page Qt]: https://www.qt.io/download-open-source/ diff --git a/makeMesa b/makeMesa index c1befd4..123c9df 100755 --- a/makeMesa +++ b/makeMesa @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. +# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -142,6 +142,15 @@ fi MESA_SOURCE_DIR=$sourceBASE/$mesaPACKAGE MESA_ARCH_PATH=$installBASE/$mesaPACKAGE +# +# Manual adjustments to mesa +# - avoid GLES (GLES1) since may mask the header +adjustMESA() +{ + \rm -rf $MESA_ARCH_PATH/include/GLES $MESA_ARCH_PATH/include/GLES1 + echo "removed all gles1 includes" +} + ( # configuration options: unset configOpt @@ -185,11 +194,13 @@ MESA_ARCH_PATH=$installBASE/$mesaPACKAGE --disable-glx \ --disable-dri \ --disable-egl \ + --disable-gles1 \ --enable-texture-float \ --enable-gallium-osmesa --with-gallium-drivers=swrast \ $configOpt \ && make -j $WM_NCOMPPROCS \ && make install \ + && adjustMESA \ && echo "Built $mesaPACKAGE" ) || { echo "Error building: MESA"