Fix unspecified wayland/x11 dep from clipboard feature #5478
+38
−7
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
|
Preview available at https://egui-pr-preview.github.io/pr/5478-linux-compositor-dep-isolation |
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.
waylandfeature is disabled. #4538As far as I can tell, it's not actually possible for an
eframenative application to build without wayland, and as a result, target the xwayland compositor option by default, at the moment. If you enable only the x11 feature and run your application on a wayland machine, you will see that it still has been built with, and fully supports the wayland compositor, as if the feature had been enabled.This is because the clipboard feature in
egui-winitrequires both thearboardcrate (which supports all non-wayland systems except android) and thesmithay-clipboardcrate which supports only wayland systems.This causes an annoying issue with the features as they can only be additive with the current Cargo.toml spec. We cannot enable the
smithay-clipboardfeature only if bothclipboardandwaylandare enabled. As such, we should enable the entire wayland feature whensmithay-clipboardis enabled (because it effectively already does this) and default to justarboard-- while providing features for both nonwayland and wayland targets.While
clipboard-nonwaylandandclipboard-waylandaren't ideal nomenclature, it seems like the most clear option IMO. Alternatively, we could haveclipboarddefault to justarboard, but then you would need the user to realize if they are only targeting wayland, they should disable theclipboardfeature, and only enable theclipboard-waylandfeature.Of course, open to alternatives if someone can think of something cleaner, but I think this is significantly better than forcing wayland to be included at the moment (especially since winit's x11/wayland implementations are quite far from feature parity).