[freerdp] Update to 3.4.0 (#37465)

ports/freerdp/dependencies.patch

@@ -1,15 +1,3 @@
-diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in
-index 35b74c1..a4e48c9 100644
---- a/client/FreeRDP-ClientConfig.cmake.in
-+++ b/client/FreeRDP-ClientConfig.cmake.in
-@@ -1,6 +1,7 @@
- include(CMakeFindDependencyMacro)
- find_dependency(WinPR @FREERDP_VERSION@)
- find_dependency(FreeRDP @FREERDP_VERSION@)
-+find_dependency(ZLIB)
- 
- @PACKAGE_INIT@
- 
 diff --git a/cmake/FindFeature.cmake b/cmake/FindFeature.cmake
 index bd25fd4..dd180a3 100644
 --- a/cmake/FindFeature.cmake
@@ -32,28 +20,3 @@ index bd25fd4..dd180a3 100644
  			if(${WITH_${_feature_upper}})
  				set(_feature_default "ON")
  				message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})")
-diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in
-index 21ecd59..2613a59 100644
---- a/libfreerdp/FreeRDPConfig.cmake.in
-+++ b/libfreerdp/FreeRDPConfig.cmake.in
-@@ -1,5 +1,7 @@
- include(CMakeFindDependencyMacro)
- find_dependency(WinPR @FREERDP_VERSION@)
-+find_dependency(cJSON)
-+find_dependency(ZLIB)
- 
- @PACKAGE_INIT@
- 
-diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in
-index 21ea0c7..71b8e18 100644
---- a/libfreerdp/freerdp.pc.in
-+++ b/libfreerdp/freerdp.pc.in
-@@ -14,7 +14,7 @@ Description: FreeRDP: A Remote Desktop Protocol Implementation
- URL: http://www.freerdp.com/
- Version: @FREERDP_VERSION@
- Requires: 
--Requires.private: winpr@FREERDP_API_VERSION@
-+Requires.private: winpr@FREERDP_API_VERSION@ libcjson zlib
- Libs: -L${libdir} ${libs}
- Libs.private: -ldl -lpthread
- Cflags: -I${includedir}

ports/freerdp/mingw-tp.patch

@@ -1,26 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeRDP/FreeRDP
     REF "${VERSION}"
-    SHA512 6779d5d4098e0abf65c3c2a2321644a9c78bf7fb3cf0a692be7c88c7f04040c2fb54d63029a2771ead0453f3af17b64dd44136d387eb4a2a4586ccfb72a37c08
+    SHA512 aa96ad2bf30dbe09849ecfb64ec6e60ba4fd3bc2d144c7d576b1e59476ef45d9d744da37806b1c00e3a0413390b35c6d3d4401b89c07c5663122280eca39e501
     HEAD_REF master
     PATCHES
         dependencies.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" "")

ports/freerdp/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "freerdp",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "license": "Apache-2.0",

ports/freerdp/wf-rdpsnd.patch

@@ -1,14 +0,0 @@
-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,21 +0,0 @@
-diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt
-index e125ac3..f44d4a3 100644
---- a/server/Windows/cli/CMakeLists.txt
-+++ b/server/Windows/cli/CMakeLists.txt
-@@ -16,7 +16,7 @@
- # limitations under the License.
- 
- set(MODULE_NAME "wfreerdp-server-cli")
--set(OUTPUT_NAME " wfreerdp-server")
-+set(OUTPUT_NAME "wfreerdp-server")
- set(MODULE_PREFIX "FREERDP_SERVER_WINDOWS_CLI")
- 
- 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

@@ -2821,7 +2821,7 @@
       "port-version": 7
     },
     "freerdp": {
-      "baseline": "3.3.0",
+      "baseline": "3.4.0",
       "port-version": 0
     },
     "freetds": {

versions/f-/freerdp.json

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