[libjpeg-turbo] Upgraded to 2.1.0#18742
Closed
bobuc-havok wants to merge 32 commits intomicrosoft:masterfrom
Closed
[libjpeg-turbo] Upgraded to 2.1.0#18742bobuc-havok wants to merge 32 commits intomicrosoft:masterfrom
bobuc-havok wants to merge 32 commits intomicrosoft:masterfrom
Conversation
JonLiu1993
added
the
category:port-update
Contributor
|
@bucurb ,Thanks for your pr ,could you please take a look: |
dg0yt
reviewed
Jul 1, 2021
Hoikas
reviewed
Jul 1, 2021
Contributor
|
Related PR #15178 |
Update to latest
JonLiu1993
approved these changes
Jul 6, 2021
JonLiu1993
added
info:needs-maintainer-attention
Contributor
|
Thanks for your pr. |
JackBoosY
suggested changes
Jul 6, 2021
JackBoosY
added
requires:author-response
and removed
info:needs-maintainer-attention
Contributor
|
PhoebeHui
reviewed
Jul 19, 2021
| message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}") | ||
|
|
||
| message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") | ||
| +set(CMAKE_DEBUG_POSTFIX d) |
Contributor
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment.
@PhoebeHui This rename was also done in the original port, I just made it a bit nicer and cross-platform. The original port file was just renaming on windows builds. If you look at the previous changes in this PR, I think sha tbcc7d5296af2cd3ff20ef6f894f4952da30e0c97 still has the original renames and is so much uglier :). Let me know how you want to proceed, happy to revert to what I had a few weeks ago.
Contributor
There was a problem hiding this comment.
We'd like to remove it since the Upstream doesn't have it, and they refused to add 'set(CMAKE_DEBUG_POSTFIX "d") to their CMakeLists.txt', see libjpeg-turbo/libjpeg-turbo#293.
However we noticed the FindJPEG.cmake requires 'd' in debug library. We would confirm it with CMake team. See https://gitlab.kitware.com/cmake/cmake/-/merge_requests/1974
Contributor
There was a problem hiding this comment.
No renames whatsoever. If required install a vcpkg-cmake-wrapper.cmake to fix the CMake search behavior
Contributor
There was a problem hiding this comment.
This may also breaks the behavior of other configurators.
Contributor
There was a problem hiding this comment.
See the progress in new CMake issue https://gitlab.kitware.com/cmake/cmake/-/issues/22481
Contributor
There was a problem hiding this comment.
The following changes should be made in vcpkg:
- Remove patch fix-output-names.patch
- Remove the code to fix the name in libturbojpeg.pc in portfile.cmake
- Update the vcpkg-cmake-wrapper.cmake to find the libjpeg-turbo via cmake config.
Contributor
There was a problem hiding this comment.
PR #19319 would fix this issue, and we would continue this PR when the PR#19319 merged.
PhoebeHui
added
requires:author-response
and removed
info:needs-maintainer-attention
Contributor
|
@bucurb ,Can you please resolve the conflicts against master? |
Contributor
Author
|
@JonLiu1993 done. |
JonLiu1993
approved these changes
Jul 23, 2021
PhoebeHui
added
the
depends:different-pr
Contributor
|
Depends on #19319. |
Contributor
|
2.1.1 is out which fixes regression bugs, might be best to pick up that patch release here? https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.1 |
Contributor
|
Shouldn't |
PhoebeHui
removed
requires:vcpkg-team-review
Contributor
|
@bucurb,Could you please resolve the conflicts against master? |
Contributor
|
@bucurb ,Is this PR being worked on? |
Contributor
Author
|
@JonLiu1993 sorry I won't have time to look after this PR for a while. |
Contributor
|
If some PR depends on this, I asked the author for permission to modify. @bucurb |
Contributor
Author
|
@JackBoosY please go ahead and make changes if you need to - unfortunately I won't be able to work on this PR for a while |
Contributor
|
@bucurb ,Could you please resolve the conflicts against master? |
Contributor
|
@bucurb ,I temporarily close your pr, I will resubmit pr to update libjpeg-turbo |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.
Describe the pull request
What does your PR fix?
Fixes [libjpeg-turbo] update to 2.1.0 #18731
Which triplets are supported/not supported? Have you updated the CI baseline?
all previously supported, No
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
Yes./vcpkg x-add-version --alland committed the result?If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/