[freerdp] Update to 2.0.0 (#11051)

Signed-off-by: Alexandro Sanchez Bach <alexandro@phi.nz>

4 files changed, 60 insertions, 8 deletions

diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL
index 86dd627a0..4a0cadf16 100644
--- a/ports/freerdp/CONTROL
+++ b/ports/freerdp/CONTROL
@@ -1,5 +1,5 @@
 Source: freerdp
-Version: 2.0.0-rc4-7
+Version: 2.0.0
 Homepage: https://github.com/FreeRDP/FreeRDP
 Description: A free implementation of the Remote Desktop Protocol (RDP)
-Build-Depends: openssl, glib (!windows)
+Build-Depends: openssl, libusb, glib (!windows)
diff --git a/ports/freerdp/fix-libusb.patch b/ports/freerdp/fix-libusb.patch
new file mode 100644
index 000000000..4b79015d8
--- /dev/null
+++ b/ports/freerdp/fix-libusb.patch
@@ -0,0 +1,44 @@
+diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c

+index 94117bcf3..218a56f68 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)

+ 	}

+ }

+ 

+-static void func_iso_callback(struct libusb_transfer* transfer)

++static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer)

+ {

+ 	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

+ 	return NULL;

+ }

+ 

+-static void func_bulk_transfer_cb(struct libusb_transfer* transfer)

++static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer)

+ {

+ 	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 67360ad43..7e46bb0b1 100644

+--- a/channels/urbdrc/client/libusb/libusb_udevman.c

++++ b/channels/urbdrc/client/libusb/libusb_udevman.c

+@@ -597,7 +597,7 @@ static BOOL device_is_filtered(struct libusb_device* dev,

+ 	return filtered;

+ }

+ 

+-static int hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,

++static int LIBUSB_CALL hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,

+                             libusb_hotplug_event event, void* user_data)

+ {

+ 	struct libusb_device_descriptor desc;

+@@ -819,7 +819,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman)

+ 	return rc > 0;

+ }

+ 

+-static DWORD poll_thread(LPVOID lpThreadParameter)

++static DWORD __stdcall poll_thread(LPVOID lpThreadParameter)

+ {

+ 	libusb_hotplug_callback_handle handle;

+ 	UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter;

diff --git a/ports/freerdp/openssl_threads.patch b/ports/freerdp/openssl_threads.patch
index a506b580b..43ebe03e7 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 019926901..9db9ed29b 100644
+index fc068fc84..1bc0f342c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -945,6 +945,7 @@ endif()
- if(OPENSSL_FOUND)
+@@ -930,6 +930,7 @@ if(OPENSSL_FOUND)
  	add_definitions("-DWITH_OPENSSL")
  	message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}")
-+    list(APPEND OPENSSL_LIBRARIES Threads::Threads)
+ 	include_directories(${OPENSSL_INCLUDE_DIR})
++	list(APPEND OPENSSL_LIBRARIES Threads::Threads)
  endif()
  
  if(MBEDTLS_FOUND)
diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
index 0d15187c9..c4f401540 100644
--- a/ports/freerdp/portfile.cmake
+++ b/ports/freerdp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeRDP/FreeRDP
-    REF 2.0.0-rc4
-    SHA512 b4a4d4a58d09010bc45fb90cca148dc4421a4cf0cd5caf288aa702212ef081f14fc418b91f1b79ec8631f582c9ebcdd3031d3333b6a892adb29c402492abb649
+    REF 2.0.0
+    SHA512 efdaa1b018e5166c0f2469663bdd0dc788de0577d0c0cb8b98048a535f8cb07de1078f86aaacc9445d42078d2e02fd7bc7f1ed700ca96032976f6bd84c68ee8f
     HEAD_REF master
     PATCHES
         DontInstallSystemRuntimeLibs.patch
@@ -10,6 +10,7 @@ vcpkg_from_github(
         openssl_threads.patch
         fix-include-install-path.patch
         fix-include-path.patch
+        fix-libusb.patch
 )
 
 if (NOT VCPKG_TARGET_IS_WINDOWS)
@@ -111,6 +112,13 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-Client
     "bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
 )
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(GLOB OBJS ${CURRENT_PACKAGES_DIR}/debug/*.lib)
+    file(REMOVE ${OBJS})
+    file(GLOB OBJS ${CURRENT_PACKAGES_DIR}/*.lib)
+    file(REMOVE ${OBJS})
+endif()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
                     ${CURRENT_PACKAGES_DIR}/debug/share
                     ${CURRENT_PACKAGES_DIR}/debug/lib/cmake