From ce7ee5ac3caaa242e9c20ce929b98fe127667842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sat, 5 Feb 2022 07:40:49 +0800
Subject: [PATCH] [opencv4] Disable building cpufeatures since it conflict with
 libwebp (#22844)

* [opencv4] Disable cpufeatures since it conflict with libwebp

* version
---
 ports/opencv4/portfile.cmake | 1 +
 ports/opencv4/vcpkg.json     | 2 +-
 versions/baseline.json       | 2 +-
 versions/o-/opencv4.json     | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
index c616a3990b..500038ff06 100644
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@@ -469,6 +469,7 @@ vcpkg_cmake_configure(
         -DWITH_OPENCLAMDBLAS=OFF
         -DWITH_TBB=${WITH_TBB}
         -DWITH_OPENJPEG=OFF
+        -DWITH_CPUFEATURES=OFF
         ###### BUILD_options (mainly modules which require additional libraries)
         -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
         -DBUILD_opencv_dnn=${BUILD_opencv_dnn}
diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
index 5f97c6cf53..763c219e8d 100644
--- a/ports/opencv4/vcpkg.json
+++ b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.5.4",
-  "port-version": 2,
+  "port-version": 3,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 682a700147..3d0a3509ec 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5006,7 +5006,7 @@
     },
     "opencv4": {
       "baseline": "4.5.4",
-      "port-version": 2
+      "port-version": 3
     },
     "opendnp3": {
       "baseline": "3.1.1",
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index 2bde4f038f..2add172495 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b170a087d34521462cd247a24f230627a272975e",
+      "version": "4.5.4",
+      "port-version": 3
+    },
     {
       "git-tree": "537abba5a070d173cf42510f86ff4ffe057dd77f",
       "version": "4.5.4",