[opencv4] fix webp include dir (microsoft#31045)

SokaDance · Apr 24, 2023 · 7dc921f · 7dc921f
1 parent b9ef89b
commit 7dc921f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch
@@ -81,3 +81,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/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.7.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5806,7 +5806,7 @@
     },
     "opencv4": {
       "baseline": "4.7.0",
-      "port-version": 5
+      "port-version": 6
     },
     "opendnp3": {
       "baseline": "3.1.1",

diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d435a87c7a3f4dd38d623503d5200abe65c249d1",
+      "version": "4.7.0",
+      "port-version": 6
+    },
     {
       "git-tree": "0c3c175e672cc3a6f0d1465adba8a40a042ff717",
       "version": "4.7.0",