Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[opencv4] Add include <chrono> for system_clock #42637

Merged
merged 1 commit into from
Jan 8, 2025
Merged

[opencv4] Add include <chrono> for system_clock #42637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ports/opencv4/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
set(USE_QT_VERSION "6")

vcpkg_download_distfile(PATCH_ADD_INCLUDE_CHRONO
URLS https://github.com/opencv/opencv/commit/96d6395a6dccb9554bc2f83105f87ebd071d37fa.patch?full_index=1
SHA512 d385b5386a19e4a0b3e78d5423baac4d132d25581d9336f084db819b9f68a6bc1ac23968a901891ac5023ab2fe4fa4513d7c70e5170e72cb57710d51b50e67a1
FILENAME opencv4-4.11.0-include-chrono.patch
)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO opencv/opencv
Expand All @@ -23,6 +29,7 @@ vcpkg_from_github(
0017-fix-flatbuffers.patch
0019-opencl-kernel.patch
0020-miss-openexr.patch
"${PATCH_ADD_INCLUDE_CHRONO}"
)
# Disallow accidental build of vendored copies
file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
Expand Down
2 changes: 1 addition & 1 deletion ports/opencv4/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.10.0",
"port-version": 2,
"port-version": 3,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6682,7 +6682,7 @@
},
"opencv4": {
"baseline": "4.10.0",
"port-version": 2
"port-version": 3
},
"opendnp3": {
"baseline": "3.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b252c88917d365d1df72e1eba286537f11b0350b",
"version": "4.10.0",
"port-version": 3
},
{
"git-tree": "c493a7ea4c35003983be050429d12e2a51ee8fed",
"version": "4.10.0",
Expand Down