From 41c528d4772a6241c54d478f026eacdde7f04b67 Mon Sep 17 00:00:00 2001
From: Lily <47812810+LilyWangL@users.noreply.github.com>
Date: Wed, 24 Jun 2020 03:59:16 +0800
Subject: [PATCH] [freerdp] Update to version 2.1.1 (#12050)

---
 ports/freerdp/CONTROL          |  2 +-
 ports/freerdp/fix-libusb.patch | 88 +++++++++++++++++-----------------
 ports/freerdp/portfile.cmake   |  4 +-
 3 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL
index 6191d0fbb..a87f32956 100644
--- a/ports/freerdp/CONTROL
+++ b/ports/freerdp/CONTROL
@@ -1,5 +1,5 @@
 Source: freerdp
-Version: 2.0.0-1
+Version: 2.1.1
 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-libusb.patch b/ports/freerdp/fix-libusb.patch
index 4b79015d8..98debdd21 100644
--- a/ports/freerdp/fix-libusb.patch
+++ b/ports/freerdp/fix-libusb.patch
@@ -1,44 +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/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c
+index 94117bc..218a56f 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 973d9c1..1d1548b 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,
+ 	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)
+ {
+ 	VID_PID_PAIR pair;
+@@ -828,7 +828,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/portfile.cmake b/ports/freerdp/portfile.cmake
index e6d9fb289..8e8f6fa2b 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
-    SHA512 efdaa1b018e5166c0f2469663bdd0dc788de0577d0c0cb8b98048a535f8cb07de1078f86aaacc9445d42078d2e02fd7bc7f1ed700ca96032976f6bd84c68ee8f
+    REF 1923e63516c1182bd5e917aeac563431e8c5381a #2.1.1
+    SHA512 9745959e0960cd02ef4c890139eb5b69932bca19eab8311f21ba1eae6d5f2e1d6d05a36275053e5111805bd4206ab93ad4e0b8f1fb10e74360297c51cfefbc96
     HEAD_REF master
     PATCHES
         DontInstallSystemRuntimeLibs.patch