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, proj4] Update to PROJ 9.0.0 & make proj the regular port #23186

Merged
merged 11 commits into from
Mar 9, 2022

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Feb 19, 2022

  • What does your PR fix?

    Updates to PROJ 9.0.0.
    Makes proj the regular port instead of proj4.
    Moves cmake config to lower-case folders, and data into a subfolder.

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    all, no

  • Does your PR follow the maintainer guide?

    yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    yes

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.

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/libgeotiff/vcpkg.json
  • ports/libosmium/vcpkg.json
  • ports/libspatialite/vcpkg.json
  • ports/vtk/vcpkg.json

Valid values for the license field can be found in the documentation

@JackBoosY JackBoosY added category:new-port The issue is requesting a new library to be added; consider making a PR! category:port-update The issue is with a library, which is requesting update new revision labels Feb 21, 2022
@JackBoosY
Copy link
Contributor

Also please resolve this PR's conflicts.

Thanks.

@dg0yt
Copy link
Contributor Author

dg0yt commented Mar 1, 2022

I will resolve the conflicts with the official release which we can expect today.
Independent of that, you may validate the switch of regular and stub port which comes with this PR.

@dg0yt dg0yt changed the title [proj, proj-4] Update to PROJ 9.0.0 & make proj the regular port [proj, proj4] Update to PROJ 9.0.0 & make proj the regular port Mar 2, 2022
@dg0yt dg0yt marked this pull request as ready for review March 2, 2022 08:10
@rhuijben
Copy link
Contributor

rhuijben commented Mar 2, 2022

There are some most likely unrelated 7zip errors on x64_uwp and arm64 builds now?

@dg0yt
Copy link
Contributor Author

dg0yt commented Mar 2, 2022

There are some most likely unrelated 7zip errors on x64_uwp and arm64 builds now?

Entirely unrelated: #23284

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Mar 3, 2022
"port-version": 1,
"description": "PROJ library for cartographic projections",
"homepage": "https://proj.org/",
"version-semver": "8.9.9",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"version-semver": "8.9.9",
"version": "8.9.9",

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you explain why?
I would expect server to have stricter rules than plain version, so to be slightly better.

Copy link
Member

Choose a reason for hiding this comment

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

We prefer relaxed version unless upstream explicitly states that they follow semver strictly.
I admit, it doesn't matter much here since we don't expect to keep updating the proj4 port.

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 is intentional.
AFAIU we need to keep the version scheme to have an upgrade path with a version number which compares greater-than to the previous version.

Copy link
Member

@vicroms vicroms Mar 7, 2022

Choose a reason for hiding this comment

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

I see, a while ago we made changes to how we treat version and version-semver during version resolution so it shouldn't matter anymore. We need to update our docs to catch-up with current implementation.

@JackBoosY JackBoosY removed the info:reviewed Pull Request changes follow basic guidelines label Mar 4, 2022
@JackBoosY
Copy link
Contributor

Can you please resolve the file conflicts?

Thanks.

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Mar 7, 2022
@dg0yt
Copy link
Contributor Author

dg0yt commented Mar 9, 2022

Can this be merged soon? New releases for libgeotiff and gdal are coming, and I'm tired of merge conflicts from versioning meta data.

@JackBoosY
Copy link
Contributor

Ping @vicroms @BillyONeal for merge this quickly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR! 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

4 participants