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

[magnum-plugins] Update head features and bundled dependency #21307

Merged
merged 7 commits into from
Nov 19, 2021

Conversation

pezcode
Copy link
Contributor

@pezcode pezcode commented Nov 10, 2021

This PR updates magnum-plugins with new features available when compiling with --head, along with an update to a bundled dependency required to compile.

Note: the spirvtoolsshaderconverter feature is currently broken due to #18612

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

    There shouldn't be any changes compared to the current port version

  • Does your PR follow the maintainer guide?

    To the best of my knowledge, yes 👀

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

    Yessss

@ghost
Copy link

ghost commented Nov 10, 2021

CLA assistant check
All CLA requirements met.

@pezcode pezcode marked this pull request as draft November 10, 2021 14:19
@pezcode pezcode marked this pull request as ready for review November 10, 2021 22:10
@NancyLi1013 NancyLi1013 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Nov 11, 2021
ports/magnum-plugins/portfile.cmake Outdated Show resolved Hide resolved
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 portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/magnum-plugins/portfile.cmake

@pezcode pezcode marked this pull request as draft November 11, 2021 09:51
@pezcode pezcode marked this pull request as ready for review November 11, 2021 10:07
@pezcode pezcode marked this pull request as draft November 11, 2021 11:20
@pezcode pezcode marked this pull request as ready for review November 11, 2021 11:46
@pezcode pezcode marked this pull request as draft November 13, 2021 13:13
@pezcode
Copy link
Contributor Author

pezcode commented Nov 13, 2021

Turned into a draft PR temporarily to coordinate with @mosra. If @NancyLi1013 confirms that head-only feature dependencies are acceptable, the bundled zstd handling can be removed upstream.

@NancyLi1013
Copy link
Contributor

Have you tested this features? @pezcode

@NancyLi1013 NancyLi1013 added the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Nov 16, 2021
@pezcode
Copy link
Contributor Author

pezcode commented Nov 16, 2021

Have you tested this features? @pezcode

I tested all the new and updated features with x64-windows and x64-windows-static.

@NancyLi1013 NancyLi1013 added info:reviewed Pull Request changes follow basic guidelines and removed requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels Nov 17, 2021
@NancyLi1013
Copy link
Contributor

LGTM now, thanks for your PR @pezcode.

Copy link
Member

@vicroms vicroms left a comment

Choose a reason for hiding this comment

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

This port should be updated to the latest commit instead. It removes the necessity for the extra logic around --head which was never intended to be used this way.

@vicroms vicroms added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Nov 18, 2021
@Squareys
Copy link
Contributor

@vicroms I'm not sure if I understand: the latest commit means --head, does it not? As in that's what differentiates it from the latest release.
Of course, ideally, magnum will eventually release a new version, which will eliminate the extra logic, but until then, we shouldn't be updating the port to a HEAD version if users expect to install the latest stable release...

@vicroms
Copy link
Member

vicroms commented Nov 18, 2021

Discussed with the rest of the team, this is fine since it acts like a no-op when a user requests unsupported features and doesn't add new dependencies for non-head users.

@vicroms vicroms merged commit b9ca388 into microsoft:master Nov 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants