Skip to content

Update zlib-ng to 2.2.1#26113

Merged
asmorkalov merged 9 commits intoopencv:4.xfrom
FantasqueX:zlib-ng-2-2-1
Sep 12, 2024
Merged

Update zlib-ng to 2.2.1#26113
asmorkalov merged 9 commits intoopencv:4.xfrom
FantasqueX:zlib-ng-2-2-1

Conversation

@FantasqueX
Copy link
Copy Markdown
Contributor

@FantasqueX FantasqueX commented Sep 4, 2024

Release: https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.1
ARM diagnostics patch: zlib-ng/zlib-ng#1774

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@asmorkalov
Copy link
Copy Markdown
Contributor

zlib-ng also contains branch for s390. It's missing in the patch. Also there are some new run-time arch detection options in the original cmake. I'm looking on it, if it makes sense to integrate them somehow.

@FantasqueX
Copy link
Copy Markdown
Contributor Author

FantasqueX commented Sep 6, 2024

zlib-ng also contains branch for s390. It's missing in the patch.

This is intended. There is no s390 recognition in opencv's processor detection. So, I think s390 part of zlib-ng is not needed.

@asmorkalov asmorkalov added this to the 4.11.0 milestone Sep 10, 2024
@asmorkalov
Copy link
Copy Markdown
Contributor

@FantasqueX Thanks a lot for the contribution. I switched to the original project CMake to ease further updates and fixed arm diagnostics. Let's wait for CI.

OCV_OPTION(WITH_FLATBUFFERS "Include Flatbuffers support (required by DNN/TFLite importer)" ON
VISIBLE_IF TRUE
VERIFY HAVE_FLATBUFFERS)
OCV_OPTION(WITH_ZLIB_NG "Use zlib-ng instead of zlib" OFF
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OPENCV_FORCE_3RDPARTY_BUILD should be enabled for testing.

@asmorkalov
Copy link
Copy Markdown
Contributor

@mshabunin @opencv-alalek could you take a look on the PR? I do not know how to handle iOS build failure (internal compiler error). Other platforms are good.

@asmorkalov asmorkalov merged commit 85923c8 into opencv:4.x Sep 12, 2024
@asmorkalov asmorkalov self-assigned this Sep 12, 2024
@asmorkalov asmorkalov mentioned this pull request Sep 20, 2024
thewoz pushed a commit to CobbsLab/OPENCV that referenced this pull request Feb 13, 2025
Update zlib-ng to 2.2.1 opencv#26113

Release: https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.1
ARM diagnostics patch: zlib-ng/zlib-ng#1774

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants