[opencv3/4] add missing include (microsoft#33226)

mstorsjo · Aug 18, 2023 · 57d42f6 · 57d42f6
1 parent 607e797
commit 57d42f6
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 4 deletions.
diff --git a/ports/opencv3/0019-missing-include.patch b/ports/opencv3/0019-missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/dnn/src/op_halide.cpp b/modules/dnn/src/op_halide.cpp
+index c96971bc6aac..d107e01887d0 100644
+--- a/modules/dnn/src/op_halide.cpp
++++ b/modules/dnn/src/op_halide.cpp
+@@ -11,6 +11,7 @@
+
+ #ifdef HAVE_HALIDE
+ #include <HalideRuntimeOpenCL.h>
++#include <thread>
+ #endif  // HAVE_HALIDE
+
+ namespace cv
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
@@ -22,6 +22,7 @@ vcpkg_from_github(
       0010-fix-uwp-tiff-imgcodecs.patch
       0011-remove-python2.patch
       0012-fix-zlib.patch
+      0019-missing-include.patch
       fix-tbb-error.patch
 )
 # Disallow accidental build of vendored copies

diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 10,
+  "port-version": 11,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",

diff --git a/ports/opencv4/0019-missing-include.patch b/ports/opencv4/0019-missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/dnn/src/op_halide.cpp b/modules/dnn/src/op_halide.cpp
+index 653de36146cc..db1a72278e70 100644
+--- a/modules/dnn/src/op_halide.cpp
++++ b/modules/dnn/src/op_halide.cpp
+@@ -14,6 +14,7 @@
+ #include "halide_scheduler.hpp"
+
+ #include <HalideRuntimeOpenCL.h>
++#include <thread>
+ #endif  // HAVE_HALIDE
+
+ namespace cv {
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
@@ -27,6 +27,7 @@ vcpkg_from_github(
       0012-fix-zlib.patch
       0015-fix-freetype.patch
       0017-fix-flatbuffers.patch
+      0019-missing-include.patch
       "${ARM64_WINDOWS_FIX}"
 )
 # Disallow accidental build of vendored copies

diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.8.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6010,11 +6010,11 @@
     },
     "opencv3": {
       "baseline": "3.4.18",
-      "port-version": 10
+      "port-version": 11
     },
     "opencv4": {
       "baseline": "4.8.0",
-      "port-version": 2
+      "port-version": 3
     },
     "opendnp3": {
       "baseline": "3.1.1",

diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8eca838beb277535a53756ceb5da17aa8b5050a8",
+      "version": "3.4.18",
+      "port-version": 11
+    },
     {
       "git-tree": "b66d5bf3d61ae3bd5e71952b7642658d8562ae5d",
       "version": "3.4.18",

diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d22421d8b63a7e2221f91520e9dcfcce1ca7bb48",
+      "version": "4.8.0",
+      "port-version": 3
+    },
     {
       "git-tree": "89d6da3b45b7e1667bdc3083f9641e57ad4930a9",
       "version": "4.8.0",