[freerdp] Update to the latest version (#13709)

6 files changed, 41 insertions, 42 deletions

diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL
index 3eb885b91..1c78dfbb1 100644
--- a/ports/freerdp/CONTROL
+++ b/ports/freerdp/CONTROL
@@ -1,5 +1,5 @@
 Source: freerdp
-Version: 2.1.1-1
+Version: 2.2.0
 Homepage: https://github.com/FreeRDP/FreeRDP
 Description: A free implementation of the Remote Desktop Protocol (RDP)
 Build-Depends: openssl, glib (!windows)
diff --git a/ports/freerdp/fix-include-install-path.patch b/ports/freerdp/fix-include-install-path.patch
deleted file mode 100644
index 305cb3cde..000000000
--- a/ports/freerdp/fix-include-install-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt

-index a020dc5..0bc1157 100644

---- a/include/CMakeLists.txt

-+++ b/include/CMakeLists.txt

-@@ -19,7 +19,7 @@

- 

- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)

- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h)

--set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp)

-+set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp)

- 

- file(GLOB FREERDP_HEADERS "freerdp/*.h")

- install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers)

-diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt

-index 452383d..3faab0c 100644

---- a/winpr/include/CMakeLists.txt

-+++ b/winpr/include/CMakeLists.txt

-@@ -17,7 +17,7 @@

- 

- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)

- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)

--set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)

-+set(WINPR_INSTALL_INCLUDE_DIR include/winpr)

- 

- file(GLOB WINPR_HEADERS "winpr/*.h")

- install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)

diff --git a/ports/freerdp/fix-include-path.patch b/ports/freerdp/fix-include-path.patch
index e9efc3bd3..4a9f7d641 100644
--- a/ports/freerdp/fix-include-path.patch
+++ b/ports/freerdp/fix-include-path.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 019926901..91973c888 100644
+index 97ba2f9..64a2f33 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -103,7 +103,7 @@ else()
+@@ -107,7 +107,7 @@ else()
  endif()
  message("FREERDP_VERSION=${FREERDP_VERSION_FULL}")
  
@@ -11,11 +11,24 @@ index 019926901..91973c888 100644
  
  # Compatibility options
  if(DEFINED STATIC_CHANNELS)
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index a020dc5..0bc1157 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h)
+-set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp)
++set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp)
+ 
+ file(GLOB FREERDP_HEADERS "freerdp/*.h")
+ install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers)
 diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
-index 2da25a426..b06f718e9 100644
+index a94090a..08b6b88 100644
 --- a/winpr/CMakeLists.txt
 +++ b/winpr/CMakeLists.txt
-@@ -193,7 +193,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
+@@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
  
  	SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
  
@@ -24,3 +37,16 @@ index 2da25a426..b06f718e9 100644
  
  	configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake
  		INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR}
+diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt
+index 452383d..3faab0c 100644
+--- a/winpr/include/CMakeLists.txt
++++ b/winpr/include/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
+-set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)
++set(WINPR_INSTALL_INCLUDE_DIR include/winpr)
+ 
+ file(GLOB WINPR_HEADERS "winpr/*.h")
+ install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
diff --git a/ports/freerdp/fix-libusb.patch b/ports/freerdp/fix-libusb.patch
index 98debdd21..c6da6eb92 100644
--- a/ports/freerdp/fix-libusb.patch
+++ b/ports/freerdp/fix-libusb.patch
@@ -1,8 +1,8 @@
 diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c
-index 94117bc..218a56f 100644
+index 214cb7a..56c986c 100644
 --- a/channels/urbdrc/client/libusb/libusb_udevice.c
 +++ b/channels/urbdrc/client/libusb/libusb_udevice.c
-@@ -168,7 +168,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data)
+@@ -184,7 +184,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data)
  	}
  }
  
@@ -11,7 +11,7 @@ index 94117bc..218a56f 100644
  {
  	ASYNC_TRANSFER_USER_DATA* user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data;
  #if defined(HAVE_STREAM_ID_API)
-@@ -269,7 +269,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT
+@@ -285,7 +285,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT
  	return NULL;
  }
  
@@ -21,7 +21,7 @@ index 94117bc..218a56f 100644
  	ASYNC_TRANSFER_USER_DATA* user_data;
  	uint32_t streamID;
 diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c
-index 973d9c1..1d1548b 100644
+index 2eebc1a..399ecbb 100644
 --- a/channels/urbdrc/client/libusb/libusb_udevman.c
 +++ b/channels/urbdrc/client/libusb/libusb_udevman.c
 @@ -550,7 +550,7 @@ static BOOL device_is_filtered(struct libusb_device* dev,
diff --git a/ports/freerdp/openssl_threads.patch b/ports/freerdp/openssl_threads.patch
index 43ebe03e7..ca312df40 100644
--- a/ports/freerdp/openssl_threads.patch
+++ b/ports/freerdp/openssl_threads.patch
@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc068fc84..1bc0f342c 100644
+index 97ba2f9..fc36185 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -930,6 +930,7 @@ if(OPENSSL_FOUND)
+@@ -907,6 +907,7 @@ if(OPENSSL_FOUND)
  	add_definitions("-DWITH_OPENSSL")
  	message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}")
  	include_directories(${OPENSSL_INCLUDE_DIR})
-+	list(APPEND OPENSSL_LIBRARIES Threads::Threads)
++    list(APPEND OPENSSL_LIBRARIES Threads::Threads)
  endif()
  
  if(MBEDTLS_FOUND)
diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
index 0510f5961..6907618fa 100644
--- a/ports/freerdp/portfile.cmake
+++ b/ports/freerdp/portfile.cmake
@@ -1,14 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeRDP/FreeRDP
-    REF 1923e63516c1182bd5e917aeac563431e8c5381a #2.1.1
-    SHA512 9745959e0960cd02ef4c890139eb5b69932bca19eab8311f21ba1eae6d5f2e1d6d05a36275053e5111805bd4206ab93ad4e0b8f1fb10e74360297c51cfefbc96
+    REF d2ba84a6885f57674098fe8e76c5f99d880e580d #2.2.0
+    SHA512 3f166213039358dc0cab09b8895e6cff8a7a9c7e7711ea5652604fc6070b1524aba9fec3b860f4deb1f54ea1f17709ab25ffb108116e2914800e892efb9fb9ae
     HEAD_REF master
     PATCHES
         DontInstallSystemRuntimeLibs.patch
         fix-linux-build.patch
         openssl_threads.patch
-        fix-include-install-path.patch
         fix-include-path.patch
         fix-libusb.patch
 )
@@ -16,7 +15,7 @@ vcpkg_from_github(
 if (NOT VCPKG_TARGET_IS_WINDOWS)
     message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n    libxfixes-dev\n")
 endif()
-if (VCPKG_TARGET_IS_OSX)
+if (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
     set(FREERDP_WITH_CLIENT -DWITH_CLIENT=OFF)
 endif()