[libimobiledevice] Use upstream patched version (#14139)

3 files changed, 6 insertions, 119 deletions

diff --git a/ports/libimobiledevice/CONTROL b/ports/libimobiledevice/CONTROL
index 8f84a4eb4..3a87a5cfd 100644
--- a/ports/libimobiledevice/CONTROL
+++ b/ports/libimobiledevice/CONTROL
@@ -1,5 +1,6 @@
-Source: libimobiledevice

+Source: libimobiledevice
 Version: 1.3.6
+Port-Version: 1
 Homepage: http://www.libimobiledevice.org
-Description: A cross-platform protocol library to communicate with iOS devices

-Build-Depends: libplist, libusbmuxd, openssl, dirent, getopt
\ No newline at end of file
+Description: A cross-platform protocol library to communicate with iOS devices
+Build-Depends: libplist, libusbmuxd, openssl, dirent, getopt
diff --git a/ports/libimobiledevice/fix-functions-declaration.patch b/ports/libimobiledevice/fix-functions-declaration.patch
deleted file mode 100644
index 704df70bb..000000000
--- a/ports/libimobiledevice/fix-functions-declaration.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From dd35fb7fcad54c5ba465bf252e22a82c721fd825 Mon Sep 17 00:00:00 2001
-From: Billy Robert O'Neal III <bion@microsoft.com>
-Date: Mon, 19 Oct 2020 18:22:47 -0700
-Subject: [PATCH] Add dllexports missing from connection_proxy.h functions.
-
----
- include/libimobiledevice/companion_proxy.h | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/include/libimobiledevice/companion_proxy.h b/include/libimobiledevice/companion_proxy.h
-index 19c88ebb..29b8e96d 100644
---- a/include/libimobiledevice/companion_proxy.h
-+++ b/include/libimobiledevice/companion_proxy.h
-@@ -65,7 +65,7 @@ typedef void (*companion_proxy_device_event_cb_t) (plist_t event, void* userdata
-  * @return COMPANION_PROXY_E_SUCCESS on success, COMPANION_PROXY_E_INVALID_ARG when
-  *     the arguments are invalid, or an COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_client_new(idevice_t device, lockdownd_service_descriptor_t service, companion_proxy_client_t* client);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_client_new(idevice_t device, lockdownd_service_descriptor_t service, companion_proxy_client_t* client);
- 
- /**
-  * Starts a new companion_proxy service on the specified device and connects to it.
-@@ -80,7 +80,7 @@ companion_proxy_error_t companion_proxy_client_new(idevice_t device, lockdownd_s
-  * @return COMPANION_PROXY_E_SUCCESS on success, or an COMPANION_PROXY_E_* error
-  *     code otherwise.
-  */
--companion_proxy_error_t companion_proxy_client_start_service(idevice_t device, companion_proxy_client_t* client, const char* label);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_client_start_service(idevice_t device, companion_proxy_client_t* client, const char* label);
- 
- /**
-  * Disconnects a companion_proxy client from the device and frees up the
-@@ -91,7 +91,7 @@ companion_proxy_error_t companion_proxy_client_start_service(idevice_t device, c
-  * @return COMPANION_PROXY_E_SUCCESS on success, COMPANION_PROXY_E_INVALID_ARG when
-  *     client is NULL, or an COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_client_free(companion_proxy_client_t client);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_client_free(companion_proxy_client_t client);
- 
- /**
-  * Sends a plist to the service.
-@@ -102,7 +102,7 @@ companion_proxy_error_t companion_proxy_client_free(companion_proxy_client_t cli
-  * @return COMPANION_PROXY_E_SUCCESS on success,
-  *  COMPANION_PROXY_E_INVALID_ARG when client or plist is NULL
-  */
--companion_proxy_error_t companion_proxy_send(companion_proxy_client_t client, plist_t plist);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_send(companion_proxy_client_t client, plist_t plist);
- 
- /**
-  * Receives a plist from the service.
-@@ -113,7 +113,7 @@ companion_proxy_error_t companion_proxy_send(companion_proxy_client_t client, pl
-  * @return COMPANION_PROXY_E_SUCCESS on success,
-  *  COMPANION_PROXY_E_INVALID_ARG when client or plist is NULL
-  */
--companion_proxy_error_t companion_proxy_receive(companion_proxy_client_t client, plist_t * plist);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_receive(companion_proxy_client_t client, plist_t * plist);
- 
- /**
-  * Retrieves a list of paired devices.
-@@ -127,7 +127,7 @@ companion_proxy_error_t companion_proxy_receive(companion_proxy_client_t client,
-  *  COMPANION_PROXY_E_NO_DEVICES if no devices are paired,
-  *  or a COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_get_device_registry(companion_proxy_client_t client, plist_t* paired_devices);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_get_device_registry(companion_proxy_client_t client, plist_t* paired_devices);
- 
- /**
-  * Starts listening for paired devices.
-@@ -143,7 +143,7 @@ companion_proxy_error_t companion_proxy_get_device_registry(companion_proxy_clie
-  * @return COMPANION_PROXY_E_SUCCESS on success,
-  *  or a COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_start_listening_for_devices(companion_proxy_client_t client, companion_proxy_device_event_cb_t callback, void* userdata);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_start_listening_for_devices(companion_proxy_client_t client, companion_proxy_device_event_cb_t callback, void* userdata);
- 
- /**
-  * Stops listening for paired devices
-@@ -153,7 +153,7 @@ companion_proxy_error_t companion_proxy_start_listening_for_devices(companion_pr
-  * @return COMPANION_PROXY_E_SUCCESS on success,
-  *  or a COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_stop_listening_for_devices(companion_proxy_client_t client);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_stop_listening_for_devices(companion_proxy_client_t client);
- 
- /**
-  * Returns a value for the given key.
-@@ -169,7 +169,7 @@ companion_proxy_error_t companion_proxy_stop_listening_for_devices(companion_pro
-  *  COMPANION_PROXY_E_UNSUPPORTED_KEY if the companion device doesn't support the given key,
-  *  or a COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_get_value_from_registry(companion_proxy_client_t client, const char* companion_udid, const char* key, plist_t* value);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_get_value_from_registry(companion_proxy_client_t client, const char* companion_udid, const char* key, plist_t* value);
- 
- /**
-  * Start forwarding a service port on the companion device to a port on the idevice.
-@@ -186,7 +186,7 @@ companion_proxy_error_t companion_proxy_get_value_from_registry(companion_proxy_
-  * @return COMPANION_PROXY_E_SUCCESS on success,
-  *  or a COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_start_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port, const char* service_name, uint16_t* forward_port, plist_t options);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_start_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port, const char* service_name, uint16_t* forward_port, plist_t options);
- 
- /**
-  * Stop forwarding a service port between companion device and idevice.
-@@ -199,7 +199,7 @@ companion_proxy_error_t companion_proxy_start_forwarding_service_port(companion_
-  * @return COMPANION_PROXY_E_SUCCESS on success,
-  *  or a COMPANION_PROXY_E_* error code otherwise.
-  */
--companion_proxy_error_t companion_proxy_stop_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port);
-+LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_stop_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port);
- 
- #ifdef __cplusplus
- }
diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake
index 4453de357..cfba47859 100644
--- a/ports/libimobiledevice/portfile.cmake
+++ b/ports/libimobiledevice/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/libimobiledevice

-    REF b30267ac1fb46f2b1d2d5e585aaa73c0f4ce8ad8 # v1.3.6

-    SHA512 47912571726c38fe3c306a5e7c76b4042994b53a30794432a5af7eae5a30855d39828c52048b1a90b837306e6d5c447fc11d8521669258e76231cfdd6aef17d9

+    REF 348aec1f714f77c717141f70869ac7c996c3c6fb # v1.3.6 + patches

+    SHA512 fc7924667c3cb07025fd25ff94610ae57a90a8fd4502393e89993bfcd13c5e0c609efbf0343f344f59a8520ba4f7805925fea4c06d20ac1680f63f16aac12542

     HEAD_REF msvc-master

-    PATCHES

-        fix-functions-declaration.patch

 )

 

 configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)