-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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
build-aux: Use fallback-x11 instead of x11 #9694
Conversation
Please adjust the commit message according to our commit guidelines. |
The reason I specifically left Can you check if that's still the case? |
ah I didn't know about this |
It would still be fantastic to replace |
Input overlay still uses x11, I am still wondering why they didn't use evdev though. It does need permissions, but polkit can handle that right? |
I don't think it's possible to install polkit rules or elevate permissions from a Flatpak sandbox |
No, the author/maintainers of the plugin will have to find (or contribute to) a new way to do it without punching holes in the sandbox and relying on the x11 socket to work on both X11 and Wayland. (Or make the user modify the flatpak permission through a tutorial like some specific Flatpak extension does.) If a plugin requires the x11 socket, it must be fixed to not make OBS crash under Wayland with no access to the x11 socket. |
Tested with Flatseal, Input Overlay will/still crash with this kind of change. |
cc @univrsal |
I'm pretty sure it's libuiohook. It could also be SLD2 but I assume that library behaves correctly. I can add a check and not start libuiohook if obs is running under wayland. getenv("WAYLAND_DISPLAY") || obs_get_nix_platform() == OBS_NIX_PLATFORM_WAYLAND Would either of these checks be enough? |
You should check if you are on X11/Xorg since it's the only supported "platform" (and more future-proof).
We deprecated |
I've added the check. Seems to work from what I can tell but I can't test if it fixes the crash as I don't have the flatpak build. |
@GeorgesStavracas Is this something we want to try out and see what breakages occur in the wild? If so, when would you feel it's appropriate to do so? |
I think we can try merging this right after the current release |
Blocked by #11019 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving based on prior conversation with @GeorgesStavracas .
Description
Fixes a warning when compiling/building the obs flatpak
fallback-x11 only enables x11 if the application doesn't use wayland, and instead falls back to x11. If the app uses wayland then the x11 socket is never made available I am assuming.
Motivation and Context
removes a warning
How Has This Been Tested?
Testing is unnecessary because it just uses the same behavior but removes a build time warning
Types of changes
Bug fix
Checklist: