[opencv3] fix webp include dir (#31054)

microsoft · Apr 25, 2023 · 846790c · 846790c
1 parent 580f143
commit 846790c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch
@@ -72,3 +72,16 @@
    if(NOT GDCM_FOUND)
      set(HAVE_GDCM NO)
      ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
+diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
+index 213667a..4052387 100644
+--- a/modules/imgcodecs/CMakeLists.txt
++++ b/modules/imgcodecs/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+
+ if(HAVE_WEBP)
+   add_definitions(-DHAVE_WEBP)
+-  ocv_include_directories(${WEBP_INCLUDE_DIR})
++  ocv_include_directories(${WEBP_INCLUDE_DIRS})
+   list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES})
+ endif()
+
diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 8,
+  "port-version": 9,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",
@@ -229,6 +229,13 @@
     "python": {
       "description": "Python wrapper support for opencv",
       "dependencies": [
+        {
+          "name": "opencv3",
+          "default-features": false,
+          "features": [
+            "flann"
+          ]
+        },
         "python3"
       ]
     },

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5802,7 +5802,7 @@
     },
     "opencv3": {
       "baseline": "3.4.18",
-      "port-version": 8
+      "port-version": 9
     },
     "opencv4": {
       "baseline": "4.7.0",

diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "402e9aac0f32db08e2d69f70ba6384f8c7bf4733",
+      "version": "3.4.18",
+      "port-version": 9
+    },
     {
       "git-tree": "e026bd638aec52f279cbf10d7e75a0f6ca03feb6",
       "version": "3.4.18",