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.

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

Merged
merged 1 commit into from
Feb 17, 2022

Conversation

reynoldsbd
Copy link
Member

Describe the pull request

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

Copy link

@github-actions github-actions bot left a 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

Copy link

@github-actions github-actions bot left a 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

@reynoldsbd reynoldsbd changed the title OpenCV: Add Patch to Remove ZLIB Hacks [opencv] Add Patch to Remove ZLIB Hacks Feb 16, 2022
@BillyONeal
Copy link
Member

/cc @cenit

Copy link
Contributor

@dg0yt dg0yt left a 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.

@cenit
Copy link
Contributor

cenit commented Feb 16, 2022

agree with @dg0yt for minimal patch.
same patch should be done also for opencv3

Copy link

@github-actions github-actions bot left a 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

@reynoldsbd reynoldsbd changed the title [opencv] Add Patch to Remove ZLIB Hacks [opencv] Add Patch to Skip ZLIB Hacks Feb 16, 2022
@reynoldsbd
Copy link
Member Author

@dg0yt / @cenit look better?

@JonLiu1993 JonLiu1993 self-assigned this Feb 17, 2022
@JonLiu1993 JonLiu1993 added the category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. label Feb 17, 2022
@cenit
Copy link
Contributor

cenit commented Feb 17, 2022

@dg0yt / @cenit look better?

yes

@BillyONeal
Copy link
Member

This may be the most approved PR ever, thanks :D
image

@BillyONeal BillyONeal merged commit f54a7b0 into microsoft:master Feb 17, 2022
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[zlib] warning: Broken installation of vcpkg port zlib (Android)
5 participants