[libjpeg-turbo/mozjpeg] Add conflict messages #15196
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
category:port-bug
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
added 3 commits
December 22, 2020 18:56
…NancyLi/add-conflicts
…NancyLi/add-conflicts # Conflicts: # ports/libjpeg-turbo/portfile.cmake
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@BillyONeal |
…NancyLi/add-conflicts
|
@NancyLi1013 It fails vcpkg's end to end tests: if I had to guess because you said |
NancyLi1013
commented
Jan 8, 2021
|
Thanks for your help to pointing this out @BillyONeal. Sorry, it's my mistake. Hope all checks pass this time. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
JackBoosY
approved these changes
Jan 11, 2021
|
Maybe we should add a |
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.
Describe the pull request
libjpeg-turboandmozjpegcannot be installed at the same time, sincemozjpegis based onlibjpeg-turbo.The references are as follows:
https://github.com/mozilla/mozjpeg/blob/master/README.md
https://github.com/mozilla/mozjpeg/blob/master/README-mozilla.txt
Note: No need to test features.