zhyang-dev/ThirdParty-common
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/ThirdParty-common.git synced 2025-12-08 06:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: ensure GLES(1) includes are not installed with mesa

Browse Source
This commit is contained in:
mark
2017-01-19 12:58:10 +01:00
parent 705556c3eb
commit 45caecb85b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.md
View File

@ -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 [newer ParaView-52]: http://www.paraview.org/files/v5.2/ParaView-v5.2.0.tar.gz
[page mesa]: http://mesa3d.org/ [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 [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/ [page Qt]: https://www.qt.io/download-open-source/

13
makeMesa
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -142,6 +142,15 @@ fi
MESA_SOURCE_DIR=$sourceBASE/$mesaPACKAGE MESA_SOURCE_DIR=$sourceBASE/$mesaPACKAGE
MESA_ARCH_PATH=$installBASE/$mesaPACKAGE MESA_ARCH_PATH=$installBASE/$mesaPACKAGE
#
# Manual adjustments to mesa
# - avoid GLES (GLES1) since <GLES/gl.h> may mask the <GL/gl.h> header
adjustMESA()
{
\rm -rf $MESA_ARCH_PATH/include/GLES $MESA_ARCH_PATH/include/GLES1
echo "removed all gles1 includes"
}
( (
# configuration options: # configuration options:
unset configOpt unset configOpt
@ -185,11 +194,13 @@ MESA_ARCH_PATH=$installBASE/$mesaPACKAGE
--disable-glx \ --disable-glx \
--disable-dri \ --disable-dri \
--disable-egl \ --disable-egl \
--disable-gles1 \
--enable-texture-float \ --enable-texture-float \
--enable-gallium-osmesa --with-gallium-drivers=swrast \ --enable-gallium-osmesa --with-gallium-drivers=swrast \
$configOpt \ $configOpt \
&& make -j $WM_NCOMPPROCS \ && make -j $WM_NCOMPPROCS \
&& make install \ && make install \
&& adjustMESA \
&& echo "Built $mesaPACKAGE" && echo "Built $mesaPACKAGE"
) || { ) || {
echo "Error building: MESA" echo "Error building: MESA"