-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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] Add Patch to Skip ZLIB Hacks #23132
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!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 18e6e8855d2da137fada2387b6d137583c02b77c -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index d8eb6d8..7c70921 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "7ff367910c0f005f4bb84b01d7aaa9c39eeb72bb",
+ "git-tree": "facbd4376ceafd9aaaf2366a2f004021da5a5ceb",
"version": "4.5.4",
"port-version": 4
},
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/opencv4/vcpkg.json
Valid values for the license field can be found in the documentation
53cd7b2
to
635c6a4
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/opencv4/vcpkg.json
Valid values for the license field can be found in the documentation
/cc @cenit |
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.
LGTM. We want to use vcpkg's zlib, and we have correct wrapper. It just doesn't deal with these evil suffix hacks.
However, there is always a more minimal patch: Add
elseif(1)
find_package(ZLIB REQUIRED)
before the else()
, and leave the remainder unchanged.
agree with @dg0yt for minimal patch. |
635c6a4
to
1975d6d
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/opencv4/vcpkg.json
Valid values for the license field can be found in the documentation
Describe the pull request
What does your PR fix?
Fixes [zlib] warning: Broken installation of vcpkg port zlib (Android) #20057
Which triplets are supported/not supported? Have you updated the CI baseline?
Not applicable. Issue only manifests in community-supported Android triplets.
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
If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/