Skip to content
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

[X11] Do not fail DisplayServer init if non-essential extensions are missing. #80240

Merged
merged 1 commit into from
Aug 7, 2023

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Aug 4, 2023

Make xrandr, xinerama, xshaped optional for loading DisplayServer, since these are used only for some functions.

Fixes #80194

@bruvzg bruvzg added this to the 4.x milestone Aug 4, 2023
@bruvzg bruvzg marked this pull request as ready for review August 7, 2023 06:51
@bruvzg bruvzg requested a review from a team as a code owner August 7, 2023 06:51
@akien-mga akien-mga modified the milestones: 4.x, 4.2 Aug 7, 2023
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@akien-mga akien-mga added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Aug 7, 2023
@akien-mga akien-mga merged commit 6a0410b into godotengine:master Aug 7, 2023
14 checks passed
@akien-mga
Copy link
Member

Thanks!

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Sep 21, 2023
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unsupported Xinerama library version on Linux, Nvidia card with 2 monitors NOT running Twinview
3 participants