Try to load libX11.so.6 in addition to libX11.so.
#5307
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
In terms of a changelog entry - what would be the appropriate section for this? |
|
Yeah, that's fine. If it's wrong we do a changelog pass before release anyway. |
cwfitzgerald
approved these changes
Feb 27, 2024
cwfitzgerald
added
the
PR: needs back-porting
cwfitzgerald
pushed a commit
to cwfitzgerald/wgpu
that referenced
this pull request
Feb 29, 2024
cwfitzgerald
removed
the
PR: needs back-porting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connections
Fixes #2518.
Description
Not all Linux distributions (e.g: Debian and openSUSE) include a
libX11.sosymlink in the standard libX11 package. Debian only includeslibX11.so.6-libX11.sois provided by thelibx11-devpackage, which is not a dependency application maintainers should need users to install. (openSUSE provides thelibX11.sosymlink inlibX11-devel.)Note that the ordering here (
libX11.so.6beforelibX11.so) matches the order in which the Wayland client library is attempted bywgpu(libwayland-client.so.0beforelibwayland-client.so).Testing
Unfortunately, I'm having trouble reproducing the issue myself. That said, this is a very straightforward change, and seems to be acknowledged to be desirable.
Checklist
cargo fmt.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.