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

[glew] Add public definition GLEW_NO_GLU [colmap] Remove feature cuda #43641

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

WangWeiLin-MV
Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV commented Feb 5, 2025

Port freetype-gl failed with include/GL/glew.h:1219:14: fatal error: GL/glu.h: No such file or directory which found in when check #43363 (review)

Change

Checklist

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

Test

The port glew, freetype-gl, colmap installation tests pass with the following triplets:

  • x64-windows

@WangWeiLin-MV WangWeiLin-MV added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Feb 5, 2025
@WangWeiLin-MV WangWeiLin-MV force-pushed the ports/freetype-gl/system-dependency-message branch from 2531e62 to 3481b48 Compare February 5, 2025 10:34
@WangWeiLin-MV WangWeiLin-MV marked this pull request as ready for review February 6, 2025 02:21
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 6, 2025
@WangWeiLin-MV WangWeiLin-MV force-pushed the ports/freetype-gl/system-dependency-message branch from 3481b48 to c836f41 Compare February 6, 2025 07:00
@WangWeiLin-MV WangWeiLin-MV changed the title [freetype-gl] Add message of system dependency libglu1-mesa-dev [glew] Add message of system dependency libglu1-mesa-dev Feb 6, 2025
@Osyotr
Copy link
Contributor

Osyotr commented Feb 6, 2025

GLEW doesn't use GLU.
https://github.com/nigels-com/glew/blob/3da315c23aa80b5727e51f21bbe33823bf4c0511/build/cmake/CMakeLists.txt#L61
This define should be minted in GLEW headers.

@WangWeiLin-MV WangWeiLin-MV removed the info:reviewed Pull Request changes follow basic guidelines label Feb 6, 2025
@WangWeiLin-MV WangWeiLin-MV marked this pull request as draft February 6, 2025 07:36
@WangWeiLin-MV WangWeiLin-MV changed the title [glew] Add message of system dependency libglu1-mesa-dev [glew] Add public definition GLEW_NO_GLU for glew_head.h Feb 6, 2025
@WangWeiLin-MV WangWeiLin-MV added category:port-bug The issue is with a library, which is something the port should already support and removed category:port-update The issue is with a library, which is requesting update new revision labels Feb 6, 2025
@WangWeiLin-MV WangWeiLin-MV force-pushed the ports/freetype-gl/system-dependency-message branch from c836f41 to 8b4f45e Compare February 6, 2025 09:15
@WangWeiLin-MV WangWeiLin-MV force-pushed the ports/freetype-gl/system-dependency-message branch from 8b4f45e to 6b28cc3 Compare February 6, 2025 10:10
@dg0yt
Copy link
Contributor

dg0yt commented Feb 6, 2025

This define should be minted in GLEW headers.

i.e. not in CMake. Then you don't have to patch downstream ports.

@WangWeiLin-MV WangWeiLin-MV force-pushed the ports/freetype-gl/system-dependency-message branch from 6b28cc3 to 85a2ff8 Compare February 7, 2025 06:47
@WangWeiLin-MV WangWeiLin-MV changed the title [glew] Add public definition GLEW_NO_GLU for glew_head.h [glew] Add public definition GLEW_NO_GLU for glew_head.h [colmap] Remove feature cuda Feb 8, 2025
@WangWeiLin-MV WangWeiLin-MV marked this pull request as ready for review February 8, 2025 02:32
@WangWeiLin-MV WangWeiLin-MV changed the title [glew] Add public definition GLEW_NO_GLU for glew_head.h [colmap] Remove feature cuda [glew] Add public definition GLEW_NO_GLU [colmap] Remove feature cuda Feb 8, 2025
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 8, 2025
@dg0yt
Copy link
Contributor

dg0yt commented Feb 8, 2025

Approved? Okay, suggestion implemented in #43695.

Copy link
Contributor

@dg0yt dg0yt left a comment

Choose a reason for hiding this comment

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

Really don't see this as ready to merge.

${FREETYPE_LIBRARIES}
${MATH_LIBRARY}
- ${GLEW_LIBRARY}
+ GLEW::GLEW
Copy link
Contributor

Choose a reason for hiding this comment

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

Typical patch which will breaks users 💣

Comment on lines -54 to -66
"cuda": {
"description": "Build with CUDA.",
"dependencies": [
"cuda",
"glew"
]
},
"cuda-redist": {
"description": "Redistributable CUDA support for common supported compute architectures.",
"dependencies": [
"cuda"
]
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Nobody wants to remove CUDA from COLMAP. (Or back to 🧮?)

@JonLiu1993 JonLiu1993 removed the info:reviewed Pull Request changes follow basic guidelines label Feb 10, 2025
@WangWeiLin-MV
Copy link
Contributor Author

Convert to draft. Wait for the fix and discussion upstream that mentioned

@WangWeiLin-MV WangWeiLin-MV marked this pull request as draft February 11, 2025 08:28
@WangWeiLin-MV WangWeiLin-MV added the depends:upstream-changes Waiting on a change to the upstream project label Feb 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support depends:upstream-changes Waiting on a change to the upstream project info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants