[OpenCV] update to v4.5.3 and to v3.4.15 #18827
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NancyLi1013
added
the
category:port-update
|
All these failures are related with |
|
it looks like it's not opencv fault too, but still I will take a look into it. |
|
Now |
dg0yt
reviewed
Jul 7, 2021
yes sorry, i didn't push the proper commit. |
cenit
force-pushed
the
dev/cenit/opencv453
branch
from
5cdac46
to
977d4bf
Compare
[libiconv] update cmake wrapper
cenit
force-pushed
the
dev/cenit/opencv453
branch
from
977d4bf
to
5102f9f
Compare
|
|
|
should be ok now |
NancyLi1013
approved these changes
Jul 9, 2021
|
LGTM, have you tested these features in this PR? |
NancyLi1013
added
requires:all-feature-testing
|
just my usual small set features remember also the vcpkg-ci-opencv port which is already testing all features |
|
Yes, These features are not tested in CI. |
|
if they are excluded it's because they are supposed to not work. For example, cudnn (a dependency for cuda feature) cannot build in static mode, nor tbb ;) |
|
world is a feature which just produces a single dll instead of multiple dlls for opencv, so you cannot build that feature and also check individual dlls. |
|
@morphogencc can you please tell me if this PR fixes the issue you described in #18490 ? |
|
@NancyLi1013 I just pushed a modification to vcpkg-ci-opencv to increase CI coverage for features. Now every feature except for world will be tested in CI, at least in the x64-windows triplet |
NancyLi1013
added
the
depends:different-pr
|
Could you please resolve the conflicts? |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
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 libxml2 but no changes to version or port version.
-- Version: 2.9.12#2
-- Old SHA: f86cd2ab2c75dcd8e97ee18191b343f0b31bfb7c
-- New SHA: bbc412b19fe507d6b9a6555dc3e6af205bbdaea4
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
|
@NancyLi1013 what should have taken one day has taken one month, but I hope that no regression is here and PR is ready for merging. Waiting for CI with fingers crossed 🤞🏻 |
|
😢 what happened to gettext? |
Good question. Some logs are here #19337. |
I also hope that this PR can be merged ASAP. But it's a pity that there are new regressions. We need to wait for the fix again. |
|
gettext fix should be landed on master, so merged to see if we can appreciate any improvement |
|
if CI is successful we will have to wait for #19358 and then fix conflicts |
There was a problem hiding this comment.
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 eb9cb291669f24b315d6001065e3b1e53e3701b4 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json
index 91f1111..69366e6 100644
--- a/versions/o-/opencv3.json
+++ b/versions/o-/opencv3.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "7e731b071dd6c8488396acc36b24af4b8258dc3a",
+ "git-tree": "cb4ed9774da974697dde70c75cbf9639e9209673",
"version": "3.4.15",
"port-version": 0
},
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index eb95950..befb61c 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "2a2d1666b66f67ec783077917c9355f5bb8a9efa",
+ "git-tree": "f7110f51e74414c1111a6403d1979f7786c5f2ad",
"version": "4.5.3",
"port-version": 0
},
|
@NancyLi1013 @BillyONeal for me, PR is ready for merging |
BillyONeal
removed
requires:author-response
depends:different-pr
|
Thanks for your help! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on: #19221, #19358
Fixes: #18490