Switch system distro build to FreeRDP 3.x (3.26.0) (Phase 3 / 3)

Dockerfile

@@ -137,7 +137,7 @@ ARG MESA_VERSION="<unknown>"
 ARG PULSEAUDIO_COMMIT="<unknown>"
 ARG WESTON_COMMIT="<unknown>"
 ARG SYSTEMDISTRO_DEBUG_BUILD
-ARG FREERDP_VERSION=2
+ARG FREERDP_VERSION=3
 
 # Fail fast if any required --build-arg is missing or still holds a
 # placeholder value. We have to validate up-front because the values
@@ -265,9 +265,13 @@ RUN cmake -G Ninja \
         -DCMAKE_BUILD_TYPE=${BUILDTYPE_FREERDP} \
         -DWITH_DEBUG_ALL=${WITH_DEBUG_FREERDP} \
         -DWITH_ICU=ON \
+        -DWITH_FFMPEG=OFF \
+        -DWITH_DSP_FFMPEG=OFF \
+        -DWITH_VIDEO_FFMPEG=OFF \
+        -DWITH_SWSCALE=OFF \
+        -DWITH_KRB5=OFF \
         -DWITH_SERVER=ON \
-        -DWITH_CHANNEL_GFXREDIR=ON \
-        -DWITH_CHANNEL_RDPAPPLIST=ON \
+        -DCHANNEL_GFXREDIR=ON \
         -DWITH_CLIENT=OFF \
         -DWITH_CLIENT_COMMON=OFF \
         -DWITH_CLIENT_CHANNELS=OFF \

WSLGd/main.cpp

@@ -165,9 +165,13 @@ void SetupOptionalEnv()
     wIniFile* wslgConfigIniFile = IniFile_New();
     if (wslgConfigIniFile) {
         if (IniFile_ReadFile(wslgConfigIniFile, configFilePath.c_str()) > 0) {
+#if WINPR_VERSION_MAJOR >= 3
+            size_t numKeys = 0;
+#else
             int numKeys = 0;
+#endif
             char **keyNames = IniFile_GetSectionKeyNames(wslgConfigIniFile, c_systemDistroEnvSection, &numKeys);
-            for (int n = 0; keyNames && n < numKeys; n++) {
+            for (decltype(numKeys) n = 0; keyNames && n < numKeys; n++) {
                 const char *value = IniFile_GetKeyValueString(wslgConfigIniFile, c_systemDistroEnvSection, keyNames[n]);
                 if (value) {
                     setenv(keyNames[n], value, true);

WSLGd/precomp.h

@@ -35,5 +35,6 @@
 #include "config.h"
 #include "lxwil.h"
 #if HAVE_WINPR
+#include "winpr/version.h"
 #include "winpr/ini.h"
 #endif // HAVE_WINPR