Fix build on Fedora37 #22
Conversation
Fixes #5088 (cherry picked from commit e2ade2bfc46d915cd306c63c830b81d800b2575f)
When using shared linking (linking in the normal way with -lwayland-client) rather than loading Wayland libraries dynamically at runtime, listing symbols that don't exist in the current version results in a build failure. We don't actually call wl_proxy_marshal_flags() or wl_proxy_marshal_array_flags() directly; the reason we need them is that they're called by the code generated by wayland-scanner >= 1.20. If we're building against an older Wayland library, then we'll have its corresponding version of wayland-scanner (mismatched versions are not supported), so we won't need those two symbols, and can avoid generating a dependency on them. Conversely, if we're building against a newer Wayland library, the generated code will call them unconditionally, so we cannot treat them as optional and gracefully fall back: that would result in a crash. Instead, treat them as a mandatory part of the Wayland library, so that if they are not found at runtime, we can fall back to X11 without crashing. libwayland 1.18 is in several LTS distributions (Ubuntu 20.04, Debian 11, RHEL 8) so avoiding a hard dependency on 1.20 is quite useful. Signed-off-by: Simon McVittie <smcv@collabora.com> Resolves: libsdl-org/SDL#5376 (cherry picked from commit d5bbbd3f7345eb55f84eb46bf89462a72c038644)
|
Upgrading to a new SDL2 seems complicated because this repo and original SDL2 do not share history so git can't figure out how to merge it, so I've cherry-picked just the 2 commits related to the wayland fix and it at least builds now. |
|
Also related to revery-ui/revery#1094 |
Yeah that unfortunate you still have date time to know around which commit it is. |
|
Thanks for those I will try to update esy-sdl with git history so it is easier to track |
|
Oops I rebased and we don't see you are the committer 😓 |
|
I began to reconcile the tree in this branch https://github.com/revery-ui/esy-sdl2/tree/git I haven't done history between 2.0.10 and 2.0.14. I will do another round to fix history between and will use it in revery. |
Fixes #21