From: vsr Date: Fri, 30 Apr 2021 06:51:55 +0000 (+0300) Subject: Update configuration for version 9.7.0 X-Git-Tag: V9_7_0rc1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=34af506aae74be27710e0c9e43f6f2d866ecc985;p=tools%2Fconfiguration.git Update configuration for version 9.7.0 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c18dd8d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__/ diff --git a/config/build_options/occ/options_compilation_salome_master.txt b/config/build_options/occ/options_compilation_salome_master.txt index 2fb8ff8..30c3593 100644 --- a/config/build_options/occ/options_compilation_salome_master.txt +++ b/config/build_options/occ/options_compilation_salome_master.txt @@ -142,32 +142,35 @@ YACS YACSGEN > python3 setup.py install --prefix=${YACSGEN_ROOT_DIR} -CGNS +cgns > cmake -DCMAKE_INSTALL_PREFIX:STRING=${CGNS_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCGNS_BUILD_SHARED:BOOL=ON -DCGNS_ENABLE_HDF5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake -DHDF5_INCLUDE_PATH:PATH=${HDF5_ROOT_DIR}/include -DHDF5_LIBRARY:FILEPATH=${HDF5_ROOT_DIR}/lib/libhdf5.so -DHDF5_NEED_ZLIB=ON ${CGNS_SRC_DIR} -Cython +cython > python3 setup.py install --prefix=${CYTHON_ROOT_DIR} -CAS +occt (Open CASCADE Technology) > cmake -DINSTALL_DIR:STRING=${CAS_ROOT_DIR} -D3RDPARTY_TCL_DIR:PATH=${TCLTK_ROOT_DIR} -DUSE_TBB:BOOL=ON -D3RDPARTY_TBB_DIR:PATH=${TBB_ROOT_DIR} -D3RDPARTY_FREETYPE_DIR:PATH=${FREETYPE_ROOT_DIR} -DUSE_FREEIMAGE:BOOL=ON -D3RDPARTY_FREEIMAGE_DIR:PATH=${FREEIMAGE_ROOT_DIR} -DCMAKE_BUILD_TYPE:STRING=Release ${CAS_SRC_DIR} -Paraview -cmake -DCMAKE_INSTALL_PREFIX:STRING=${PARAVIEW_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=-m64 -DCMAKE_C_FLAGS:STRING=-m64 -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON -DPARAVIEW_BUILD_TESTING:BOOL=OFF -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON -DVTK_ENABLE_OSPRAY:BOOL=ON -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib64/cmake/embree-3.3.0 -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DVTK_USE_64BIT_IDS:BOOL=ON -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES -DPARAVIEW_USE_QT:BOOL=ON -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF -DPARAVIEW_USE_PYTHON:BOOL=ON -DVTK_WRAP_PYTHON:BOOL=ON -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python3.6 -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON -DVTK_NO_PYTHON_THREADS:BOOL=OFF -DVTK_PYTHON_VERSION:STRING=3 -DVTK_WRAP_JAVA:BOOL=OFF -DPARAVIEW_USE_MPI:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5 -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR} -DBoost_NO_BOOST_CMAKE:BOOL=ON -DBoost_NO_SYSTEM_PATHS:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2 -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF ${PARAVIEW_SRC_DIR} +paraview +cmake -DCMAKE_INSTALL_PREFIX:STRING=${PARAVIEW_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=-m64 -DCMAKE_C_FLAGS:STRING=-m64 -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_LIBDIR:STRING=lib -DPARAVIEW_BUILD_TESTING:BOOL=OFF -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON -DVTK_ENABLE_OSPRAY:BOOL=ON -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib/cmake/embree-${VERSION_EMBREE} -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -Drkcommon_DIR:PATH=${RKCOMMON_ROOT_DIR}/lib/cmake/rkcommon-${VERSION_RKCOMMON} -Dopenvkl_DIR:PATH=${OPENVKL_ROOT_DIR}/lib/cmake/openvkl-${VERSION_OPENVKL} -DVTK_USE_64BIT_IDS:BOOL=ON -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES -DPARAVIEW_USE_QT:BOOL=ON -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF -DPARAVIEW_USE_PYTHON:BOOL=ON -DVTK_WRAP_PYTHON:BOOL=ON -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python3.6 -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON -DVTK_NO_PYTHON_THREADS:BOOL=OFF -DVTK_PYTHON_VERSION:STRING=3 -DVTK_WRAP_JAVA:BOOL=OFF -DPARAVIEW_USE_MPI:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5 -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR} -DBoost_NO_BOOST_CMAKE:BOOL=ON -DBoost_NO_SYSTEM_PATHS:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2 -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF -DPARAVIEW_USE_CATALYST:BOOL=ON -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON ${PARAVIEW_SRC_DIR} -Pillow +pillow > python3 ./setup.py install --prefix=${PILLOW_ROOT_DIR} -PyQt -> python3 ./configure.py -b ${PYQT5_ROOT_DIR}/bin -d ${PYQT5_ROOT_DIR} -v ${PYQT5_ROOT_DIR}/sip --confirm-license --designer-plugindir=${PYQT5_ROOT_DIR}/plugins/designer --qml-plugindir=${PYQT5_ROOT_DIR}/plugins/qml --no-qsci-api --sip-incdir=${SIP_ROOT_DIR}/include/python3.6 +pyqtsip +> python3 ./setup.py install --prefix=${PYQTSIP_ROOT_DIR} -Python3 +pyqt +> python3 ./configure.py -b ${PYQT5_ROOT_DIR}/bin -d ${PYQT5_ROOT_DIR} -v ${PYQT5_ROOT_DIR}/sip --stubsdir=${PYQT5_ROOT_DIR}/PyQt5 --confirm-license --designer-plugindir=${PYQT5_ROOT_DIR}/plugins/designer --qml-plugindir=${PYQT5_ROOT_DIR}/plugins/qml --no-qsci-api + +python3 > ./configure --prefix=${PYTHON_ROOT_DIR} --enable-shared --with-threads --with-libs=-lstdc++ --without-pymalloc --enable-optimizations CFLAGS=-m64 CXXFLAGS=-m64 CPPFLAGS=-I${TCLTK_ROOT_DIR}/include LDFLAGS=-L${TCLTK_ROOT_DIR}/lib -Sphinx and Sphinx related products +sphinx (and related products) * alabaster > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} - * Babel + * babel > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} * certifi @@ -188,10 +191,10 @@ Sphinx and Sphinx related products * imagesize > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} - * Jinja2 + * jinja2 > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} - * MarkupSafe + * markupSafe > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} * packaging @@ -200,7 +203,7 @@ Sphinx and Sphinx related products * pockets > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} - * Pygments + * pygments > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} * pyparsing @@ -221,12 +224,9 @@ Sphinx and Sphinx related products * snowballstemmer > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} - * Sphinx + * sphinx > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} - * sphinxcontrib-napoleon - > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} - * sphinxcontrib-websupport > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR} @@ -239,14 +239,14 @@ Sphinx and Sphinx related products boost > ./bootstrap.sh --prefix=${BOOST_ROOT_DIR} --with-toolset=gcc --with-python=${PYTHON_ROOT_DIR}/bin/python3 -CMake +cmake > ./configure --prefix=${CMAKE_ROOT_DIR} doxygen > cmake -DCMAKE_INSTALL_PREFIX:STRING=${DOXYGEN_ROOT_DIR} ${DOXYGEN_SRC_DIR} embree -> cmake -DCMAKE_INSTALL_PREFIX:STRING=${EMBREE_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -DEMBREE_TUTORIALS:BOOL=OFF -DEMBREE_TASKING_SYSTEM:STRING=TBB -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DEMBREE_ISA_AVX512SKX:BOOL=OFF -DEMBREE_ISPC_SUPPORT:BOOL=ON ${EMBREE_SRC_DIR} +> cmake -DCMAKE_INSTALL_PREFIX:STRING=${EMBREE_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -DEMBREE_TUTORIALS:BOOL=OFF -DEMBREE_TASKING_SYSTEM:STRING=TBB -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DEMBREE_ISA_AVX512SKX:BOOL=OFF -DEMBREE_ISPC_SUPPORT:BOOL=ON -DCMAKE_INSTALL_LIBDIR:STRING=lib ${EMBREE_SRC_DIR} freeimage (no specific configuration procedure, options are passed to make) > make -f Makefile.gnu @@ -261,7 +261,7 @@ gmsh graphvis > ./configure --prefix=${GRAPHVIS_ROOT_DIR} --disable-rpath --disable-tcl --disable-perl --disable-php --disable-ocaml --disable-lua --disable-java --disable-guile --disable-sharp --disable-swig --disable-python --disable-r --disable-ruby --without-expat --without-qt CFLAGS=-m64 CXXFLAGS=-m64 -h5py and h5py related products +h5py (and related products) * nose > python3 ./setup.py install --prefix=${H5PY_ROOT_DIR} @@ -274,16 +274,16 @@ h5py and h5py related products hdf5 > cmake -DCMAKE_INSTALL_PREFIX:STRING=${HDF5_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DHDF5_ENABLE_THREADSAFE:BOOL=ON -DALLOW_UNSUPPORTED:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON -DHDF5_BUILD_HL_LIB:BOOL=ON -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON ${HDF5_SRC_DIR} -ispc (no specific configuration procedure) -> make +ispc (install from binaries package) +> tar xzf ${ISPC_ARCHIVE} -C ${ISPC_ROOT_DIR} libxml2 > ./configure --prefix=${LIBXML2_ROOT_DIR} llvm -> cmake -DCMAKE_INSTALL_PREFIX:STRING=${LLVM_ROOT_DIR} CMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/python3.6 -DLLVM_INSTALL_UTILS:BOOL=ON -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN:BOOL=ON -DLLVM_ENABLE_DUMP:BOOL=ON ${LLVM_SRC_DIR} +> cmake -DCMAKE_INSTALL_PREFIX:STRING=${LLVM_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/python3.6 -DLLVM_INSTALL_UTILS:BOOL=ON -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN:BOOL=ON -DLLVM_ENABLE_DUMP:BOOL=ON ${LLVM_SRC_DIR} -matplotlib and matplotlib related products +matplotlib (and related products) * cycler > python3 ./setup.py install --prefix=${MATPLOTLIB_ROOT_DIR} @@ -300,6 +300,9 @@ medfile > cmake -DCMAKE_INSTALL_PREFIX:STRING=${MEDFILE_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON -DMEDFILE_BUILD_TESTS:BOOL=OFF -DMEDFILE_INSTALL_DOC:BOOL=ON -DMEDFILE_BUILD_PYTHON:BOOL=ON -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_ROOT_DIR}/include/python3.6 -DPYTHON_LIBRARY:FILEPATH=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR} -DMED_MEDINT_TYPE=long ${MEDFILE_SRC_DIR} (note: build as FFLAGS=-fdefault-integer-8 cmake ${cmake_options}) +mesa +> configure --prefix=${MESA_ROOT_DIR} --enable-opengl --disable-gles1 --disable-gles2 --disable-va --disable-xvmc --disable-vdpau --enable-shared-glapi --disable-texture-float --enable-llvm --disable-llvm-shared-libs --with-llvm-prefix=${LLVM_ROOT_DIR} --with-gallium-drivers=swrast --disable-dri --with-dri-drivers= --disable-egl --with-platforms=x11 --disable-gbm --enable-glx=gallium-xlib --disable-osmesa --enable-gallium-osmesa --enable-autotools + metis > make config prefix=${METIS_ROOT_DIR} shared=1 @@ -316,19 +319,18 @@ netgen nlopt > ./configure --prefix=${NLOPT_ROOT_DIR} --enable-shared --with-python PYTHON=`which python3` PYTHON_CONFIG=`which python3-config` CFLAGS=-m64 -fPIC CPPFLAGS=-m64 -fPIC -numpy and numpy related products +numpy (and related products) * lapack - > cmake -DCMAKE_INSTALL_PREFIX:STRING=${NUMPY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_FLAGS:STRING=-fPIC -DCMAKE_C_FLAGS:STRING=-fPIC ${LAPACK_SRC_DIR} + > cmake -DCMAKE_INSTALL_PREFIX:STRING=${NUMPY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_LIBDIR:STRING=lib -DCMAKE_CXX_FLAGS:STRING=-fPIC -DCMAKE_C_FLAGS:STRING=-fPIC ${LAPACK_SRC_DIR} * numpy > python3 ./setup.py install --prefix=${NUMPY_ROOT_DIR} -omniorb and omniorbpy - * omniorb - > ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3 +omniorb +> ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3 - * omniorbpy - > ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3 +omniorbpy +> ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3 opencv > cmake -DCMAKE_INSTALL_PREFIX:STRING=${OPENCV_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_opencv_java:BOOL=OFF -DWITH_GTK:BOOL=OFF -DWITH_LAPACK:BOOL=OFF ${OPENCV_SRC_DIR} @@ -336,18 +338,27 @@ opencv openmpi > ./configure --prefix=${OPENMPI_ROOT_DIR} CFLAGS=-m64 CXXFLAGS=-m64 +openvkl +> cmake -DCMAKE_INSTALL_PREFIX:STRING=${OPENVKL_ROOT_DIR} -DCMAKE_INSTALL_LIBDIR:STRING=lib -DBUILD_TESTING:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -Drkcommon_DIR:PATH=${RKCOMMON_ROOT_DIR}/lib/cmake/rkcommon-${VERSION_RKCOMMON} -DBUILD_EXAMPLES:BOOL=OFF ${OPENVKL_SRC_DIR} + ospray -> cmake -DCMAKE_INSTALL_PREFIX:STRING=${OSPRAY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -Dembree_DIR:PATH=${EMBREE_ROOT_DIR} -DOSPRAY_TASKING_SYSTEM:STRING=TBB -DTBB_ROOT:PATH=${TBB_ROOT_DIR} ${OSPRAY_SRC_DIR} +> cmake -DCMAKE_INSTALL_PREFIX:STRING=${OSPRAY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -DOSPRAY_TASKING_SYSTEM:STRING=TBB -DOSPRAY_ENABLE_APPS:BOOL=OFF -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib/cmake/embree-${VERSION_EMBREE} -Drkcommon_DIR:PATH=${RKCOMMON_ROOT_DIR}/lib/cmake/rkcommon-${VERSION_RKCOMMON} -Dopenvkl_DIR:PATH=${OPENVKL_ROOT_DIR}/lib/cmake/openvkl-${VERSION_OPENVKL} ${OSPRAY_SRC_DIR} planegcs > cmake -DCMAKE_INSTALL_PREFIX:STRING=${PLANEGCS_ROOT_DIR} ${PLANEGCS_SRC_DIR} +psutil +> python3 ./setup.py install --prefix=${PSUTIL_ROOT_DIR} + qt5 -> ./configure -prefix ${QT5_ROOT_DIR} -no-separate-debug-info -opensource -confirm-license -release -nomake tests +> ./configure -prefix ${QT5_ROOT_DIR} -no-separate-debug-info -opensource -confirm-license -release -no-rpath -verbose -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -nomake examples -nomake tests qwt > ./qmake +rkcommon +> cmake -DCMAKE_INSTALL_PREFIX=${RKCOMMON_ROOT_DIR} -DCMAKE_INSTALL_LIBDIR:STRING=lib -DBUILD_TESTING:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release ${RKCOMMON_SRC_DIR} + scipy > python3 ./setup.py install --prefix=${SCIPY_ROOT_DIR} @@ -355,20 +366,22 @@ scotch (no specific configuration procedure, options are passed to make) > make prefix=${SCOTCH_ROOT_DIR} sip -> python3 ./configure.py -b ${SIP_ROOT_DIR}/bin -d ${SIP_ROOT_DIR}/lib/python3.6/site-packages -e ${SIP_ROOT_DIR}/include/python3.6 -v ${SIP_ROOT_DIR}/sip -p linux-g++-64 +> python3 ./setup.py install --prefix=${SIP_ROOT_DIR} swig > ./configure --prefix=${SWIG_ROOT_DIR} --with-boost=${BOOST_ROOT_DIR} --with-python3=${PYTHON_ROOT_DIR}/bin/python3 --without-octave --with-tcl=${TCLTK_ROOT_DIR} --program-suffix=3.0 CFLAGS=-m64 CXXFLAGS=-m64 -tcltk and tclx - * tcl - > ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --enable-64bit +tbb (no specific configuration procedure, use pre-compiled binaries from the tbb web-site) +> tar xzf ${TBB_ARCHIVE} -C ${TBB_ROOT_DIR} + +tcl +> ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --enable-64bit - * tclx - > ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --with-tk=${TCLTK_ROOT_DIR}/lib --enable-64bit +tclx +> ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --with-tk=${TCLTK_ROOT_DIR}/lib --enable-64bit - * tk - > ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --enable-64bit +tk +> ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --enable-64bit -tbb (no specific configuration procedure, use pre-compiled binaries from the tbb web-site) -> tar xzf ${TBB_ARCHIVE} -C ${TBB_ROOT_DIR} +toml +> python3 ./setup.py install --prefix=${TOML_ROOT_DIR} diff --git a/config/patches/README b/config/patches/README index 1b3dd0a..f4d6bea 100644 --- a/config/patches/README +++ b/config/patches/README @@ -3,14 +3,11 @@ This directory containes patches needed to build SALOME pre-requisites. Comments ======== -1. graphvis - ! Additional patch is applied to binaries installation of grapvis to correct config6 via sed utility. +1. graphviz + ! Additional patch is applied to binaries installation of grapviz via sed utility; this corrects config6 to decrease size of produced png images 2. qwt ! Patch which contains hardcoded path to qwt install directory is applied via sed utility. It is impossible to create such a patch using diff syntax. -3. omniorb - ! Additional patch is applied to installed omniorb in order to set correct path to python3 executable. - -4. paraview - ! Post install patch is applied to ${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-5.6/UseParaView.cmake in order to add 'find_package(ospray REQUIRED)' to the end of this file. +3. omniorbpy + ! Additional patch is applied via sed to installed omniidl executables in order to set correct path to omniORB directory. diff --git a/config/patches/med.001_cmake_config.patch b/config/patches/med.001_cmake_config.patch new file mode 100644 index 0000000..d980c7c --- /dev/null +++ b/config/patches/med.001_cmake_config.patch @@ -0,0 +1,121 @@ +diff -Naur med-4.1.0_SRC.orig/CMakeLists.txt med-4.1.0_SRC.new/CMakeLists.txt +--- med-4.1.0_SRC.orig/CMakeLists.txt 2020-03-12 18:45:46.000000000 +0300 ++++ med-4.1.0_SRC.new/CMakeLists.txt 2021-03-19 16:07:10.097210739 +0300 +@@ -101,7 +101,7 @@ + IF(WIN32 AND NOT CYGWIN) + SET(INSTALL_CMAKE_CONFIG_DIR cmake) + ELSE() +- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION}) ++ SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION}) + ENDIF() + SET(INSTALL_INCLUDE_DIR include) + +diff -Naur med-4.1.0_SRC.orig/CMakeLists.txt.in med-4.1.0_SRC.new/CMakeLists.txt.in +--- med-4.1.0_SRC.orig/CMakeLists.txt.in 2020-03-03 16:53:39.000000000 +0300 ++++ med-4.1.0_SRC.new/CMakeLists.txt.in 2021-03-19 16:50:43.589542683 +0300 +@@ -101,7 +101,7 @@ + IF(WIN32 AND NOT CYGWIN) + SET(INSTALL_CMAKE_CONFIG_DIR cmake) + ELSE() +- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION}) ++ SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION}) + ENDIF() + SET(INSTALL_INCLUDE_DIR include) + +diff -Naur med-4.1.0_SRC.orig/config/cmake_files/MEDFileConfig.cmake.in med-4.1.0_SRC.new/config/cmake_files/MEDFileConfig.cmake.in +--- med-4.1.0_SRC.orig/config/cmake_files/MEDFileConfig.cmake.in 2020-02-24 14:08:41.000000000 +0300 ++++ med-4.1.0_SRC.new/config/cmake_files/MEDFileConfig.cmake.in 2021-03-19 14:26:06.733900990 +0300 +@@ -39,13 +39,13 @@ + IF(MEDFILE_BUILD_SHARED_LIBS) + SET(MEDFILE_C_LIBRARIES medC) + SET(MEDFILE_EXTRA_LIBRARIES medimportengine) ++ SET(MEDFILE_LIBRARIES medC medfwrap med) + ENDIF() + IF(MEDFILE_BUILD_STATIC_LIBS) + SET(MEDFILE_C_LIBRARIES medC_static) + SET(MEDFILE_EXTRA_LIBRARIES medimportengine_static) ++ SET(MEDFILE_LIBRARIES medC_static med_static medfwrap_static) + ENDIF() +-# For now we don't expose Fortran bindings: +-SET(MEDFILE_LIBRARIES ${MEDFILE_C_LIBRARIES}) + + # Package root dir: + SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") +diff -Naur med-4.1.0_SRC.orig/src/CMakeLists.txt med-4.1.0_SRC.new/src/CMakeLists.txt +--- med-4.1.0_SRC.orig/src/CMakeLists.txt 2020-03-12 18:45:46.000000000 +0300 ++++ med-4.1.0_SRC.new/src/CMakeLists.txt 2021-03-19 14:21:15.342441002 +0300 +@@ -113,7 +113,7 @@ + SOVERSION 11 + VERSION 11.0.1) + TARGET_LINK_LIBRARIES(medfwrap medC) +- INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS medfwrap EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + + # Add Shared MED library + ADD_LIBRARY(med SHARED MEDiterators.c) +@@ -124,7 +124,7 @@ + TARGET_LINK_LIBRARIES(med medfwrap) + + # Install only the resulting library: +- INSTALL(TARGETS med EXPORT medTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS med EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + ENDIF() + + ######### Static Libraries ########## +@@ -137,7 +137,7 @@ + ADD_LIBRARY(medfwrap_static STATIC ${medfort_wrap_SOURCES}) + SET_TARGET_PROPERTIES(medfwrap_static PROPERTIES OUTPUT_NAME medfwrap) + TARGET_LINK_LIBRARIES(medfwrap_static medC_static) +- INSTALL(TARGETS medfwrap_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS medfwrap_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + + # Add Static MED library + ADD_LIBRARY(med_static STATIC MEDiterators.c) +@@ -145,7 +145,7 @@ + TARGET_LINK_LIBRARIES(med_static medfwrap_static) + + # Install only the resulting library: +- INSTALL(TARGETS med_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS med_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + ENDIF() + + ENDIF(CMAKE_Fortran_COMPILER_WORKS) +diff -Naur med-4.1.0_SRC.orig/src/CMakeLists.txt.in med-4.1.0_SRC.new/src/CMakeLists.txt.in +--- med-4.1.0_SRC.orig/src/CMakeLists.txt.in 2019-07-03 19:09:45.000000000 +0300 ++++ med-4.1.0_SRC.new/src/CMakeLists.txt.in 2021-03-19 16:48:53.988720349 +0300 +@@ -113,7 +113,7 @@ + SOVERSION @MED_CMAKE_SO_MAJ@ + VERSION @MED_CMAKE_SO_MAJ@.@MED_CMAKE_SO_MIN@.@MED_CMAKE_SO_REL@) + TARGET_LINK_LIBRARIES(medfwrap medC) +- INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS medfwrap EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + + # Add Shared MED library + ADD_LIBRARY(med SHARED MEDiterators.c) +@@ -124,7 +124,7 @@ + TARGET_LINK_LIBRARIES(med medfwrap) + + # Install only the resulting library: +- INSTALL(TARGETS med EXPORT medTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS med EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + ENDIF() + + ######### Static Libraries ########## +@@ -137,7 +137,7 @@ + ADD_LIBRARY(medfwrap_static STATIC ${medfort_wrap_SOURCES}) + SET_TARGET_PROPERTIES(medfwrap_static PROPERTIES OUTPUT_NAME medfwrap) + TARGET_LINK_LIBRARIES(medfwrap_static medC_static) +- INSTALL(TARGETS medfwrap_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS medfwrap_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + + # Add Static MED library + ADD_LIBRARY(med_static STATIC MEDiterators.c) +@@ -145,7 +145,7 @@ + TARGET_LINK_LIBRARIES(med_static medfwrap_static) + + # Install only the resulting library: +- INSTALL(TARGETS med_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS med_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX}) + ENDIF() + + ENDIF(CMAKE_Fortran_COMPILER_WORKS) diff --git a/config/patches/paraview.0008-ParaView_coincident_rendering.patch b/config/patches/paraview.0008-ParaView_coincident_rendering.patch index 2c38df6..a1e25e7 100644 --- a/config/patches/paraview.0008-ParaView_coincident_rendering.patch +++ b/config/patches/paraview.0008-ParaView_coincident_rendering.patch @@ -1,6 +1,6 @@ -diff -Naur ParaView-5.8.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml ParaView-5.8.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml ---- ParaView-5.8.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml 2020-03-23 13:30:04.000000000 +0300 -+++ ParaView-5.8.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml 2020-04-27 19:07:56.559333300 +0300 +diff -Naur ParaView-5.9.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml ParaView-5.9.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml +--- ParaView-5.9.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml ++++ ParaView-5.9.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml @@ -31,7 +31,7 @@ -diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx ParaView-5.8.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx ---- ParaView-5.8.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx 2020-03-23 13:31:28.000000000 +0300 -+++ ParaView-5.8.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx 2020-04-27 18:07:54.639203400 +0300 -@@ -35,11 +35,11 @@ +diff -Naur ParaView-5.9.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx ParaView-5.9.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx +--- ParaView-5.9.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx ++++ ParaView-5.9.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx +@@ -36,11 +36,11 @@ static double vtkMapperGlobalResolveCoincidentTopologyZShift = 0.01; static int vtkMapperGlobalResolveCoincidentTopologyPolygonOffsetFaces = 1; @@ -46,32 +46,34 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx ParaView-5.8 +static double vtkMapperGlobalResolveCoincidentTopologyLineOffsetUnits = 1.0; +static double vtkMapperGlobalResolveCoincidentTopologyPointOffsetUnits = 0.0; - // Construct with initial range (0,1). - vtkMapper::vtkMapper() -diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx ParaView-5.8.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx ---- ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx 2020-03-23 13:31:28.000000000 +0300 -+++ ParaView-5.8.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx 2020-04-27 18:12:49.486483700 +0300 -@@ -1963,7 +1963,6 @@ - float factor = 0.0; - float offset = 0.0; - this->GetCoincidentParameters(ren, actor, factor, offset); -- vtkOpenGLCamera* cam = (vtkOpenGLCamera*)(ren->GetActiveCamera()); + vtkCxxSetObjectMacro(vtkMapper, Selection, vtkSelection); - // if we need an offset handle it here - // The value of .000016 is suitable for depth buffers -@@ -1974,23 +1973,26 @@ +diff -Naur ParaView-5.9.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx ParaView-5.9.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx +--- ParaView-5.9.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx ++++ ParaView-5.9.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx +@@ -2430,42 +2430,26 @@ { std::string FSSource = shaders[vtkShader::Fragment]->GetSource(); -- if (cam->GetParallelProjection()) -+ if (factor != 0.0) - { +- if (ren->GetActiveCamera()->GetParallelProjection()) +- { - vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", "uniform float cCValue;"); +- if (this->DrawingTubesOrSpheres(*this->LastBoundBO, actor)) +- { +- vtkShaderProgram::Substitute( +- FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragDepth + cCValue;\n"); +- } +- else +- { +- vtkShaderProgram::Substitute( +- FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragCoord.z + cCValue;\n"); +- } ++ if (factor != 0.0) ++ { + vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", + "uniform float cfactor;\n" + "uniform float coffset;"); - vtkShaderProgram::Substitute( -- FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragCoord.z + cCValue;\n"); ++ vtkShaderProgram::Substitute( + FSSource, + "//VTK::UniformFlow::Impl", + "float cscale = length(vec2(dFdx(gl_FragCoord.z),dFdy(gl_FragCoord.z)));\n" @@ -82,27 +84,39 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper } else { - vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", +- vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", - "uniform float cCValue;\n" - "uniform float cSValue;\n" - "uniform float cDValue;"); -- vtkShaderProgram::Substitute(FSSource, "//VTK::Depth::Impl", -- "float Zdc = gl_FragCoord.z*2.0 - 1.0;\n" -- " float Z2 = -1.0*cDValue/(Zdc + cCValue) + cSValue;\n" -- " float Zdc2 = -1.0*cCValue - cDValue/Z2;\n" -- " gl_FragDepth = Zdc2*0.5 + 0.5;\n"); +- if (this->DrawingTubesOrSpheres(*this->LastBoundBO, actor)) +- { +- vtkShaderProgram::Substitute(FSSource, "//VTK::Depth::Impl", +- "float Zdc = gl_FragDepth*2.0 - 1.0;\n" +- " float Z2 = -1.0*cDValue/(Zdc + cCValue) + cSValue;\n" +- " float Zdc2 = -1.0*cCValue - cDValue/Z2;\n" +- " gl_FragDepth = Zdc2*0.5 + 0.5;\n"); +- } +- else +- { +- vtkShaderProgram::Substitute(FSSource, "//VTK::Depth::Impl", +- "float Zdc = gl_FragCoord.z*2.0 - 1.0;\n" +- " float Z2 = -1.0*cDValue/(Zdc + cCValue) + cSValue;\n" +- " float Zdc2 = -1.0*cCValue - cDValue/Z2;\n" +- " gl_FragDepth = Zdc2*0.5 + 0.5;\n"); +- } ++ vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", + "uniform float coffset;"); + vtkShaderProgram::Substitute( + FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragCoord.z + 0.000016*coffset;\n"); } shaders[vtkShader::Fragment]->SetSource(FSSource); } -@@ -2110,14 +2112,12 @@ +@@ -2586,14 +2570,13 @@ // Have the renderpasses changed? vtkMTimeType renderPassMTime = this->GetRenderPassStageMTime(actor); - vtkOpenGLCamera* cam = (vtkOpenGLCamera*)(ren->GetActiveCamera()); -- + // shape of input data changed? float factor, offset; this->GetCoincidentParameters(ren, actor, factor, offset); @@ -111,13 +125,13 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper - ((cam->GetParallelProjection() != 0.0) ? 0x08 : 0) + ((offset != 0.0) ? 0x10 : 0) + + ((factor != 0.0) ? 0x08 : 0) + ((offset != 0.0) ? 0x10 : 0) + (this->VBOs->GetNumberOfComponents("scalarColor") ? 0x20 : 0) + - ((this->VBOs->GetNumberOfComponents("tcoord") % 4) << 6); - -@@ -2381,6 +2381,19 @@ - lineWidth[1] = 2.0 * actor->GetProperty()->GetLineWidth() / vp[3]; + (vtkOpenGLRenderer::SafeDownCast(ren)->GetUseSphericalHarmonics() ? 0x40 : 0) + + (actor->GetProperty()->GetCoatStrength() > 0.0 ? 0x80 : 0) + +@@ -2910,6 +2893,19 @@ + lineWidth[1] = 2.0 * propLineWidth / vp[3]; cellBO.Program->SetUniform2f("lineWidthNVC", lineWidth); } -+ ++ + // handle coincident + if (cellBO.Program->IsUniformUsed("coffset")) + { @@ -130,10 +144,10 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper + cellBO.Program->SetUniformf("cfactor", factor); + } + } + vtkOpenGLCheckErrorMacro("failed after UpdateShader"); } - //----------------------------------------------------------------------------- -@@ -2436,25 +2449,6 @@ +@@ -2995,25 +2991,6 @@ } } @@ -156,6 +170,7 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper - } - } - - // If the VBO coordinates were shifted and scaled, apply the inverse transform - // to the model->view matrix: - vtkOpenGLVertexBufferObject* vvbo = this->VBOs->GetVBO("vertexMC"); + vtkNew env; + if (program->IsUniformUsed("envMatrix")) + { + diff --git a/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch b/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch new file mode 100644 index 0000000..9c12894 --- /dev/null +++ b/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch @@ -0,0 +1,34 @@ +diff -Naur ParaView-5.9.0_ref/CMakeLists.txt ParaView-5.9.0/CMakeLists.txt +--- ParaView-5.9.0_ref/CMakeLists.txt 2021-02-04 15:22:04.000000000 +0100 ++++ ParaView-5.9.0/CMakeLists.txt 2021-03-01 15:48:43.101402815 +0100 +@@ -831,7 +831,7 @@ + # Test to check that we can process all of the Catalyst editions + #------------------------------------------------------------------------------ + if (BUILD_TESTING AND PARAVIEW_USE_PYTHON AND UNIX AND NOT APPLE) +-if (FALSE) # XXX(FIXME) ++if (TRUE) # XXX(FIXME) + # disabling till we Catalyst editions are fixed post modularization + add_test( NAME GenerateCatalystEditions + COMMAND ${CMAKE_COMMAND} + +diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in +--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-02-04 15:22:02.000000000 +0100 ++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-03-01 15:51:58.110940810 +0100 +@@ -1,6 +1,6 @@ + # Catalyst Package config file. + cmake_policy(PUSH) +-cmake_policy(VERSION 3.13) ++cmake_policy(VERSION 3.12) + + set(CATALYST_VERSION "@CATALYST_VERSION@") + set(CATALYST_ABI_VERSION "@CATALYST_ABI_VERSION@") + +diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt +--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100 ++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-03-01 15:56:02.640910857 +0100 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.13...3.16 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.12...3.16 FATAL_ERROR) + project(CATALYST VERSION 2.0 LANGUAGES C CXX) + + #------------------------------------------------------------------------------ diff --git a/config/patches/paraview.0011-ParaView_protobuf_crash.patch b/config/patches/paraview.0011-ParaView_protobuf_crash.patch new file mode 100644 index 0000000..a9623e9 --- /dev/null +++ b/config/patches/paraview.0011-ParaView_protobuf_crash.patch @@ -0,0 +1,14 @@ +diff -Naur ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx +index e171735139..47784ec70e 100644 +--- ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx ++++ ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx +@@ -300,7 +300,7 @@ void vtkInitializationHelper::Finalize() + vtkProcessModule::Finalize(); + + // Optional: Delete all global objects allocated by libprotobuf. +- google::protobuf::ShutdownProtobufLibrary(); ++ //google::protobuf::ShutdownProtobufLibrary(); + } + + //---------------------------------------------------------------------------- + diff --git a/config/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch b/config/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch new file mode 100644 index 0000000..fae772a --- /dev/null +++ b/config/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch @@ -0,0 +1,29 @@ +diff -Naur ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake +--- ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake 2021-04-15 12:41:13.691878300 +0300 ++++ ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake 2021-04-15 12:50:29.348516100 +0300 +@@ -65,11 +65,20 @@ + if (arg_INSTALL_EXPORT_DEFAULT) + set (_exports EXPORT Catalyst) + endif() +- if (arg_LIBRARY_DESTINATION) +- install( +- TARGETS ${arg_TARGET} +- ${_exports} +- LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION}) ++ if(WIN32) ++ if (arg_LIBRARY_DESTINATION) ++ install( ++ TARGETS ${arg_TARGET} ++ ${_exports} ++ RUNTIME DESTINATION ${arg_LIBRARY_DESTINATION}) ++ endif() ++ else() ++ if (arg_LIBRARY_DESTINATION) ++ install( ++ TARGETS ${arg_TARGET} ++ ${_exports} ++ LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION}) ++ endif() + endif() + endfunction() + diff --git a/config/patches/paraview.1002-ParaView_find_zlib.patch b/config/patches/paraview.1002-ParaView_find_zlib.patch new file mode 100644 index 0000000..c811a23 --- /dev/null +++ b/config/patches/paraview.1002-ParaView_find_zlib.patch @@ -0,0 +1,15 @@ +diff -Naur ParaView-5.8.0_SRC_orig/VTK/CMake/patches/3.13/FindZLIB.cmake ParaView-5.8.0_SRC_modif/VTK/CMake/patches/3.13/FindZLIB.cmake +--- ParaView-5.8.0_SRC_orig/VTK/CMake/patches/3.13/FindZLIB.cmake 2020-03-23 13:31:26.000000000 +0300 ++++ ParaView-5.8.0_SRC_modif/VTK/CMake/patches/3.13/FindZLIB.cmake 2020-04-13 14:13:11.214692753 +0300 +@@ -52,6 +52,11 @@ + + set(_ZLIB_SEARCHES) + ++SET(ZLIB_ROOT_DIR $ENV{ZLIB_ROOT_DIR} CACHE PATH "PATH TO zlib.") ++IF(ZLIB_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${ZLIB_ROOT_DIR}") ++ENDIF(ZLIB_ROOT_DIR) ++ + # Search ZLIB_ROOT first if it is set. + if(ZLIB_ROOT) + set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH) diff --git a/config/patches/pyqt5sip.001_sipBool.patch b/config/patches/pyqt5sip.001_sipBool.patch new file mode 100644 index 0000000..b33b4da --- /dev/null +++ b/config/patches/pyqt5sip.001_sipBool.patch @@ -0,0 +1,14 @@ +--- PyQt5_sip-12.8.1/sipint.h 2020-08-29 13:27:37.000000000 +0300 ++++ PyQt5_sip-12.8.1/sipint.h.new 2021-03-17 12:06:11.287544763 +0300 +@@ -177,9 +177,9 @@ + void sipOMAddObject(sipObjectMap *om, sipSimpleWrapper *val); + int sipOMRemoveObject(sipObjectMap *om, sipSimpleWrapper *val); + +-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ++//#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #define sipSetBool(p, v) (*(_Bool *)(p) = (v)) +-#endif ++//#endif + + + #ifdef __cplusplus diff --git a/config/patches/qt.002_xkbcommon.patch b/config/patches/qt.002_xkbcommon.patch new file mode 100644 index 0000000..692861d --- /dev/null +++ b/config/patches/qt.002_xkbcommon.patch @@ -0,0 +1,18 @@ +--- qt-everywhere-src-5.12.10/qtbase/src/gui/configure.json 2021-03-17 12:16:55.144830165 +0300 ++++ qt-everywhere-src-5.12.10/qtbase/src/gui/configure.json.new 2021-03-17 12:16:41.605223710 +0300 +@@ -758,13 +758,13 @@ + "use": "xcb" + }, + "xkbcommon": { +- "label": "xkbcommon >= 0.5.0", ++ "label": "xkbcommon >= 0.4.3", + "test": { + "main": "xkb_context_new(XKB_CONTEXT_NO_FLAGS);" + }, + "headers": [ "xkbcommon/xkbcommon.h" ], + "sources": [ +- { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" }, ++ { "type": "pkgConfig", "args": "xkbcommon >= 0.4.3" }, + "-lxkbcommon" + ] + }, diff --git a/config/patches/rkcommon.001_native_tbb.patch b/config/patches/rkcommon.001_native_tbb.patch new file mode 100644 index 0000000..fdf3156 --- /dev/null +++ b/config/patches/rkcommon.001_native_tbb.patch @@ -0,0 +1,12 @@ +--- rkcommon-1.5.1/cmake/FindTBB.cmake 2021-03-09 14:26:46.000000000 +0300 ++++ rkcommon-1.5.1/cmake/FindTBB.cmake.new 2021-03-17 12:26:35.339966172 +0300 +@@ -269,8 +269,7 @@ + function(rk_tbb_find_include_directory) + find_path(TBB_INCLUDE_DIR + NAMES "${_TBB_HEADER}" +- HINTS "${TBB_ROOT}/${_TBB_INCLUDE_SUBDIR}" +- NO_PACKAGE_ROOT_PATH) ++ HINTS "${TBB_ROOT}/${_TBB_INCLUDE_SUBDIR}") + endfunction() + + #=============================================================================== diff --git a/config/salome.xml b/config/salome.xml index e74ad28..12d22a0 100644 --- a/config/salome.xml +++ b/config/salome.xml @@ -1,19 +1,21 @@ - + - + - + + + @@ -29,16 +31,15 @@ - + - + - - + @@ -50,8 +51,13 @@ - - + + + + + + + @@ -62,12 +68,12 @@ - + - + @@ -77,34 +83,53 @@ - + + - + - - - - + + + + + + + + + + + + - + + + + + + - + - + + + + + + @@ -113,66 +138,54 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/sconfig/salome_config.py b/config/sconfig/salome_config.py index 07deee6..0f86af3 100644 --- a/config/sconfig/salome_config.py +++ b/config/sconfig/salome_config.py @@ -79,6 +79,7 @@ __all__ = [ "commentAttr", "versionAttr", "urlAttr", + "sha1Attr", "supportedTags", "supportedAttributes", "tagAttributes", @@ -144,6 +145,12 @@ def urlAttr(): """ return "url" +def sha1Attr(): + """ + Return XML attribute for sha1 parameter (string). + """ + return "sha1" + def supportedTags(): """ Return list of all supported XML tags (list of strings). @@ -154,7 +161,7 @@ def supportedAttributes(): """ Return list of all supported XML attributes (list of strings). """ - return [nameAttr(), commentAttr(), versionAttr(), urlAttr()] + return [nameAttr(), commentAttr(), versionAttr(), urlAttr(), sha1Attr()] def tagAttributes(tag, force = False): """ @@ -191,6 +198,7 @@ def tagAttributes(tag, force = False): pass attrs[urlAttr()] = False attrs[commentAttr()] = False + attrs[sha1Attr()] = False return attrs def tagChildren(tag): @@ -261,6 +269,7 @@ class CfgTool(object): """ self.enc = "utf-8" self.cfgFile = cfgFile if cfgFile else defaultConfFile() + self.parents = {} try: self.tree = ET.parse(self.cfgFile).getroot() self._checkConfig() @@ -275,7 +284,7 @@ class CfgTool(object): raise Exception("bad XML file %s: %s" % (self.cfgFile, str(e))) pass except Exception as e: - raise Exception("unkwnown error: %s" % str(e)) + raise Exception("unknown error: %s" % str(e)) pass def encoding(self): @@ -486,7 +495,7 @@ class CfgTool(object): Return value is new XML element (xml.etree.ElementTree.Element). """ child = ET.SubElement(elem, tag) - child._parent = elem # set parent!!! + self.parents[child] = elem # set parent!!! return child def _processTarget(self, target): @@ -596,7 +605,7 @@ class CfgTool(object): path = [] while elem is not None: path.append(_mkname(elem)) - elem = elem._parent if hasattr(elem, "_parent") else None + elem = self.parents.get(elem) pass path.reverse() return pathSeparator().join(path) @@ -729,7 +738,7 @@ class CfgTool(object): # check all childrens recursively children = elem.getchildren() for child in children: - child._parent = elem # set parent!!! + self.parents[child] = elem # set parent!!! self._checkTag(child, elem.tag, errors) pass pass