From 1eba5afa4dea25817e6d52a91163247fcf9a9240 Mon Sep 17 00:00:00 2001 From: Javier Matos Date: Thu, 6 Mar 2025 17:39:10 -0500 Subject: [PATCH 1/2] -DTHRUST_IGNORE_CUB_VERSION_CHECK=1 --- 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 432d987d2149d9..35cf7f2cbfffe4 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -363,6 +363,7 @@ vcpkg_cmake_configure( -DARM=${TARGET_IS_ARM} ###### use c++17 to enable features that fail with c++11 (halide, protobuf, etc.) -DCMAKE_CXX_STANDARD=17 + -DTHRUST_IGNORE_CUB_VERSION_CHECK=1 ###### ocv_options -DINSTALL_TO_MANGLED_PATHS=OFF -DOpenCV_INSTALL_BINARIES_PREFIX= diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index bf35ffb9f16011..49984c3323d678 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.10.0", - "port-version": 5, + "port-version": 6, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", From d519446e3e2ff15bfd7d13bfbfa01d502b581cd6 Mon Sep 17 00:00:00 2001 From: Javier Matos Date: Thu, 6 Mar 2025 17:39:22 -0500 Subject: [PATCH 2/2] version db --- 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 b7cc09979ca47d..5fe45b2429255d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6734,7 +6734,7 @@ }, "opencv4": { "baseline": "4.10.0", - "port-version": 5 + "port-version": 6 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 273478c29527ba..fcb809c6f5b35e 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6165e42e5c32fb07ea268b451460219d457ca2a5", + "version": "4.10.0", + "port-version": 6 + }, { "git-tree": "176f72c465d0770b93bc5c394d4993de54ad9c71", "version": "4.10.0",