-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MonicaLiu0311
added
the
category:port-update
The issue is with a library, which is requesting update new revision
label
Dec 27, 2022
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
approved these changes
Dec 29, 2022
MonicaLiu0311
added
the
info:reviewed
Pull Request changes follow basic guidelines
label
Dec 29, 2022
Thanks for the detailed description! It helped a lot during review. |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
d
debug suffix to the lib name.freeglut
name for shared libs and thefreeglut_static
name for static libs.glut
name for libs.freeglut.pc
vs.glut.pc
).FREEGLUT_REPLACE_GLUT
options. This options also controls whether FreeGLUT installsinclude/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.include/GL/glut.h
is always installed.glut.pc
.Benefit: This is the first pkg-config file looked up by
FindGLUT.cmake
.freeglut.pc
.So both names are always available.