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 e8fbbd99bc2621665f347e564574b9726ee959ce..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'
@@ -113,7 +114,7 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_4'}
-        'KERNEL'
+        'KERNEL' : {tag : 'occ/psutil'}
         'MEDCOUPLING'
         'GUI'
         'GEOM'