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

[proj] Update to 9.1.1 #28157

Merged
merged 3 commits into from
Dec 5, 2022
Merged

[proj] Update to 9.1.1 #28157

merged 3 commits into from
Dec 5, 2022

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Dec 4, 2022

Updates proj. Cleanup.

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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for tiff have changed but the version was not updated
version: 4.4.0#1
old SHA: 7d5e9083d0072a4370b44f434cd4dac7b3bee7bc
new SHA: 2e63cee91f8d6907cd368fd333afa11b2c70f064
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

find_package(CURL REQUIRED)
if(CURL_FOUND)
set(CURL_ENABLED TRUE)
+ set(CURL_LIBRARY CURL::libcurl)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The package uses CURL_LIBRARIES now. This chunk was obsolete.

HEAD_REF master
PATCHES
fix-win-output-name.patch
fix-proj4-targets-cmake.patch
tools-cmake.patch
Copy link
Contributor Author

Choose a reason for hiding this comment

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

vcpkg doesn't keep tools for debug, so we can disable building them for debug and drop this patch.

@@ -32,9 +32,10 @@ vcpkg_cmake_configure(
OPTIONS
${FEATURE_OPTIONS}
-DNLOHMANN_JSON=external
-DPROJ_DATA_SUBDIR=share/${PORT}/data
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This variable became ineffective with 9.1.0. I was tempted to restore the original effect, but proj tries hard to use share/proj so I accepted the current state.
(I would be prefer if vcpkg would accept cmake config in share/cmake instead.)

dg0yt added 3 commits December 4, 2022 16:24

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
@LilyWangLL LilyWangLL added the category:port-update The issue is with a library, which is requesting update new revision label Dec 5, 2022
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Dec 5, 2022
@dan-shaw dan-shaw merged commit 802998e into microsoft:master Dec 5, 2022
@dg0yt dg0yt deleted the proj-9.1.1 branch December 6, 2022 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants