From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 6 Oct 2022 13:29:31 +0000 (+0200)
Subject: merge from master
X-Git-Tag: V9_11_0~254
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=207467198be9c1ba66243c84880b12ee6b3912a6;p=tools%2Fsat_salome.git

merge from master
---

207467198be9c1ba66243c84880b12ee6b3912a6
diff --cc applications/SALOME-master-native.pyconf
index 2556f4f,6352350..5454d9b
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@@ -289,19 -279,20 +289,19 @@@ __overwrite__ 
      }
      {
          __condition__ : "VARS.dist in ['FD36']"
-         'APPLICATION.products.opencv'      : '3.2.0'
 -        'APPLICATION.products.opencv'      : {tag: '3.2.0',   base: 'no', section: 'version_3_2_0_FD36'}
--        'APPLICATION.products.omniORB'     : '4.2.5'
--        'APPLICATION.products.omniORBpy'   : '4.2.5'
--        'APPLICATION.products.qwt'         : '6.1.6'
 -        'APPLICATION.rm_products'          : ['mesa']
--        'APPLICATION.products.nlopt'       : '2.6.0'
 -        'APPLICATION.products.numpy'       : {tag: '1.22.2',    base: 'no', section: 'version_1_22_2'              }
 -        'APPLICATION.products.PyFMI'       : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'             }
--        'APPLICATION.products.netcdf'      : '4.6.2'
 -        'APPLICATION.products.ParaView'    : {tag: '5.9.0',   base: 'no', section: 'version_5_9_0_FD36', hpc: 'yes'}
 -        'APPLICATION.products.root'        : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36'}
 -        'APPLICATION.products.medfile'     : {tag: '4.1.1',   base: 'no', section: 'version_4_1_1_FD36'}
 -        'APPLICATION.products.MEDCOUPLING' : {tag:'master',   base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes'}
 -        'APPLICATION.products.HEXABLOCK'   : {tag:'master',   base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'}
 -        'APPLICATION.products.SHAPER'      : {tag:'master',   base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'}
++        'APPLICATION.products.opencv'           : {tag: '3.2.0',   base: 'no', section: 'version_3_2_0_FD36'}
++        'APPLICATION.products.omniORB'          : '4.2.5'
++        'APPLICATION.products.omniORBpy'        : '4.2.5'
++        'APPLICATION.products.qwt'              : '6.1.6'
++        'APPLICATION.products.nlopt'            : '2.6.0'
++        'APPLICATION.products.netcdf'           : '4.6.2'
 +        'APPLICATION.products.numpy'            : {tag: '1.22.2',    base: 'no', section: 'version_1_22_2'                      }
 +        'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_no_pip'                  }
 +        'APPLICATION.products.root'             : {tag: '6.22.02',   base: 'no', section: 'version_6_22_02_FD36'                }
 +        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD36'                  }
 +        'APPLICATION.products.MEDCOUPLING'      : {tag:'master',     base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes' }
 +        'APPLICATION.products.HEXABLOCK'        : {tag:'master',     base: 'no', section: 'version_V9_9_0_FD36',     hpc: 'no'  }
 +        'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'version_V9_9_0_FD36',     hpc: 'no'  }
 +        'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0',     base: 'no', section: 'version_5_11_0_FD36'                 }
      }
  ]
diff --cc products/opencv.pyconf
index d16b64a,623c520..72114e1
--- a/products/opencv.pyconf
+++ b/products/opencv.pyconf
@@@ -38,9 -38,14 +38,14 @@@ default_win
  
  version_3_2_0 :
  {
 -    patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch"]
 +    patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "opencv-3.2.0-python2-cmake.patch"]
  }
  
+ version_3_2_0_FD36 :
+ {
+     patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"]
+ }
+ 
  version_3_2_0_win :
  {
      patches : ["opencv-3.2.0-ccache.patch","opencv-3.2.0_windows.patch"]