-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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.
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
[OpenCV] upgrade to v4.5.5 #22801
[OpenCV] upgrade to v4.5.5 #22801
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json
or CONTROL
must be modified.
Error: Local changes detected for gstreamer but no changes to version or port version.
-- Version: 1.19.2#3
-- Old SHA: 25482001e85b34b144a67fc9cc86127f9e8c89ea
-- New SHA: 84d5be664880df35aec35ccec3120f80fdef5f01
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
You have modified or added at least one portfile where deprecated functions are used.
If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake
-> vcpkg_cmake_install
(from port vcpkg-cmake
)
vcpkg_build_cmake
-> vcpkg_cmake_build
(from port vcpkg-cmake
)
vcpkg_configure_cmake
-> vcpkg_cmake_configure
(Please remove the option PREFER_NINJA
) (from port vcpkg-cmake
)
vcpkg_fixup_cmake_targets
-> vcpkg_cmake_config_fixup
(from port vcpkg-cmake-config
)
In the ports that use the new function, you have to add the corresponding dependencies:
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
The following files are affected:
ports/ogre/portfile.cmake
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/ogre/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 2e34a79a814551424d9b1a981b3b110e0a8fbdfd -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json
index 105a59a..79c750a 100644
--- a/versions/g-/gstreamer.json
+++ b/versions/g-/gstreamer.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "84d5be664880df35aec35ccec3120f80fdef5f01",
+ "git-tree": "9b1d16e135fe46d97a04615e5744775332d5fb16",
"version": "1.19.2",
"port-version": 4
},
You have modified or added at least one portfile where deprecated functions are used.
If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake
-> vcpkg_cmake_install
(from port vcpkg-cmake
)
vcpkg_build_cmake
-> vcpkg_cmake_build
(from port vcpkg-cmake
)
vcpkg_configure_cmake
-> vcpkg_cmake_configure
(Please remove the option PREFER_NINJA
) (from port vcpkg-cmake
)
vcpkg_fixup_cmake_targets
-> vcpkg_cmake_config_fixup
(from port vcpkg-cmake-config
)
In the ports that use the new function, you have to add the corresponding dependencies:
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
The following files are affected:
ports/ogre/portfile.cmake
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/ogre/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
Thanks for your update. There are error on CI: opencv4x64-windows
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 2e34a79a814551424d9b1a981b3b110e0a8fbdfd -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json
index 3439d66..60ab498 100644
--- a/versions/o-/opencv.json
+++ b/versions/o-/opencv.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "92e09f516acb17424caf1e2cec828dcbbb73188b",
+ "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763",
"version": "4.5.5",
"port-version": 0
},
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index 9a8fe01..9edc050 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "b41bc36985f072c2391e549dcbf4e22ab23aa0de",
+ "git-tree": "439290ac831de48b29d8465bdd94ca4704e5e941",
"version": "4.5.5",
"port-version": 0
},
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 6ce8ef3337706a2b7e6cc9581dc8df62fd9ca751 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json
index 5539080..dc6a492 100644
--- a/versions/f-/ffnvcodec.json
+++ b/versions/f-/ffnvcodec.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "020b299b2ef4a4000021b802a442e0d8b700a4ef",
+ "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816",
"version": "11.1.5.0",
"port-version": 1
},
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cuda/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/ffnvcodec/vcpkg.json
ports/harfbuzz/vcpkg.json
ports/leptonica/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cuda/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/ffnvcodec/vcpkg.json
ports/harfbuzz/vcpkg.json
ports/leptonica/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cuda/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/ffnvcodec/vcpkg.json
ports/harfbuzz/vcpkg.json
ports/leptonica/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/detect_compiler/vcpkg.json
scripts/test_ports/llfio-run-tests/vcpkg.json
scripts/test_ports/outcome-run-tests/vcpkg.json
scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json
scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
Valid values for the license field can be found in the documentation
@JackBoosY @BillyONeal is there anyone for an /azp run? asking for a friend... |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cuda/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/ffnvcodec/vcpkg.json
ports/harfbuzz/vcpkg.json
ports/leptonica/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/detect_compiler/vcpkg.json
scripts/test_ports/llfio-run-tests/vcpkg.json
scripts/test_ports/outcome-run-tests/vcpkg.json
scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json
scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
Valid values for the license field can be found in the documentation
arm64ec is not hooked up to anything right now. The separate work that happened in the tool repo to stop blocking arm64ec was in order to let other folks work on that should they wish. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json
or CONTROL
must be modified.
Error: Local changes detected for gstreamer but no changes to version or port version.
-- Version: 1.19.2#4
-- Old SHA: 78cacf62a38c4cfc4e399720463bef9312f115dc
-- New SHA: 0954a9b338120993959f5baa182dfaee49632b40
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cuda/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/ffnvcodec/vcpkg.json
ports/harfbuzz/vcpkg.json
ports/leptonica/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/detect_compiler/vcpkg.json
scripts/test_ports/llfio-run-tests/vcpkg.json
scripts/test_ports/outcome-run-tests/vcpkg.json
scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json
scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
All manifest files must be formatted
./vcpkg format-manifest ports/*/vcpkg.json
Diff
diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
index eb10b5e..ab6239a 100644
--- a/ports/poppler/vcpkg.json
+++ b/ports/poppler/vcpkg.json
@@ -62,7 +62,7 @@
},
"fontconfig": {
"description": "Use fontconfig",
- "supports": "!windows , mingw",
+ "supports": "!windows, mingw",
"dependencies": [
"fontconfig"
]
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout daa7215f3d68c2a2f2e18c398cb73dab63cda829 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json
index b2d19a5..9079a15 100644
--- a/versions/p-/poppler.json
+++ b/versions/p-/poppler.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "ee89fa7f191d0a583888165757cd8aa4a9cbaa99",
+ "git-tree": "4add30f08c87a09d131c8fdaecee6e28a50888ba",
"version": "22.2.0",
"port-version": 1
},
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cuda/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/ffnvcodec/vcpkg.json
ports/harfbuzz/vcpkg.json
ports/leptonica/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/detect_compiler/vcpkg.json
scripts/test_ports/llfio-run-tests/vcpkg.json
scripts/test_ports/outcome-run-tests/vcpkg.json
scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json
scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
Valid values for the license field can be found in the documentation
f8182e6
to
a25c71e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/cuda/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/ffnvcodec/vcpkg.json
ports/harfbuzz/vcpkg.json
ports/leptonica/vcpkg.json
ports/opencv/vcpkg.json
ports/vcpkg-tool-meson/vcpkg.json
scripts/detect_compiler/vcpkg.json
scripts/test_ports/llfio-run-tests/vcpkg.json
scripts/test_ports/outcome-run-tests/vcpkg.json
scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json
scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
Valid values for the license field can be found in the documentation
merged with master due to gstreamer PR conflict |
Thank you <3 |
* master: (57 commits) [vcpkg-tools] update cmake and git (windows only) (microsoft#22985) Update vcpkg tool to 2022-02-24. (microsoft#23162) [vcpkg baseline] Move cspice headers (microsoft#23272) Fixed inaccurate Chinese words (microsoft#23179) [vcpkg] Add fixed changelog generator. (microsoft#23255) [authentication.md] Add Jenkins section (microsoft#23226) [vcpkg] Meson osx sysroot (microsoft#21772) [pkgconf] enable search for system libs on linux (microsoft#23010) [yasm/yasm-tool] Incorporate yasm-tool into yasm (microsoft#23218) [lapack-reference] Update to 3.10 (microsoft#23228) [skia] Arm64 for skia on osx (microsoft#23222) [libfido2] Update to 1.10.0 (microsoft#23241) [Tracy] Fixing issue where version 0.7.8 was pulling the wrong version (microsoft#23061) [libgpiod] Add new port. (microsoft#23221) [drogon] Update to 1.7.5 (microsoft#23227) [tinyexif] Remove from fail list. (microsoft#23163) [vcpkg docs][ES] Sync with English readme (microsoft#19834) (microsoft#22618) [vcpkg baseline][libao] Disable dlfcn check under windows (microsoft#23235) [OpenCV] upgrade to v4.5.5 (microsoft#22801) [libcurl-simple-https] New port (microsoft#22917) ...
Describe the pull request
Upgrade OpenCV to v4.5.5, and fix some dependencies which were broken in the meantime
Which triplets are supported/not supported? Have you updated the CI baseline?
all
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --all
and committed the result?Yes