[freerdp] Update to 3.3.0 (#37081)

ports/freerdp/DontInstallSystemRuntimeLibs.patch

@@ -1,17 +0,0 @@
-diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
-index 6ccfc7d..75479bf 100644
---- a/CMakeCPack.cmake
-+++ b/CMakeCPack.cmake
-@@ -67,9 +67,9 @@ if(MSVC)
- 		set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
- 		include(InstallRequiredSystemLibraries)
- 
--		install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
--			DESTINATION ${CMAKE_INSTALL_BINDIR}
--			COMPONENT libraries)
-+		# install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
-+		# 	DESTINATION ${CMAKE_INSTALL_BINDIR}
-+		# 	COMPONENT libraries)
- 	endif()
- endif()
- 

ports/freerdp/install-layout.patch

@@ -2,8 +2,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 1633656..db346d3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -158,7 +158,7 @@ endif()
- message(STATUS "Git Revision ${GIT_REVISION}")
+@@ -149,7 +149,7 @@ message(STATUS "Git Revision ${GIT_REVISION}")
+ set(FREERDP_DEFAULT_PROJECT_VERSION ${FREERDP_VERSION} CACHE STRING INTERNAL)
  
  set(FREERDP_MAJOR_DIR "freerdp${FREERDP_VERSION_MAJOR}")
 -set(FREERDP_INCLUDE_DIR "include/${FREERDP_MAJOR_DIR}/")
@@ -12,8 +12,8 @@ index 1633656..db346d3 100644
  option(WITH_SMARTCARD_EMULATE "Emulate smartcards instead of redirecting readers" ON)
  if (WITH_SMARTCARD_EMULATE)
 @@ -711,6 +711,9 @@ else()
- 	set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
- 	set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}")
+ 		set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}")
+ 	endif()
  endif()
 +set(FREERDP_DATA_PATH "share/freerdp")
 +set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")

ports/freerdp/mingw-tp.patch

@@ -0,0 +1,26 @@
+diff --git a/winpr/libwinpr/pool/pool.c b/winpr/libwinpr/pool/pool.c
+index 6c66b42..784f75a 100644
+--- a/winpr/libwinpr/pool/pool.c
++++ b/winpr/libwinpr/pool/pool.c
+@@ -1,3 +1,8 @@
++#ifdef __MINGW32__
++#define _TP_CALLBACK_INSTANCE S_TP_CALLBACK_INSTANCE
++#define _TP_POOL S_TP_POOL
++#define _TP_WORK S_TP_WORK
++#endif
+ /**
+  * WinPR: Windows Portable Runtime
+  * Thread Pool API (Pool)
+diff --git a/winpr/libwinpr/pool/work.c b/winpr/libwinpr/pool/work.c
+index e83f417..423b998 100644
+--- a/winpr/libwinpr/pool/work.c
++++ b/winpr/libwinpr/pool/work.c
+@@ -1,3 +1,8 @@
++#ifdef __MINGW32__
++#define _TP_CALLBACK_INSTANCE S_TP_CALLBACK_INSTANCE
++#define _TP_POOL S_TP_POOL
++#define _TP_WORK S_TP_WORK
++#endif
+ /**
+  * WinPR: Windows Portable Runtime
+  * Thread Pool API (Work)

ports/freerdp/msvc-arm64.patch

@@ -0,0 +1,13 @@
+diff --git a/winpr/include/winpr/intrin.h b/winpr/include/winpr/intrin.h
+index 066f45f..0e61d4d 100644
+--- a/winpr/include/winpr/intrin.h
++++ b/winpr/include/winpr/intrin.h
+@@ -22,7 +22,7 @@
+ #ifndef WINPR_INTRIN_H
+ #define WINPR_INTRIN_H
+ 
+-#if !defined(_WIN32) || defined(__MINGW32__)
++#if !defined(_WIN32) || defined(__MINGW32__) || defined(_M_ARM64)
+ 
+ /**
+  * __lzcnt16, __lzcnt, __lzcnt64:

ports/freerdp/portfile.cmake

@@ -2,17 +2,20 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeRDP/FreeRDP
     REF "${VERSION}"
-    SHA512 6c9061674716ca8c83a3913222db4002d893d751b0072a8af10013e09462a9cc847689dc874e30c499ae0d5be73c464f610057744c771fcd678bc43185d0f923
+    SHA512 6779d5d4098e0abf65c3c2a2321644a9c78bf7fb3cf0a692be7c88c7f04040c2fb54d63029a2771ead0453f3af17b64dd44136d387eb4a2a4586ccfb72a37c08
     HEAD_REF master
     PATCHES
         dependencies.patch
-        DontInstallSystemRuntimeLibs.patch
         install-layout.patch
         keep-dup-libs.patch
         windows-linkage.patch
         wfreerdp-server-cli.patch
+        wf-rdpsnd.patch
+        msvc-arm64.patch
+        mingw-tp.patch
 )
 file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg")
+file(WRITE "${SOURCE_PATH}/CMakeCPack.cmake" "")
 
 if("x11" IN_LIST FEATURES)
     message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n    libxfixes-dev\n")

ports/freerdp/vcpkg.json

@@ -1,17 +1,12 @@
 {
   "name": "freerdp",
-  "version": "3.0.0",
-  "port-version": 1,
+  "version": "3.3.0",
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "license": "Apache-2.0",
-  "supports": "!uwp & !(arm & windows)",
+  "supports": "!uwp",
   "dependencies": [
     "cjson",
-    {
-      "name": "glib",
-      "platform": "!windows"
-    },
     "openssl",
     {
       "name": "vcpkg-cmake",

ports/freerdp/wf-rdpsnd.patch

@@ -0,0 +1,14 @@
+diff --git a/server/Windows/wf_rdpsnd.c b/server/Windows/wf_rdpsnd.c
+index b313c35..cb961e5 100644
+--- a/server/Windows/wf_rdpsnd.c
++++ b/server/Windows/wf_rdpsnd.c
+@@ -49,7 +49,8 @@ static void wf_peer_rdpsnd_activated(RdpsndServerContext* context)
+ 	wfi->agreed_format = NULL;
+ 	WLog_DBG(TAG, "Client supports the following %d formats:", context->num_client_formats);
+ 
+-	for (size_t i = 0; i < context->num_client_formats; i++)
++	size_t i = 0;
++	for (; i < context->num_client_formats; i++)
+ 	{
+ 		// TODO: improve the way we agree on a format
+ 		for (size_t j = 0; j < context->num_server_formats; j++)

ports/freerdp/wfreerdp-server-cli.patch

@@ -1,13 +1,21 @@
 diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt
-index 58d5df0..fdba313 100644
+index e125ac3..f44d4a3 100644
 --- a/server/Windows/cli/CMakeLists.txt
 +++ b/server/Windows/cli/CMakeLists.txt
-@@ -41,7 +41,7 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/
+@@ -16,7 +16,7 @@
+ # limitations under the License.
  
- add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+ set(MODULE_NAME "wfreerdp-server-cli")
+-set(OUTPUT_NAME " wfreerdp-server")
++set(OUTPUT_NAME "wfreerdp-server")
+ set(MODULE_PREFIX "FREERDP_SERVER_WINDOWS_CLI")
  
--set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME})
-+set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_NAME wfreerdp-server PDB_NAME wfreerdp-server.exe)
+ include_directories(..)
+@@ -45,6 +45,7 @@ if (WITH_BINARY_VERSIONING)
+ 	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}${FREERDP_API_VERSION}")
+ else()
+ 	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}")
++	set_target_properties(${MODULE_NAME} PROPERTIES PDB_NAME "${OUTPUT_NAME}.exe")
+ endif()
  
  set(${MODULE_PREFIX}_LIBS wfreerdp-server)
- 

versions/baseline.json

@@ -2813,8 +2813,8 @@
       "port-version": 7
     },
     "freerdp": {
-      "baseline": "3.0.0",
-      "port-version": 1
+      "baseline": "3.3.0",
+      "port-version": 0
     },
     "freetds": {
       "baseline": "1.3.10",

versions/f-/freerdp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f1fe757a2b2afeb57dc797fec8afe8b75b3af57d",
+      "version": "3.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "58d88811f61ec9063eb70b837f23c6ceeceb0198",
       "version": "3.0.0",