From 4e111874de3b6a2efcd9821808781aa9894f74de Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 21 Feb 2025 09:06:12 +0100 Subject: [PATCH] [client,sdl] mark SDL2 as deprecated. SDL2 client is a dead end due to lacking API (clipboard support, ...) so mark the SDL2 client deprecated and point out there is a SDL3 version available --- client/SDL/CMakeLists.txt | 3 ++- client/SDL/SDL2/sdl_freerdp.cpp | 1 + client/common/cmdline.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/SDL/CMakeLists.txt b/client/SDL/CMakeLists.txt index f37ccb7a8..710cdf67d 100644 --- a/client/SDL/CMakeLists.txt +++ b/client/SDL/CMakeLists.txt @@ -64,7 +64,8 @@ find_package(SDL3) cmake_dependent_option(WITH_CLIENT_SDL_VERSIONED "append sdl version to client binaries" OFF WITH_CLIENT_SDL OFF) cmake_dependent_option( - WITH_CLIENT_SDL2 "[experimental] build experimental SDL2 client" ${SDL2_FOUND} WITH_CLIENT_SDL OFF + WITH_CLIENT_SDL2 "[deprecated,experimental] build deprecated,experimental SDL2 client" ${SDL2_FOUND} WITH_CLIENT_SDL + OFF ) cmake_dependent_option( WITH_CLIENT_SDL3 "[experimental] build experimental SDL3 client" ${SDL3_FOUND} WITH_CLIENT_SDL OFF diff --git a/client/SDL/SDL2/sdl_freerdp.cpp b/client/SDL/SDL2/sdl_freerdp.cpp index f9f44fa26..781c96b0a 100644 --- a/client/SDL/SDL2/sdl_freerdp.cpp +++ b/client/SDL/SDL2/sdl_freerdp.cpp @@ -1644,6 +1644,7 @@ int main(int argc, char* argv[]) RDP_CLIENT_ENTRY_POINTS clientEntryPoints = {}; freerdp_client_warn_experimental(argc, argv); + freerdp_client_warn_deprecated(argc, argv); WLog_WARN(SDL_TAG, "SDL2 client does not support clipboard! Only SDL3 client has (partial) support"); diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 6faabe6f9..fd337b345 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -6220,7 +6220,7 @@ void freerdp_client_warn_deprecated(int argc, char* argv[]) return; WLog_Print_unchecked(log, log_level, "[deprecated] %s client has been deprecated", app); - WLog_Print_unchecked(log, log_level, "As replacement there is a SDL based client available."); + WLog_Print_unchecked(log, log_level, "As replacement there is a SDL3 based client available."); WLog_Print_unchecked( log, log_level, "If you are interested in keeping %s alive get in touch with the developers", app);