From 4ce0ee7f822496b3deafae8d0da89f581cfe9d22 Mon Sep 17 00:00:00 2001 From: Davide Pianca Date: Mon, 16 Dec 2024 14:33:46 +0100 Subject: [PATCH 1/2] [opencv4] Add carotene feature flag --- ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 47fb0735771c34..8ac59576bbdfb1 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -53,6 +53,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "ade" WITH_ADE "calib3d" BUILD_opencv_calib3d + "carotene" WITH_CAROTENE "contrib" WITH_CONTRIB "cuda" WITH_CUBLAS "cuda" WITH_CUDA diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 9292a8baf91d96..56c8d886856d76 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.10.0", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -33,6 +33,9 @@ "calib3d": { "description": "calib3d module" }, + "carotene": { + "description": "carotene module" + }, "contrib": { "description": "opencv_contrib module", "dependencies": [ From 6c4488995561fb58ff35fcf35a829081eba544c5 Mon Sep 17 00:00:00 2001 From: Davide Pianca Date: Mon, 16 Dec 2024 14:34:40 +0100 Subject: [PATCH 2/2] [opencv4] Update version port version to 2 --- 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 19ce2dcc87562e..1fd4957fcad448 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6674,7 +6674,7 @@ }, "opencv4": { "baseline": "4.10.0", - "port-version": 1 + "port-version": 2 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index d6516a8280fa26..8535411cf221e1 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c493a7ea4c35003983be050429d12e2a51ee8fed", + "version": "4.10.0", + "port-version": 2 + }, { "git-tree": "6ba67264448ce7a60b8e109db62270331e657e38", "version": "4.10.0",