From c310f06ac1911ed6ce2842debaf299e92ac49bd3 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 23 Jun 2020 00:21:11 +0300 Subject: [PATCH] Update SALOME-9.5.0 prerequisites: build options, patches and versions. --- .../occ/options_compilation_salome_master.txt | 18 +- config/patches/gl2ps.001_libs.patch | 13 -- .../medfile.001.bug_correct_cmake.patch | 37 ---- ...w.0008-ParaView_coincident_rendering.patch | 161 ++++++++++++++++++ .../patches/tbb.001_install_py_backend.patch | 13 -- config/salome.xml | 118 ++++++------- 6 files changed, 229 insertions(+), 131 deletions(-) delete mode 100644 config/patches/gl2ps.001_libs.patch delete mode 100644 config/patches/medfile.001.bug_correct_cmake.patch create mode 100644 config/patches/paraview.0008-ParaView_coincident_rendering.patch delete mode 100644 config/patches/tbb.001_install_py_backend.patch diff --git a/config/build_options/occ/options_compilation_salome_master.txt b/config/build_options/occ/options_compilation_salome_master.txt index f0378cd..dabb8e2 100644 --- a/config/build_options/occ/options_compilation_salome_master.txt +++ b/config/build_options/occ/options_compilation_salome_master.txt @@ -149,11 +149,14 @@ Cython > python3 setup.py install --prefix=${CYTHON_ROOT_DIR} CAS -> 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} -DUSE_GL2PS:BOOL=ON -D3RDPARTY_GL2PS_DIR:PATH=${GL2PS_ROOT_DIR} -DCMAKE_BUILD_TYPE:STRING=Release ${CAS_SRC_DIR} +> 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=OFF -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} +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 @@ -243,7 +246,7 @@ 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} ${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 ${EMBREE_SRC_DIR} freeimage (no specific configuration procedure, options are passed to make) > make -f Makefile.gnu @@ -274,8 +277,8 @@ 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 -> cmake -DCMAKE_INSTALL_PREFIX:STRING=${ISPC_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_ROOT_DIR}/bin/python3.6 ${ISPC_SRC_DIR} +ispc (no specific configuration procedure) +> make libxml2 > ./configure --prefix=${LIBXML2_ROOT_DIR} @@ -312,6 +315,9 @@ netgen > automake --copy --gnu --add-missing > ./configure --prefix=${NETGEN_ROOT_DIR} --with-occ=${CAS_ROOT_DIR} --with-tcl=${TCLTK_ROOT_DIR}/lib --with-tk=${TCLTK_ROOT_DIR}/lib --with-tclinclude=${TCLTK_ROOT_DIR}/include CXXFLAGS=-O2 -m64 -std=c++0x +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 * 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} @@ -366,5 +372,5 @@ tcltk and tclx * tk > ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --enable-64bit -tbb -> python3 build/build.py --install --install-python --prefix=${TBB_ROOT_DIR} +tbb (no specific configuration procedure, use pre-compiled binaries from the tbb web-site) +> tar xzf ${TBB_ARCHIVE} -C ${TBB_ROOT_DIR} diff --git a/config/patches/gl2ps.001_libs.patch b/config/patches/gl2ps.001_libs.patch deleted file mode 100644 index 68168b3..0000000 --- a/config/patches/gl2ps.001_libs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -NaurwB gl2ps-1.3.9__1/CMakeLists.txt gl2ps-1.3.9__0/CMakeLists.txt ---- gl2ps-1.3.9__1/CMakeLists.txt 2017-03-15 14:16:29.548325553 +0300 -+++ gl2ps-1.3.9__0/CMakeLists.txt 2017-03-15 14:17:13.060574241 +0300 -@@ -76,6 +76,9 @@ - add_definitions(-DHAVE_NO_VSNPRINTF) - endif(NOT HAVE_VSNPRINTF) - -+find_library(LIBM_LIBRARY NAMES m) -+list(APPEND EXTERNAL_LIBRARIES ${LIBM_LIBRARY}) -+ - find_package(OpenGL) - if(OPENGL_FOUND) - list(APPEND EXTERNAL_INCLUDES ${OPENGL_INCLUDE_DIR}) diff --git a/config/patches/medfile.001.bug_correct_cmake.patch b/config/patches/medfile.001.bug_correct_cmake.patch deleted file mode 100644 index e477630..0000000 --- a/config/patches/medfile.001.bug_correct_cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur --exclude=CVS --exclude=.git med-4.0.0rc1.orig/CMakeLists.txt med-4.0.0rc1.patched/CMakeLists.txt ---- med-4.0.0rc1.orig/CMakeLists.txt 2018-10-24 18:38:31.000000000 +0300 -+++ med-4.0.0rc1.patched/CMakeLists.txt 2018-10-30 18:57:34.000000000 +0300 -@@ -121,7 +121,8 @@ - - ## Installation of the doc - IF(MEDFILE_INSTALL_DOC) -- INSTALL(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_PREFIX}/share) -+ INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE) -+ INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png") - ENDIF() - - ####################### -diff -Naur --exclude=CVS --exclude=.git med-4.0.0rc1.orig/config/cmake_files/medMacros.cmake med-4.0.0rc1.patched/config/cmake_files/medMacros.cmake ---- med-4.0.0rc1.orig/config/cmake_files/medMacros.cmake 2018-10-22 11:36:07.000000000 +0300 -+++ med-4.0.0rc1.patched/config/cmake_files/medMacros.cmake 2018-10-30 19:03:44.673012496 +0300 -@@ -406,7 +406,7 @@ - - ADD_DEFINITIONS(-DH5_USE_16_API) - IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS) -- ADD_DEFINITIONS(-D_HDF5USEDLL_) -+ ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1) - ENDIF() - - # Take what is exposed by the standard FIND_PACKAGE() -diff -Naur --exclude=CVS --exclude=.git med-4.0.0rc1.orig/python/CMakeLists.txt med-4.0.0rc1.patched/python/CMakeLists.txt ---- med-4.0.0rc1.orig/python/CMakeLists.txt 2018-10-23 01:43:04.000000000 +0300 -+++ med-4.0.0rc1.patched/python/CMakeLists.txt 2018-10-30 19:03:44.657012959 +0300 -@@ -24,7 +24,7 @@ - medparameter_module.i - medprofile_module.i - medsubdomain_module.i -- medstructelement.i -+ medstructelement_module.i - ) - - IF(APPLE) diff --git a/config/patches/paraview.0008-ParaView_coincident_rendering.patch b/config/patches/paraview.0008-ParaView_coincident_rendering.patch new file mode 100644 index 0000000..2c38df6 --- /dev/null +++ b/config/patches/paraview.0008-ParaView_coincident_rendering.patch @@ -0,0 +1,161 @@ +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 +@@ -31,7 +31,7 @@ + + + +@@ -51,7 +51,7 @@ + + + +@@ -66,7 +66,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 @@ + static double vtkMapperGlobalResolveCoincidentTopologyZShift = 0.01; + static int vtkMapperGlobalResolveCoincidentTopologyPolygonOffsetFaces = 1; + +-static double vtkMapperGlobalResolveCoincidentTopologyPolygonOffsetFactor = 0.0; +-static double vtkMapperGlobalResolveCoincidentTopologyPolygonOffsetUnits = 0.0; +-static double vtkMapperGlobalResolveCoincidentTopologyLineOffsetFactor = 0.0; +-static double vtkMapperGlobalResolveCoincidentTopologyLineOffsetUnits = -4.0; +-static double vtkMapperGlobalResolveCoincidentTopologyPointOffsetUnits = -8.0; ++static double vtkMapperGlobalResolveCoincidentTopologyPolygonOffsetFactor = 2.0; ++static double vtkMapperGlobalResolveCoincidentTopologyPolygonOffsetUnits = 2.0; ++static double vtkMapperGlobalResolveCoincidentTopologyLineOffsetFactor = 1.0; ++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()); + + // if we need an offset handle it here + // The value of .000016 is suitable for depth buffers +@@ -1974,23 +1973,26 @@ + { + std::string FSSource = shaders[vtkShader::Fragment]->GetSource(); + +- if (cam->GetParallelProjection()) ++ if (factor != 0.0) + { +- vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", "uniform float cCValue;"); ++ 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"); ++ FSSource, ++ "//VTK::UniformFlow::Impl", ++ "float cscale = length(vec2(dFdx(gl_FragCoord.z),dFdy(gl_FragCoord.z)));\n" ++ " //VTK::UniformFlow::Impl\n" // for other replacements ++ ); ++ vtkShaderProgram::Substitute(FSSource, "//VTK::Depth::Impl", ++ "gl_FragDepth = gl_FragCoord.z + cfactor*cscale + 0.000016*coffset;\n"); + } + else + { + 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"); ++ "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 @@ + // 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); + unsigned int scv = (this->CurrentInput->GetPointData()->GetNormals() ? 0x01 : 0) + + (this->HaveCellScalars ? 0x02 : 0) + (this->HaveCellNormals ? 0x04 : 0) + +- ((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]; + cellBO.Program->SetUniform2f("lineWidthNVC", lineWidth); + } ++ ++ // handle coincident ++ if (cellBO.Program->IsUniformUsed("coffset")) ++ { ++ float factor, offset; ++ this->GetCoincidentParameters(ren, actor,factor,offset); ++ cellBO.Program->SetUniformf("coffset",offset); ++ // cfactor isn't always used when coffset is. ++ if (cellBO.Program->IsUniformUsed("cfactor")) ++ { ++ cellBO.Program->SetUniformf("cfactor", factor); ++ } ++ } + } + + //----------------------------------------------------------------------------- +@@ -2436,25 +2449,6 @@ + } + } + +- // handle coincident +- if (cellBO.Program->IsUniformUsed("cCValue")) +- { +- float diag = actor->GetLength(); +- float factor, offset; +- this->GetCoincidentParameters(ren, actor, factor, offset); +- if (cam->GetParallelProjection()) +- { +- // one unit of offset is based on 1/1000 of bounding length +- cellBO.Program->SetUniformf("cCValue", -2.0 * 0.001 * diag * offset * vcdc->GetElement(2, 2)); +- } +- else +- { +- cellBO.Program->SetUniformf("cCValue", vcdc->GetElement(2, 2)); +- cellBO.Program->SetUniformf("cDValue", vcdc->GetElement(3, 2)); +- cellBO.Program->SetUniformf("cSValue", -0.001 * diag * offset); +- } +- } +- + // If the VBO coordinates were shifted and scaled, apply the inverse transform + // to the model->view matrix: + vtkOpenGLVertexBufferObject* vvbo = this->VBOs->GetVBO("vertexMC"); diff --git a/config/patches/tbb.001_install_py_backend.patch b/config/patches/tbb.001_install_py_backend.patch deleted file mode 100644 index c217160..0000000 --- a/config/patches/tbb.001_install_py_backend.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur tbb-2019-U8_SRC_orig/build/build.py tbb-2019-U8_SRC_modif/build/build.py ---- tbb-2019-U8_SRC_orig/build/build.py 2019-06-06 13:29:15.000000000 +0300 -+++ tbb-2019-U8_SRC_modif/build/build.py 2019-11-15 14:54:44.242189708 +0300 -@@ -198,7 +198,7 @@ - paths = [os.path.abspath(d) for d in [args.prefix, inc_dir, irml_dir, lib_dir]+release_dirs] - os.environ["TBBROOT"] = paths[0] - # all the paths must be relative to python/ directory or be absolute -- assert system('python python/setup.py build -b%s build_ext -I%s -L%s install -f'% \ -- (paths[2], paths[1], ':'.join(paths[2:]))) == 0 -+ assert system('python3 python/setup.py build -b%s build_ext -I%s -L%s install -f --prefix=%s'% \ -+ (paths[2], paths[1], ':'.join(paths[2:]), args.prefix)) == 0 - - print("done") diff --git a/config/salome.xml b/config/salome.xml index dbe3140..6b39097 100644 --- a/config/salome.xml +++ b/config/salome.xml @@ -1,5 +1,5 @@ - + @@ -24,11 +24,6 @@ - - - - - @@ -42,25 +37,21 @@ - + - + - - - - - - + + @@ -69,13 +60,14 @@ + - + @@ -87,13 +79,19 @@ - + - - - + + + + + + + + + @@ -124,14 +122,10 @@ - - - - - + - + @@ -142,42 +136,42 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + -- 2.39.2