[opencv4] Fix CUDA 13.2.#51434
Conversation
This mostly uses upstream's patches were possible. Also fixes vcpkg-ci-opencv in microsoft#51210
There was a problem hiding this comment.
Pull request overview
Updates the opencv4 vcpkg port to restore/build compatibility with CUDA 13.2 (and related CI images), primarily by pulling in upstream fixes and bumping the port-version.
Changes:
- Bump
opencv4port-version from 1 → 2 and update the baseline/versions entries accordingly. - Apply upstream OpenCV CUDA 13 support patch and add an MSVC CUDA compilation workaround patch.
- Add OpenCV contrib CUDA-related fix patches (downloaded from upstream commits) and refresh several existing patch files to match the updated upstream sources.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| versions/o-/opencv4.json | Adds a new 4.12.0 port-version: 2 entry pointing at the updated port tree. |
| versions/baseline.json | Updates the baseline opencv4 port-version to 2. |
| ports/opencv4/vcpkg.json | Bumps port-version to 2. |
| ports/opencv4/portfile.cmake | Downloads/applies CUDA 13.2-related upstream diffs and wires in the new patch. |
| ports/opencv4/0024-cuda-msvc-preprocessor.patch | Adds /Zc:preprocessor for MSVC CUDA compilation. |
| ports/opencv4/0022-android-use-vcpkg-cpu-features.patch | Refreshes patch metadata/offsets for the current upstream revision. |
| ports/opencv4/0007-contrib-fix-hdf5.patch | Refreshes patch metadata/offsets and adjusts HDF5 handling in contrib. |
| ports/opencv4/0003-force-package-requirements.patch | Refreshes patch metadata/offsets for updated upstream sources. |
| ports/opencv4/0002-install-options.patch | Refreshes patch metadata/offsets; adjusts several OpenCV install/config behaviors. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 10 out of 10 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
I need to redo this to integrate #51143 |
# Conflicts: # ports/opencv4/portfile.cmake # versions/o-/opencv4.json
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This mostly uses upstream's patches were possible.
Also fixes vcpkg-ci-opencv in #51210