From 5ac94b519c4d5b73a6329fefc89509c1f1069199 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 28 Dec 2024 04:04:31 +0100
Subject: [PATCH] cmake: disable xrandr by default on Solaris
Backport of 0be6dc57349a32496868d510cf6d229d15bf47ec
Fixes libsdl-org/SDL#10099
---
CMakeLists.txt | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb38247c3e5a0..87f796d6b6360 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,6 +363,11 @@ if(VITA OR PSP OR PS2 OR N3DS)
set(SDL_LOADSO_ENABLED_BY_DEFAULT OFF)
endif()
+set(SDL_X11_XFIXES_DEFAULT ON)
+if(SOLARIS)
+ set(SDL_X11_XFIXES_DEFAULT OFF)
+endif()
+
# When defined, respect CMake's BUILD_SHARED_LIBS setting:
set(SDL_STATIC_ENABLED_BY_DEFAULT ON)
if (NOT DEFINED SDL_SHARED_ENABLED_BY_DEFAULT)
@@ -459,11 +464,13 @@ set_option(SDL_RPATH "Use an rpath when linking SDL" ${UNIX_SYS})
set_option(SDL_CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" ${SDL_CLOCK_GETTIME_ENABLED_BY_DEFAULT})
set_option(SDL_X11 "Use X11 video driver" ${UNIX_SYS})
dep_option(SDL_X11_SHARED "Dynamically load X11 support" ON "SDL_X11" OFF)
-set(SDL_X11_OPTIONS Xcursor Xdbe XInput Xfixes Xrandr Xscrnsaver XShape)
-foreach(_SUB ${SDL_X11_OPTIONS})
- string(TOUPPER "SDL_X11_${_SUB}" _OPT)
- dep_option(${_OPT} "Enable ${_SUB} support" ON "SDL_X11" OFF)
-endforeach()
+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_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})
dep_option(SDL_WAYLAND_SHARED "Dynamically load Wayland support" ON "SDL_WAYLAND" OFF)
dep_option(SDL_WAYLAND_LIBDECOR "Use client-side window decorations on Wayland" ON "SDL_WAYLAND" OFF)