From 03283b2c745e0579c40ff74ab74fdacf5a6b5a68 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Fri, 28 Jan 2022 09:20:33 -0800 Subject: [PATCH 1/2] [opencv4] Disable cpufeatures since it conflict with libwebp --- ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index c616a3990b03f4..500038ff06dec4 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 5f97c6cf53e9d6..763c219e8d61e6 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": [ From 7b7f9426cb4e11aac90099a627a91a0e24822462 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Fri, 28 Jan 2022 09:21:02 -0800 Subject: [PATCH 2/2] version --- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e4bb31ddb1cc1b..2efc65ab315ad3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4994,7 +4994,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 2bde4f038f4c55..2add172495b63a 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",