Remove the GEOM patch related to opencv on CO6 - finally fixed in its sources

[tools/sat_salome.git] / applications / SALOME-master.pyconf

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index c1d24c8767c6353408482b52211d2322ca92a5b7..b2bb7ff435411da21bd14f5769133f8fbda5132e 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -71,13 +71,14 @@ APPLICATION :
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openssl : "native"
-        ospray : '1.8.4'
         #openturns: '1.16'
+        ospray : '1.8.4'
         packaging : '17.1'
         ParaView : '5.8.0'
         petsc : '3.14.0'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
@@ -88,7 +89,7 @@ APPLICATION :
         qt : '5.9.1'
         qwt : '6.1.2'
         requests : '2.19.1'
-        #root: '6.22.02'
+        root: '6.22.02'
         scipy : '0.19.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -99,6 +100,7 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.0'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
+        StaticMeshPlugin : '5.8.0'
         swig : '3.0.12'
         tbb : 'native'
         tcl : '8.6.0'
@@ -108,15 +110,15 @@ APPLICATION :
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
-        'SHAPER' : {tag : 'agy/archi5_00'}
+        'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_4'}
-        'KERNEL' : {tag : 'agy/archi5_integ'}
+        'KERNEL' : {tag : 'occ/psutil'}
         'MEDCOUPLING'
-        'GUI' : {tag : 'agy/archi5_integ'}
-        'GEOM' : {tag : 'agy/archi5_integ'}
-        'SMESH' : {tag : 'agy/archi5_integ'}
+        'GUI'
+        'GEOM'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -124,9 +126,9 @@ APPLICATION :
         'HYBRIDPLUGIN'
         'HexoticPLUGIN'
         'GMSHPLUGIN'
-        'HEXABLOCK' : {tag : 'agy/archi5_integ'}
+        'HEXABLOCK'
         'HEXABLOCKPLUGIN'
-        'HOMARD' : {tag : 'agy/archi5_integ'}
+        'HOMARD'
         'FIELDS'
         'PARAVIS'
         'JOBMANAGER'
@@ -220,7 +222,7 @@ __overwrite__ :
 
   {
     __condition__ : "VARS.dist in ['CO7']"
-    'APPLICATION.products.tbb' : '4.4'
+    'APPLICATION.products.tbb' : '2019_U8'
   }
 
   {
@@ -239,7 +241,7 @@ __overwrite__ :
 
   {
     __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
-    'APPLICATION.products.tbb' : '4.4'
+    'APPLICATION.products.tbb' : '2019_U8'
   }
 
   {