From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 6 Oct 2022 11:44:35 +0000 (+0200)
Subject: fd36: patch opencv
X-Git-Tag: V9_11_0~254^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=10891e2bef1bfbf73b793df9f92890e585bccb86;p=tools%2Fsat_salome.git

fd36: patch opencv
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 1bddfd7..1ae1feb 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -279,18 +279,18 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['FD36']"
-        'APPLICATION.products.opencv'    : '3.2.0'
-        '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.opencv'      : {tag: '3.2.0',   base: 'no', section: 'version_1_22_2'}
+        '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'}
diff --git a/products/opencv.pyconf b/products/opencv.pyconf
index bb4105e..623c520 100644
--- a/products/opencv.pyconf
+++ b/products/opencv.pyconf
@@ -41,6 +41,11 @@ version_3_2_0 :
     patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.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"]
diff --git a/products/patches/SPNS-29988-opencv-3.2.0-cv2.patch b/products/patches/SPNS-29988-opencv-3.2.0-cv2.patch
new file mode 100644
index 0000000..d056d15
--- /dev/null
+++ b/products/patches/SPNS-29988-opencv-3.2.0-cv2.patch
@@ -0,0 +1,11 @@
+--- opencv-3.2.0_ref/modules/python/src2/cv2.cpp	2019-07-16 15:47:25.000000000 +0200
++++ opencv-3.2.0_dev/modules/python/src2/cv2.cpp	2022-10-06 13:36:55.911273115 +0200
+@@ -727,7 +727,7 @@
+     (void)name;
+     if(!obj || obj == Py_None)
+         return true;
+-    char* str = PyString_AsString(obj);
++    const char* str = PyString_AsString(obj);
+     if(!str)
+         return false;
+     value = String(str);