From fc608ffb5f61caae0e1034da181ac90760285410 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 28 Dec 2024 11:57:03 +0100
Subject: [PATCH] cmake: really disable xrandr by default on Solarir
Fixes libsdl-org/SDL#10099
---
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87f796d6b6360..0ac51d0151e5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,9 +363,9 @@ if(VITA OR PSP OR PS2 OR N3DS)
set(SDL_LOADSO_ENABLED_BY_DEFAULT OFF)
endif()
-set(SDL_X11_XFIXES_DEFAULT ON)
+set(SDL_X11_XRANDR_DEFAULT ON)
if(SOLARIS)
- set(SDL_X11_XFIXES_DEFAULT OFF)
+ set(SDL_X11_XRANDR_DEFAULT OFF)
endif()
# When defined, respect CMake's BUILD_SHARED_LIBS setting:
@@ -467,8 +467,8 @@ dep_option(SDL_X11_SHARED "Dynamically load X11 support" ON "SDL_X11" O
dep_option(SDL_X11_XCURSOR "Enable Xcursor support" ON SDL_X11 OFF)
dep_option(SDL_X11_XDBE "Enable Xdbe support" ON SDL_X11 OFF)
dep_option(SDL_X11_XINPUT "Enable XInput support" ON SDL_X11 OFF)
-dep_option(SDL_X11_XFIXES "Enable Xfixes support" "${SDL_X11_XFIXES_DEFAULT}" SDL_X11 OFF)
-dep_option(SDL_X11_XRANDR "Enable Xrandr support" ON SDL_X11 OFF)
+dep_option(SDL_X11_XFIXES "Enable Xfixes support" ON SDL_X11 OFF)
+dep_option(SDL_X11_XRANDR "Enable Xrandr support" "${SDL_X11_XRANDR_DEFAULT}" SDL_X11 OFF)
dep_option(SDL_X11_XSCRNSAVER "Enable Xscrnsaver support" ON SDL_X11 OFF)
dep_option(SDL_X11_XSHAPE "Enable XShape support" ON SDL_X11 OFF)
set_option(SDL_WAYLAND "Use Wayland video driver" ${UNIX_SYS})