From: Quentin Cozette Date: Mon, 15 Mar 2021 18:03:10 +0000 (+0100) Subject: Temporarily patch GEOM on CO6 to compliant with old OpenCV 2.X version X-Git-Tag: V9_7_0~84 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5fb67fe490febf5cc695992574feb309e7bcee4b;p=tools%2Fsat_salome.git Temporarily patch GEOM on CO6 to compliant with old OpenCV 2.X version --- diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index b2bb7ff..066063c 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -179,6 +179,8 @@ __overwrite__ : # GTK compilation issue __condition__ : "VARS.dist in ['CO6']" 'APPLICATION.products.opencv' : '2.4.13.5' + # Since OpenCV 4.X support, we need additional includes for old 2.X versions + 'PRODUCTS.GEOM.default.patches' : ['opencv_backward_compatibility.patch'] 'APPLICATION.products.tbb' : '4.4' 'APPLICATION.products.llvm' : '3.9.1-clang' 'APPLICATION.products.mesa' : '13.0.6' diff --git a/products/patches/opencv_backward_compatibility.patch b/products/patches/opencv_backward_compatibility.patch new file mode 100644 index 0000000..870cf04 --- /dev/null +++ b/products/patches/opencv_backward_compatibility.patch @@ -0,0 +1,13 @@ +diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx +index f068387..8c45dac 100644 +--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx ++++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx +@@ -35,6 +35,8 @@ + #else + #include + #include ++ #include ++ #include + #endif + + // Qt