glfw: limit xorg library dependencies #23272
Conversation
Previously the glfw package would implicitly require linking with xorg::xorg, which includes all the libraries exposed by the xorg package. This commit explicitly declares the requirements of glfw, limiting the xorg libraries to only those needed.
The ability to link to a static Vulkan loader was removed in glfw version 3.4.
|
🤖 Beep Boop! This pull request is making changes to 'recipes/glfw//'. 👋 @Hopobcn you might be interested. 😉 |
recipes/glfw/all/conanfile.py
Outdated
| if Version(self.version) < "3.4": | ||
| if self.options.get_safe("vulkan_static"): | ||
| self.cpp_info.requires.extend(["vulkan-loader::vulkan-loader"]) | ||
| if self.settings.os in ["Linux", "FreeBSD"]: | ||
| if self.options.get_safe("with_x11", True): | ||
| self.cpp_info.requires.extend(["xorg::x11"]) | ||
| if self.options.get_safe("with_wayland"): | ||
| self.cpp_info.requires.extend(["wayland::wayland", "xkbcommon::xkbcommon"]) |
There was a problem hiding this comment.
| if Version(self.version) < "3.4": | |
| if self.options.get_safe("vulkan_static"): | |
| self.cpp_info.requires.extend(["vulkan-loader::vulkan-loader"]) | |
| if self.settings.os in ["Linux", "FreeBSD"]: | |
| if self.options.get_safe("with_x11", True): | |
| self.cpp_info.requires.extend(["xorg::x11"]) | |
| if self.options.get_safe("with_wayland"): | |
| self.cpp_info.requires.extend(["wayland::wayland", "xkbcommon::xkbcommon"]) | |
| if self.options.get_safe("vulkan_static"): | |
| self.cpp_info.requires.extend(["vulkan-loader::vulkan-loader"]) | |
| if self.settings.os in ["Linux", "FreeBSD"]: | |
| if self.options.get_safe("with_x11", True): | |
| self.cpp_info.requires.extend(["xorg::x11"]) | |
| if self.options.get_safe("with_wayland"): | |
| self.cpp_info.requires.extend(["wayland::wayland", "xkbcommon::xkbcommon"]) |
I don't think the version check is necessary as it's already handled by the deleted options in configure(), no?
There was a problem hiding this comment.
I think the version check is needed because even when you specify with_x11=True or with_wayland=True, the glfw library does not require linking with these after version 3.4, which implemented the runtime platform detection.
This comment has been minimized.
This comment has been minimized.
From version 3.4, glfw loads platform libraries at runtime, and so it is not necessary to link with these.
johningve
force-pushed
the
fix-glfw-cpp-info-requirements
branch
from
18ad9b7
to
c05ac9d
Compare
Conan v1 pipeline ✔️All green in build 2 (
Conan v2 pipeline ✔️
All green in build 2 (
|
ghost
mentioned this pull request
Previously the glfw package would implicitly require linking with xorg::xorg, which includes all the libraries exposed by the xorg package.
This change explicitly declares the requirements of glfw, limiting the xorg libraries to only those needed.
From version 3.4 these dependencies are no longer necessary since glew implemented runtime platform detection.
Also removes vulkan_static option in version 3.4, since it is no longer supported by glfw.
Specify library name and version: glfw/all