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.

Sign up for GitHub

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

Jump to bottom

[libjpeg-turbo] fix incompatibility for c11 and c17 #15234

Merged
merged 8 commits into from
Dec 27, 2020
Merged

[libjpeg-turbo] fix incompatibility for c11 and c17 #15234

merged 8 commits into from
Dec 27, 2020

Conversation

playgithub
Copy link
Contributor

Describe the pull request

  • What does your PR fix? Fixes #

#15195

@playgithub playgithub changed the title fix incompatibility for c11 and c17 [libjpeg-turbo] fix incompatibility for c11 and c17 Dec 21, 2020
@playgithub playgithub mentioned this pull request Dec 21, 2020
Merged
@NancyLi1013 NancyLi1013 self-assigned this Dec 21, 2020
@NancyLi1013
Copy link
Contributor

Could you please resolve the conflicts?

@NancyLi1013 NancyLi1013 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Dec 21, 2020
@NancyLi1013
Copy link
Contributor

Looks like you missed something in latest commit. The CONTROL and portfile.cmake files are also needed here.

@NancyLi1013
Copy link
Contributor

docs/maintainers/maintainer-guide.md should not be included in this PR.

@playgithub
Copy link
Contributor Author

docs/maintainers/maintainer-guide.md should not be included in this PR.

Alright, It seems that I have touched it accidently and fixed it. I'll redo the PR.

NancyLi1013
NancyLi1013 suggested changes Dec 22, 2020
View reviewed changes
ports/libjpeg-turbo/portfile.cmake Outdated Show resolved Hide resolved
ports/libjpeg-turbo/portfile.cmake Outdated Show resolved Hide resolved
@NancyLi1013
Copy link
Contributor

@playgithub

Could you please resolve the conflicts?

@playgithub playgithub mentioned this pull request Dec 22, 2020
Closed
@NancyLi1013
Copy link
Contributor

The CONTROL file is not updated in this PR. Please bump port-version.

@playgithub
Copy link
Contributor Author

The CONTROL file is not updated in this PR. Please bump port-version.

It's already Port-Version: 1

@NancyLi1013
Copy link
Contributor

The CONTROL file is not updated in this PR. Please bump port-version.

It's already Port-Version: 1

We should update it as 2. Port-Version should be updated every time once there are changes for this port except for a new update.

Please refer to this doc https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/control-files.md#port-version

@playgithub
Copy link
Contributor Author

playgithub commented Dec 23, 2020 •
edited
Loading

We should update it as 2. Port-Version should be updated every time once there are changes for this port except for a new update.

Please refer to this doc https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/control-files.md#port-version

As in the doc, Port-Version starts at 0
For libjpeg-turbo, no Port-Version now, which is equivalent to Port-Version: 0
So I think it should be Port-Version: 1 for the PR, please confirm

@NancyLi1013
Copy link
Contributor

Port-Version has been updated to 1 in vcpkg master branch.

https://github.com/microsoft/vcpkg/blob/master/ports/libjpeg-turbo/CONTROL#L3

So it should be 2 in this PR.

If there is no Port-Version in your branch, you should merge master to your branch, then update it.

@NancyLi1013
Copy link
Contributor

LGTM now except for the features.

Have you tested these features in this PR? Can they work fine?

@NancyLi1013 NancyLi1013 added the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Dec 23, 2020
@playgithub
Copy link
Contributor Author

Have you tested these features in this PR? Can they work fine?

No, I have only Windows on my machine, it depends on the checks here.

@NancyLi1013 NancyLi1013 removed the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Dec 24, 2020
@NancyLi1013
Copy link
Contributor

All features have passed with the following triplets:

  • x86-windows
  • x64-windows-static

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Dec 24, 2020
@BillyONeal BillyONeal merged commit c09b59c into microsoft:master Dec 27, 2020
@BillyONeal
Copy link
Member

Thanks :)

ryukw7 pushed a commit to ryukw7/vcpkg that referenced this pull request Dec 29, 2020
@playgithub
[libjpeg-turbo] fix incompatibility for c11 and c17 (microsoft#15234)
12d03b5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

Assignees

@NancyLi1013 NancyLi1013

Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@playgithub @NancyLi1013 @BillyONeal