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.2.2, fix X11 dependencies #23807

Merged
merged 13 commits into from
Apr 5, 2022

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Mar 28, 2022

  • What does your PR fix?

    Updates freeglut to 3.2.2.
    Drops the gcc-10 patch: Upstream marked those declaration now as extern.
    Fixes glut lib FREEGLUT_LIBRARIES on Linux where CMake 3.22 would lack the library path for glut. In turn, this fixes a link error when building opencolorio[tools] on Ubuntu 18.04.
    Fixes the lookup and export of dependencies related to X11. In turn, this fixes a build error for libwebp[core,vwebp] on Ubuntu 18.04:

    FAILED: vwebp 
    : && /usr/bin/cc -fPIC -pthread -mno-sse4.1 -mno-sse2 -g -L/home/dg0yt/Projekte/vcpkg/vcpkg/installed/x64-linux/debug/lib/pkgconfig/../../lib -lglut -lX11 -lXxf86vm -lXrandr -lGL -lm CMakeFiles/vwebp.dir/examples/vwebp.c.o -o vwebp  /usr/lib/x86_64-linux-gnu/libOpenGL.so  /usr/lib/x86_64-linux-gnu/libGLX.so  /usr/lib/x86_64-linux-gnu/libGLU.so  libexampleutild.a  libimageioutild.a  libwebpd.a  libwebpdemuxd.a  /usr/lib/x86_64-linux-gnu/libSM.so  /usr/lib/x86_64-linux-gnu/libICE.so  /usr/lib/x86_64-linux-gnu/libX11.so  /usr/lib/x86_64-linux-gnu/libXext.so  /usr/lib/x86_64-linux-gnu/libXxf86vm.so  /usr/lib/x86_64-linux-gnu/libXrandr.so  -lglut  -lX11  -lXxf86vm  -lXrandr  -lGL  /usr/lib/x86_64-linux-gnu/libXrandr.so  libwebpd.a  -lpthread  -lm && :
    /home/dg0yt/Projekte/vcpkg/vcpkg/installed/x64-linux/debug/lib/pkgconfig/../../lib/libglut.a(fg_xinput_x11.c.o): In function `fgRegisterDevices':
    /home/dg0yt/Projekte/vcpkg/vcpkg/buildtrees/freeglut/src/aced4bbcd3-cc93bf4714.clean/src/x11/fg_xinput_x11.c:58: undefined reference to `XISelectEvents'
    collect2: error: ld returned 1 exit status
    
  • Which triplets are supported/not supported? Have you updated the CI baseline?

    unchanged, no (fail on arm64-windows, uwp, osx)

  • Does your PR follow the maintainer guide?

    yes

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

    yes

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/freeglut/portfile.cmake

@dg0yt dg0yt marked this pull request as draft March 28, 2022 06:21
@dg0yt

This comment was marked as resolved.

@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Mar 28, 2022
@dg0yt dg0yt marked this pull request as ready for review March 28, 2022 13:06
@dg0yt
Copy link
Contributor Author

dg0yt commented Mar 28, 2022

qtinterfaceframework:x64-windows: Baseline regression

@dg0yt dg0yt marked this pull request as draft March 28, 2022 19:55
@dg0yt
Copy link
Contributor Author

dg0yt commented Mar 30, 2022

CI bug: #23862

@dg0yt dg0yt marked this pull request as ready for review March 30, 2022 05:11
@LilyWangLL LilyWangLL added the depends:different-pr This PR or Issue depends on a PR which has been filed label Mar 30, 2022
@dg0yt
Copy link
Contributor Author

dg0yt commented Mar 31, 2022

All checks green, no longer depending on other PR to fix baseline regression.

@LilyWangLL LilyWangLL removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 1, 2022
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Apr 1, 2022
@dg0yt
Copy link
Contributor Author

dg0yt commented Apr 1, 2022

One more change. Hard to believe how much breakage exists when you try to link apps, not libraries.

@strega-nil-ms
Copy link
Contributor

Thanks!

@strega-nil-ms strega-nil-ms merged commit 90fdea2 into microsoft:master Apr 5, 2022
@dg0yt dg0yt deleted the freeglut branch April 6, 2022 05:41
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 info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants