From f7640288f7274df329954ffa3ea6ebe5afb776ce Mon Sep 17 00:00:00 2001
From: Armin Novak <anovak@thincast.com>
Date: Thu, 21 Dec 2023 21:50:18 +0100
Subject: [PATCH] [ci,flatpak] update build instructions

---
 packaging/flatpak/com.freerdp.FreeRDP.json |  2 ++
 packaging/flatpak/freerdp.sh               | 42 +++++++++++++++-------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json
index 88632561e..c051a708b 100644
--- a/packaging/flatpak/com.freerdp.FreeRDP.json
+++ b/packaging/flatpak/com.freerdp.FreeRDP.json
@@ -52,6 +52,7 @@
     {
       "name": "freerdp",
       "buildsystem": "cmake-ninja",
+      "builddir": true,
       "cleanup": [
       ],
       "config-opts": [
@@ -65,6 +66,7 @@
         "-DWITH_MANPAGES:BOOL=OFF",
         "-DWITH_KRB5:BOOL=ON",
         "-DWITH_PCSC:BOOL=ON",
+        "-DWITH_SDL_IMAGE_DIALOGS:BOOL=ON",
         "-DWITH_INTERNAL_MD4:BOOL=ON",
         "-DWITH_INTERNAL_MD5:BOOL=ON",
         "-DWITH_INTERNAL_RC4:BOOL=ON",
diff --git a/packaging/flatpak/freerdp.sh b/packaging/flatpak/freerdp.sh
index 1f62b8b7d..5b6a7dbe9 100755
--- a/packaging/flatpak/freerdp.sh
+++ b/packaging/flatpak/freerdp.sh
@@ -1,18 +1,34 @@
 #!/bin/sh
-if [ -z $XDG_SESSION_TYPE ];
+
+if [ -z ${FREERDP_SDL_OFF} ];
 then
-	echo "XDG_SESSION_TYPE undefined"
-	exit -1
-elif [ "$XDG_SESSION_TYPE" = "wayland" ];
-then
-	echo "wayland $(which wlfreerdp)"
-	wlfreerdp $@
-elif [ "$XDG_SESSION_TYPE" = "x11" ];
-then
-	echo "X11 $(which xfreerdp)"
-	xfreerdp $@
+	echo "SDL $(which sdl-freerdp)"
+	sdl-freerdp $@
 	exit $rc
 else
-	echo "XDG_SESSION_TYPE $XDG_SESSION_TYPE not handled"
-	exit -1
+	if [ -z $XDG_SESSION_TYPE ];
+	then
+		echo "XDG_SESSION_TYPE undefined"
+		exit -1
+	elif [ "$XDG_SESSION_TYPE" = "wayland" ];
+	then
+		if [ -z $FREERDP_WAYLAND_OFF ];
+		then
+			echo "wayland $(which wlfreerdp)"
+			wlfreerdp $@
+			exit $rc
+		else
+			echo "X11 $(which xfreerdp)"
+			xfreerdp $@
+			exit $rc
+		fi
+	elif [ "$XDG_SESSION_TYPE" = "x11" ];
+	then
+		echo "X11 $(which xfreerdp)"
+		xfreerdp $@
+		exit $rc
+	else
+		echo "XDG_SESSION_TYPE $XDG_SESSION_TYPE not handled"
+		exit -1
+	fi
 fi