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

[freeglut] Update to 3.4.0, cleanup #28575

Merged
merged 8 commits into from
Dec 29, 2022
Merged

[freeglut] Update to 3.4.0, cleanup #28575

merged 8 commits into from
Dec 29, 2022

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Dec 27, 2022

What does your PR fix?

Updates freeglut.
Restores upstream's X11 dependency handling with variables instead of targets, fixing the exported FreeGLUT config.
Adds missing X11 lib usage requirement to wrapper. (Discovered while working on #28311.)

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

unchanged

Resolving cross-platform file name inconsistencies

FreeGLUT's default configuration comes with these filename inconsistencies:

  • Only Windows (but not Mingw) applies a d debug suffix to the lib name.
  • Windows (incl. Mingw) uses the freeglut name for shared libs and the freeglut_static name for static libs.
  • Non-Windows uses the glut name for libs.
  • The lib name is also used for the pc file, so it varies as well (freeglut.pc vs. glut.pc).
  • Basically, the different names are following different defaults of the FREEGLUT_REPLACE_GLUT options. This options also controls whether FreeGLUT installs include/GL/glut.h.

The former patching in vcpkg removed the _static lib name component.
These library names are kept for compatibility with downstream find_library.
But apart from the lib names, this PR now always sets FREEGLUT_REPLACE_GLUT to on.

  • No changes to the previous lib names (by patching).
  • include/GL/glut.h is always installed.
  • The pc file is always installed as glut.pc.
    Benefit: This is the first pkg-config file looked up by FindGLUT.cmake.
  • A copy of this pc file is created as freeglut.pc.
    So both names are always available.

github-actions[bot]
github-actions bot previously approved these changes Dec 27, 2022
@MonicaLiu0311 MonicaLiu0311 self-assigned this Dec 27, 2022
@MonicaLiu0311 MonicaLiu0311 added the category:port-update The issue is with a library, which is requesting update new revision label Dec 27, 2022
@dg0yt dg0yt marked this pull request as ready for review December 27, 2022 10:08
github-actions[bot]
github-actions bot previously approved these changes Dec 27, 2022
github-actions[bot]
github-actions bot previously approved these changes Dec 27, 2022
@MonicaLiu0311 MonicaLiu0311 added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Dec 28, 2022
@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Dec 29, 2022
@vicroms vicroms merged commit f3a1217 into microsoft:master Dec 29, 2022
@vicroms
Copy link
Member

vicroms commented Dec 29, 2022

Thanks for the detailed description! It helped a lot during review.

@dg0yt dg0yt deleted the freeglut branch December 29, 2022 18:37
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 category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants