From de88cc55c4acd0cdd955e5bd4c412e1b9250f29e Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Wed, 10 Nov 2021 10:55:52 -0800
Subject: [PATCH] [opencv2] Fix build failure when vcpkg folder path include ++
 (#21249)

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
---
 .../opencv2/fix-path-contains-++-error.patch  | 49 +++++++++++++++++++
 ports/opencv2/portfile.cmake                  |  1 +
 ports/opencv2/vcpkg.json                      |  2 +-
 versions/baseline.json                        |  2 +-
 versions/o-/opencv2.json                      |  5 ++
 5 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 ports/opencv2/fix-path-contains-++-error.patch

diff --git a/ports/opencv2/fix-path-contains-++-error.patch b/ports/opencv2/fix-path-contains-++-error.patch
new file mode 100644
index 0000000000..bb2a2a7fe6
--- /dev/null
+++ b/ports/opencv2/fix-path-contains-++-error.patch
@@ -0,0 +1,49 @@
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 72df4d4..7d45974 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -82,12 +82,42 @@ macro(ocv_check_environment_variables)
+   endforeach()
+ endmacro()
+ 
++# check if "sub" (file or dir) is below "dir"
++function(is_subdir res dir sub )
++  get_filename_component(dir "${dir}" ABSOLUTE)
++  get_filename_component(sub "${sub}" ABSOLUTE)
++  file(TO_CMAKE_PATH "${dir}" dir)
++  file(TO_CMAKE_PATH "${sub}" sub)
++  set(dir "${dir}/")
++  string(LENGTH "${dir}" len)
++  string(LENGTH "${sub}" len_sub)
++  if(NOT len GREATER len_sub)
++    string(SUBSTRING "${sub}" 0 ${len} prefix)
++  endif()
++  if(prefix AND prefix STREQUAL dir)
++    set(${res} TRUE PARENT_SCOPE)
++  else()
++    set(${res} FALSE PARENT_SCOPE)
++  endif()
++endfunction()
++
++function(ocv_is_opencv_directory result_var dir)
++  set(result FALSE)
++  foreach(parent ${OpenCV_SOURCE_DIR} ${OpenCV_BINARY_DIR} ${OPENCV_EXTRA_MODULES_PATH})
++    is_subdir(result "${parent}" "${dir}")
++    if(result)
++      break()
++    endif()
++  endforeach()
++  set(${result_var} ${result} PARENT_SCOPE)
++endfunction()
++
+ # adds include directories in such a way that directories from the OpenCV source tree go first
+ function(ocv_include_directories)
+   set(__add_before "")
+   foreach(dir ${ARGN})
+-    get_filename_component(__abs_dir "${dir}" ABSOLUTE)
+-    if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
++    ocv_is_opencv_directory(__is_opencv_dir "${dir}")
++    if(__is_opencv_dir)
+       list(APPEND __add_before "${dir}")
+     elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND
+            dir MATCHES "/usr/include$")
diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake
index bc6805f48a..cbd4c319fb 100644
--- a/ports/opencv2/portfile.cmake
+++ b/ports/opencv2/portfile.cmake
@@ -26,6 +26,7 @@ vcpkg_from_github(
       0003-force-package-requirements.patch
       0004-add-ffmpeg-missing-defines.patch
       0005-fix-cuda.patch
+      fix-path-contains-++-error.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json
index db74a35649..f12dc20029 100644
--- a/ports/opencv2/vcpkg.json
+++ b/ports/opencv2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv2",
   "version": "2.4.13.7",
-  "port-version": 6,
+  "port-version": 7,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index a2a77e9f06..b5f34e4d13 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4890,7 +4890,7 @@
     },
     "opencv2": {
       "baseline": "2.4.13.7",
-      "port-version": 6
+      "port-version": 7
     },
     "opencv3": {
       "baseline": "3.4.15",
diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json
index d983d361d9..4edfbc549a 100644
--- a/versions/o-/opencv2.json
+++ b/versions/o-/opencv2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d6ccb4fb79829bcf58dd79950529d7086d6b277c",
+      "version": "2.4.13.7",
+      "port-version": 7
+    },
     {
       "git-tree": "e85a45aa17a47da9f965b93cb0c6fc8273a7ca04",
       "version": "2.4.13.7",