merge from master

[tools/sat_salome.git] / products / ParaView.pyconf

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 8baf85b6285d0d48a34576244b2ad7d6f37e12de..dcb69ebfdeac2f2e66d012ac6bc3500518554af1 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -35,20 +35,7 @@ version_5_11_0 :
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf']
     compil_script :  'ParaView-5.11.0.sh'
     archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
-    # two other LATA patches already included in archive
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview-5.9.0-gcc.11.0.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch'
-              ]
+    patches : []
 }
 
 version_5_11_0_int32 :
@@ -56,18 +43,7 @@ version_5_11_0_int32 :
     compil_script :  'ParaView-5.11.0.sh'
     archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
     # two other LATA patches already included in archive
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch'
-              ]
+    patches : []
 }
 
 version_5_11_0_win :
@@ -87,19 +63,8 @@ version_5_11_0_win :
               'zlib'
              ]
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib']
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0009-ParaView_find_zlib.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.1001-ParaView_windows_catalyst_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch'
+    patches : ['paraview-5.11.0.p001-FindCGNS.patch',
+               'paraview-5.11.0.p002-FindMPI.patch'
               ]
 }
 
@@ -120,20 +85,8 @@ version_5_11_0_win_dbg :
               'zlib'
              ]
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib']
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0009-ParaView_find_zlib.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.1001-ParaView_windows_catalyst_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview-5.9.0-vs-debug.patch'
+    patches : ['paraview-5.11.0.p001-FindCGNS.patch',
+               'paraview-5.11.0.p002-FindMPI.patch'
               ]
 }
 
@@ -164,145 +117,36 @@ version_5_11_0_MPI_LATA_64BITS_IDS :
 {
     compil_script :  'ParaView-5.11.0.sh'
     archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview-5.9-VTKM_MPI.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview-5.9.0-gcc.11.0.patch',
-               'paraview.0017-VTK-openMPI-if-devtoolset.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch',
-               'paraview.0020.findMPI.patch',
-               'paraview.0021-FindGDAL.patch',
+    patches : ['paraview-5.11.0.p001-FindCGNS.patch',
+               'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-0012-LATA_64BITS_IDS.patch'
               ]
 }
 
-version_5_10_0 :
+version_5_11_0_MPI_DB10 :
 {
-    compil_script :  'ParaView-5.10.0.sh'
-    archive_info : {archive_name : "ParaView-5.10.0-lata.tar.gz"}
-    # two other LATA patches already included in archive
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch'
-              ]
-}
-
-version_5_10_0_win :
-{
-    compil_script :  'ParaView-5.10.0.bat'
-    archive_info : {archive_name : "ParaView-5.10.0-lata.tar.gz"}
-    depend : [
-              'Python',
-              'hdf5',
-              'qt',
-              'boost',
-              'libxml2',
-              'freetype',
-              'cgns',
-              'Pygments',
-              'pthreads',
-              'zlib'
-             ]
-   opt_depend: ['matplotlib']
-   patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0009-ParaView_find_zlib.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch'
-              ]
-}
-
-version_5_10_0_MPI :
-{
-    compil_script :  'ParaView-5.10.0.sh'
-    archive_info : {archive_name : "ParaView-5.10.0-lata.tar.gz"}
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview-5.9-VTKM_MPI.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0017-VTK-openMPI-if-devtoolset.patch'
-              ]
-}
-
-version_5_9_1 :
-{
-    compil_script :  'ParaView-5.9.1.sh'
-    archive_info : {archive_name : "ParaView-5.9.1-lata.tar.gz"}
-    # two other LATA patches already included in archive
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch'
-              ]
-}
-
-version_5_9_1_win :
-{
-    compil_script :  'ParaView-5.9.1.bat'
-    archive_info : {archive_name : "ParaView-5.9.1-lata.tar.gz"}
+    compil_script :  'ParaView-5.11.0.sh'
+    archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
+    patches : ['paraview-5.11.0.p001-FindCGNS.patch',
+               'paraview-5.11.0.p002-FindMPI.patch',
+               'paraview-5.11.0.p003-ParaViewClient.patch'
+                ]
     depend : [
               'Python',
               'hdf5',
               'qt',
+              'PyQt',
+              'sip',
               'boost',
               'libxml2',
               'freetype',
+              'matplotlib',
               'cgns',
-              'Pygments',
-              'pthreads',
-              'zlib'
-             ]
-    opt_depend: ['matplotlib'] # in debug mode, do not build this product
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0009-ParaView_find_zlib.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.1001-ParaView_windows_catalyst_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch'
-              ]
-}
-
-version_5_9_1_MPI :
-{
-    compil_script :  'ParaView-5.9.1.sh'
-    archive_info : {archive_name : "ParaView-5.9.1-lata.tar.gz"}
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0005-ParaView_find_cgns.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview-5.9-VTKM_MPI.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview.0017-VTK-openMPI-if-devtoolset.patch'
+              'Pygments'
               ]
+    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
 }
 
-
 version_5_9_0 :
 {
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf']