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: Use the mesa-glu package when not on Apple or Windows #22428

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

jwillikers
Copy link
Contributor

@jwillikers jwillikers commented Jan 18, 2024

The glu/system package installs the Mesa GLU system package on Linux and FreeBSD. Now that the mesa-glu package is available in Conan, use that instead.


@ghost
Copy link

ghost commented Jan 18, 2024

I detected other pull requests that are modifying freeglut/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@conan-center-bot

This comment has been minimized.

@AbrilRBS
Copy link
Member

@jwillikers seems like it's not able to find the headers now :)

@AbrilRBS AbrilRBS self-assigned this Jan 22, 2024
@jwillikers
Copy link
Contributor Author

@jwillikers seems like it's not able to find the headers now :)

Yes, looking into it, there's a couple of problems here. That older version doesn't even look for GLU for starters, and even if it did, using the FindOpenGL CMake module doesn't provide the needed granularity to separate the GLU include directories from the generic OpenGL include directories. It might be something that could be improved in the FindOpenGL CMake module.

@jwillikers
Copy link
Contributor Author

I've opened CMake issue #25627 to address this issue.

@jwillikers
Copy link
Contributor Author

jwillikers commented Jan 24, 2024

Looking into this further, it's failing for the CHECK_INCLUDE_FILES function in CMake, which is not what I was expecting. This looks like it will require fixes in both CMake and FreeGLUT. Interestingly, I just hit a compilation error with FreeGLUT 3.4.0 locally, so maybe the CHECK_INCLUDE_FILES issue isn't a problem in newer versions.

@jwillikers
Copy link
Contributor Author

I'm working on fixing this in CMake and have opened the issue freeglut/freeglut#153 to get this fixed there.

@jwillikers
Copy link
Contributor Author

Alright, fixed in CMake proper. I've opened freeglut/freeglut#154 to fix this in FreeGLUT. I think that it will be best if #20905 is merged before I attempt to add any patches to fix this here, as that will make porting the upstream patches much easier.

@AbrilRBS
Copy link
Member

AbrilRBS commented Feb 7, 2024

Thanks a lot @jwillikers! It's great to see :)

I'll focus on approving the PR to ease things a bit for you

The glu/system package installs the Mesa GLU system package on Linux and FreeBSD.
Now that the mesa-glu package is available in Conan, use that instead.
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 3 (602edc99d326a170fa7588d3d11345367f938898):

  • freeglut/3.2.1:
    All packages built successfully! (All logs)

  • freeglut/3.4.0:
    All packages built successfully! (All logs)

  • freeglut/3.2.2:
    All packages built successfully! (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 3 (602edc99d326a170fa7588d3d11345367f938898):

  • freeglut/3.4.0:
    All packages built successfully! (All logs)

  • freeglut/3.2.2:
    All packages built successfully! (All logs)

  • freeglut/3.2.1:
    All packages built successfully! (All logs)

@jwillikers
Copy link
Contributor Author

@RubenRBS Alright, looks like everything is good to go now!

Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

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

LGTM

@conan-center-bot conan-center-bot merged commit 86284a9 into conan-io:master Feb 27, 2024
23 checks passed
@jwillikers jwillikers deleted the freeglut-mesa-glu branch February 27, 2024 15:15
jwillikers added a commit to jwillikers/conan-center-index that referenced this pull request Mar 2, 2024
This is done the same way as for the FreeGLUT package in conan-io#22428.
Requires conan-io#22956.
Fixes conan-io#22944.
jwillikers added a commit to jwillikers/conan-center-index that referenced this pull request Mar 2, 2024
This is done the same way as for the FreeGLUT package in conan-io#22428.
Fixes conan-io#22944.
conan-center-bot pushed a commit that referenced this pull request Mar 8, 2024
This is done the same way as for the FreeGLUT package in #22428.
Requires #22956.
Fixes #22944.
jwillikers added a commit to jwillikers/conan-center-index that referenced this pull request Apr 10, 2024
This is done the same way as for the FreeGLUT package in conan-io#22428.
Fixes conan-io#22944.
jwillikers added a commit to jwillikers/conan-center-index that referenced this pull request Apr 10, 2024
This is done the same way as for the FreeGLUT package in conan-io#22428.
Fixes conan-io#22944.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants