]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Update SALOME-9.5.0 prerequisites: build options, patches and versions.
authorrnv <rnv@opencascade.com>
Mon, 22 Jun 2020 21:21:11 +0000 (00:21 +0300)
committerrnv <rnv@opencascade.com>
Mon, 22 Jun 2020 21:21:11 +0000 (00:21 +0300)
config/build_options/occ/options_compilation_salome_master.txt
config/patches/gl2ps.001_libs.patch [deleted file]
config/patches/medfile.001.bug_correct_cmake.patch [deleted file]
config/patches/paraview.0008-ParaView_coincident_rendering.patch [new file with mode: 0644]
config/patches/tbb.001_install_py_backend.patch [deleted file]
config/salome.xml

index f0378cd94bf4e75813b81b07800b9d2c271ec73f..dabb8e2934a35e625a3cb759f55c7ea2ccf3eedd 100644 (file)
@@ -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 (file)
index 68168b3..0000000
+++ /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 (file)
index e477630..0000000
+++ /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 (file)
index 0000000..2c38df6
--- /dev/null
@@ -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 @@
+       <DoubleVectorProperty name="PolygonOffsetParameters"
+         command="SetPolygonOffsetParameters"
+         number_of_elements="2"
+-        default_values="0.0 0.0"
++        default_values="2.0 2.0"
+         panel_visibility="advanced">
+         <DoubleRangeDomain name="range" />
+         <Documentation>
+@@ -51,7 +51,7 @@
+       <DoubleVectorProperty name="LineOffsetParameters"
+         command="SetLineOffsetParameters"
+         number_of_elements="2"
+-        default_values="0.0 -4"
++        default_values="1.0 1.0"
+         panel_visibility="advanced">
+         <DoubleRangeDomain name="range" />
+         <Documentation>
+@@ -66,7 +66,7 @@
+       <DoubleVectorProperty name="PointOffsetParameter"
+         command="SetPointOffsetParameter"
+         number_of_elements="1"
+-        default_values="-8"
++        default_values="0"
+         panel_visibility="advanced">
+         <DoubleRangeDomain name="range" />
+         <Documentation>
+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 (file)
index c217160..0000000
+++ /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")
index dbe31403696645f36393782bd072f689d2716bf3..6b390971b0a57ba161e0a9881f4eb82a99ee45f6 100644 (file)
@@ -1,5 +1,5 @@
 <!DOCTYPE config>
-<config comment="SALOME 9.4" name="V9_4_0">
+<config comment="SALOME 9.5" name="V9_5_0">
   <product name="alabaster" version="0.7.6" />
   <product name="babel" version="2.6.0" />
   <product name="boost" version="1.58.0" />
   </product>
   <product name="freetype" version="2.9.0" />
   <product name="gmsh" version="4.1.4" />
-  <product name="gl2ps" version="1.4.0-20170729">
-    <patches>
-      <patch comment="Fix problem with missing additional libraries" name="gl2ps.001_libs.patch" sha1="59fb1261603d11392ce26a9c98561fa2777d826c" />
-    </patches>
-  </product>
   <product name="graphviz" version="2.38.0">
     <patches>
       <patch comment="Fix build procedure" name="graphviz.001_build_procedure.patch" sha1="4b227e20ad416e8f08911fa907b66deb1d359102" />
   <product name="homardtool" version="11.12" />
   <product name="idna" version="2.7" />
   <product name="imagesize" version="1.0.0" />
-  <product name="ispc" vesrion="1.12.0" />
+  <product name="ispc" vesrion="1.9.2" />
   <product name="h5py" version="2.5.0" />
   <product name="jinja2" version="2.7.3" />
   <product name="kiwisolver" version="1.0.1" />
   <product name="lapack" version="3.7.0" />
   <product name="libxml2" version="2.9.1"/>
-  <product name="llvm" version="8.0.1"/>
+  <product name="llvm" version="3.9.1"/>
   <product name="markupsafe" version="0.23" />
   <product name="matplotlib" version="2.2.2">
     <patches>
       <patch comment="Fix build procedure: create configuration file properly" name="matplotlib.001_build_procedure.patch" sha1="e01651c9160f7a2a73311ba0cbf1686385bea301" />
     </patches>
   </product>
-  <product name="medfile" version="4.0.0" >
-     <patches>
-      <patch comment="Fix bugs in the med CMake build procedure" name="medfile.001.bug_correct_cmake.patch" sha1="7f34557969af227905a2ce065f25c104a096ff00" />
-    </patches>
-  </product> 
-  <product name="meshgems" version="2.9.6" />
+  <product name="medfile" version="4.1.0" /> 
+  <product name="meshgems" version="2.10.3" />
   <product name="metis" version="5.1.0" />
   <product name="mpich2" version="1.4.1p1" />
   <product name="mpi4py" version="1.3.1" />
       <patch comment="General patch needed for SALOME platform" name="netgen.001.common.patch" sha1="a0a629d2dde375ee22405e26cae692bad09f8b63" />
     </patches>
   </product>
+  <product name="nlopt" version="2.4.2" />
   <product name="nose" version="1.3.7" />
   <product name="numpy" version="1.15.1" >
     <patches>
       <patch comment="Fix problem with shell command" name="numpy.001_shell.patch" sha1="d004dfb9053fcc7bcdc021e8c7aa3eb552a80452" />
     </patches>
   </product>
-  <product name="occt" version="7.3.0p4" />
+  <product name="occt" version="7.4.0p1" />
   <product name="omniorb" version="4.2.2" />
   <product name="omniorbpy" version="4.2.2" />
   <product name="opencv" version="3.2.0">
   <product name="openmpi" version="1.8.5" />
   <product name="ospray" version="1.8.4" />
   <product name="packaging" version="17.1" />
-  <product name="paraview" version="5.6.0p2-bfaf7b82">
+  <product name="paraview" version="5.8.0">
     <patches>
-      <patch comment="Fix problem with python threads" name="paraview.001_against_multiple_py_sv_thr.patch" sha1="6f2bfdc85cd22ceb3ff8a85cd177a0b373461045" />
-      <patch comment="Fix bug in the vtkStateStorage class" name="paraview.002_statestorage_bug.patch" sha1="abc5ad2bf5565ea1edd25df68a4242830b986ae7" />
-      <patch comment="Fix problem with forwarding executables on some platforms" name="paraview.004_forwarding.patch" sha1="7856257c15ae5375ac5a88d94868e106379169fa" />
+      <patch comment="Patch for LATA Reader" name="paraview.0001-LATA-reader.patch" sha1="d1b723eab368e716f7bee33e4064c839a7055b34" />
+      <patch comment="Patches for Visit Bridge " name="paraview.0002-vtkUnstructuredGridRelevantPointsFilter-fix-for-poly.patch" sha1="ac843a5d0135b4c9d657dc92e0e69007cca84d1d" />
+      <patch comment="Patch for ParaView client" name="paraview.0003-ParaViewClient.patch" sha1="5a09612a69ecb13831062f36eee50a02b82370da" />
+      <patch comment="Patch for ParaView HDF5" name="paraview.0004-ParaView_hdf5.patch" sha1="b34706a3bb5e6873b0c94726e565624928994a57" />
+      <patch comment="Patch for ParaView CNGS's detection procedure" name="paraview.0005-ParaView_find_cgns.patch" sha1="b48b6008506607eaedbbeb662ca822903bcc274d" />
+      <patch comment="Patch for ParaView libxml2's detection procedure" name="paraview.0006-ParaView_find_libxml2.patch" sha1="adc67576f12ca3b6abc06be2960495029c24c2a6" />
+      <patch comment="Patch for ParaView freetype's detection procedure" name="paraview.0007-ParaView_find_freetype.patch" sha1="58a8b25b56fb325134129445c2ac90d7d4115980" />
+      <patch comment="Patch to fix ParaView bug with rendering coincident topology" name="paraview.0008-ParaView_coincident_rendering.patch" sha1="45f74561b5301187bd73ee10f0c266c1345c8666" />
     </patches>
   </product>
+  <product name="pillow" version="7.1.1" />  
   <product name="pkgconfig" version="1.1.0" />
   <product name="pygments" version="2.0.2" />
   <product name="pyparsing" version="2.0.3" />
   <product name="swig" version="3.0.12" />
   <product name="tcltk" version="8.6.0" />
   <product name="tclx" version="8.4.1" />
-  <product name="tbb" version="2019-U8" >
-    <patches>
-      <patch comment="Patch to install python backend in the TBB dir" name="tbb.001_install_py_backend.patch" sha1="f013ef00fdec58aaf80b447f79fd67807e40982b" />
-    </patches>
-  </product>
+  <product name="tbb" version="4.4" />
   <product name="urllib3" version="1.23" />
   <product name="eigen" version="3.2.7" />
-  <product name="embree" version="3.5.2" >
+  <product name="embree" version="3.3.0" >
     <patches>
       <patch comment="Patch for CentOS-6 platform" name="embree.001_centos6.patch" sha1="63fe01e0c3da109bc092525f9573188e0c5625ea" />
     </patches>
     </patches>
   </product>
   <product name="pockets" version="0.6.2" />
-  <product comment="SALOME Geometry module" name="geom" version="" />
-  <product comment="SALOME GUI module" name="gui" version="9_4_0" />
-  <product comment="SALOME HexaBlock module" name="hexablock" version="9_4_0" />
-  <product comment="SALOME Homard module" name="homard" version="9_4_0" />
-  <product comment="SALOME JobManager module" name="jobmanager" version="9_4_0" />
-  <product comment="SALOME Kernel module" name="kernel" version="9_4_0" />
-  <product comment="SALOME Med module" name="med" version="9_4_0" />
-  <product comment="SALOME ParaVis module" name="paravis" version="9_4_0" />
-  <product comment="SALOME Mesh module" name="smesh" version="9_4_0" />
-  <product comment="SALOME YACS module" name="yacs" version="9_4_0" />
-  <product comment="SALOME MG-CadSurf meshing plugin" name="blsurfplugin" version="9_4_0" />
-  <product comment="SALOME MG-Tetra meshing plugin" name="ghs3dplugin" version="9_4_0" />
-  <product comment="SALOME MG-Tetra_HPC meshing plugin" name="ghs3dprlplugin" version="9_4_0" />
-  <product comment="SALOME MG-Hexa meshing plugin" name="hexoticplugin" version="9_4_0" />
-  <product comment="SALOME HexaBlock meshing plugin" name="hexablockplugin" version="9_4_0" />
-  <product comment="SALOME MG-Hybrid meshing plugin" name="hybridplugin" version="9_4_0" />
-  <product comment="SALOME Netgen meshing plugin" name="netgenplugin" version="9_4_0" />
-  <product comment="SALOME Gmsh meshing plugin" name="gmshplugin" version="9_4_0" />
-  <product comment="SALOME Documentation tool" name="documentation" version="9_4_0" />
-  <product comment="SALOME Hxx2salome tool" name="hxx2salome" version="9_4_0" />
+  <product comment="SALOME Geometry module" name="geom" version="9_5_0" />
+  <product comment="SALOME GUI module" name="gui" version="9_5_0" />
+  <product comment="SALOME HexaBlock module" name="hexablock" version="9_5_0" />
+  <product comment="SALOME Homard module" name="homard" version="9_5_0" />
+  <product comment="SALOME JobManager module" name="jobmanager" version="9_5_0" />
+  <product comment="SALOME Kernel module" name="kernel" version="9_5_0" />
+  <product comment="SALOME Med module" name="med" version="9_5_0" />
+  <product comment="SALOME ParaVis module" name="paravis" version="9_5_0" />
+  <product comment="SALOME Mesh module" name="smesh" version="9_5_0" />
+  <product comment="SALOME YACS module" name="yacs" version="9_5_0" />
+  <product comment="SALOME MG-CadSurf meshing plugin" name="blsurfplugin" version="9_5_0" />
+  <product comment="SALOME MG-Tetra meshing plugin" name="ghs3dplugin" version="9_5_0" />
+  <product comment="SALOME MG-Tetra_HPC meshing plugin" name="ghs3dprlplugin" version="9_5_0" />
+  <product comment="SALOME MG-Hexa meshing plugin" name="hexoticplugin" version="9_5_0" />
+  <product comment="SALOME HexaBlock meshing plugin" name="hexablockplugin" version="9_5_0" />
+  <product comment="SALOME MG-Hybrid meshing plugin" name="hybridplugin" version="9_5_0" />
+  <product comment="SALOME Netgen meshing plugin" name="netgenplugin" version="9_5_0" />
+  <product comment="SALOME Gmsh meshing plugin" name="gmshplugin" version="9_5_0" />
+  <product comment="SALOME Documentation tool" name="documentation" version="9_5_0" />
+  <product comment="SALOME Hxx2salome tool" name="hxx2salome" version="9_5_0" />
   <product comment="libBatch library" name="libbatch" version="V2_4_0" />
-  <product comment="SALOME MedCoupling library" name="medcoupling" version="9_4_0" />
-  <product comment="SALOME Tutorial" name="tutorial" version="9_4_0" />
-  <product comment="SALOME YacsGen tool" name="yacsgen" version="9_4_0" />
-  <product comment="SALOME AtomGen sample module" name="atomgen" version="9_4_0" />
-  <product comment="SALOME Atomic sample module" name="atomic" version="9_4_0" />
-  <product comment="SALOME AtomSolv sample module" name="atomsolv" version="9_4_0" />
-  <product comment="SALOME Calculator sample module" name="calculator" version="9_4_0" />
-  <product comment="SALOME Component sample module" name="component" version="9_4_0" />
-  <product comment="SALOME data files" name="samples" version="9_4_0" />
-  <product comment="SALOME DscCode sample module" name="dsccode" version="9_4_0" />
-  <product comment="SALOME Hello sample module" name="hello" version="9_4_0" />
-  <product comment="SALOME Light sample module" name="light" version="9_4_0" />
-  <product comment="SALOME PyCalculator sample module" name="pycalculator" version="9_4_0" />
-  <product comment="SALOME PyHello sample module" name="pyhello" version="9_4_0" />
-  <product comment="SALOME PyLight sample module" name="pylight" version="9_4_0" />
-  <product comment="SALOME Randomizer sample module" name="randomizer" version="9_4_0" />
-  <product comment="SALOME Sierpinsky sample module" name="sierpinsky" version="9_4_0" />
+  <product comment="SALOME MedCoupling library" name="medcoupling" version="9_5_0" />
+  <product comment="SALOME Tutorial" name="tutorial" version="9_5_0" />
+  <product comment="SALOME YacsGen tool" name="yacsgen" version="9_5_0" />
+  <product comment="SALOME AtomGen sample module" name="atomgen" version="9_5_0" />
+  <product comment="SALOME Atomic sample module" name="atomic" version="9_5_0" />
+  <product comment="SALOME AtomSolv sample module" name="atomsolv" version="9_5_0" />
+  <product comment="SALOME Calculator sample module" name="calculator" version="9_5_0" />
+  <product comment="SALOME Component sample module" name="component" version="9_5_0" />
+  <product comment="SALOME data files" name="samples" version="9_5_0" />
+  <product comment="SALOME DscCode sample module" name="dsccode" version="9_5_0" />
+  <product comment="SALOME Hello sample module" name="hello" version="9_5_0" />
+  <product comment="SALOME Light sample module" name="light" version="9_5_0" />
+  <product comment="SALOME PyCalculator sample module" name="pycalculator" version="9_5_0" />
+  <product comment="SALOME PyHello sample module" name="pyhello" version="9_5_0" />
+  <product comment="SALOME PyLight sample module" name="pylight" version="9_5_0" />
+  <product comment="SALOME Randomizer sample module" name="randomizer" version="9_5_0" />
+  <product comment="SALOME Sierpinsky sample module" name="sierpinsky" version="9_5_0" />
 </config>