[libplist/libusbmuxd/libimobiledevice/libideviceactivation/usbmuxd] Update version (#13811)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

19 files changed, 253 insertions, 50 deletions

diff --git a/ports/libgpod/CMakeLists.txt b/ports/libgpod/CMakeLists.txt
index ea1294906..f74038d71 100644
--- a/ports/libgpod/CMakeLists.txt
+++ b/ports/libgpod/CMakeLists.txt
@@ -16,8 +16,8 @@ if (NOT glib_FOUND)
 endif()

 

 find_path(plist_PATH plist++.h PATH_SUFFIXES plist)

-find_library(plist_LIBRARY_RELEASE NAMES plist PATHS lib)

-find_library(plist_LIBRARY_DEBUG NAMES plist PATHS debug/lib)

+find_library(plist_LIBRARY_RELEASE NAMES plist plist-2.0 libplist libplist-2.0 PATHS lib)

+find_library(plist_LIBRARY_DEBUG NAMES plist plist-2.0 libplist libplist-2.0 PATHS debug/lib)

 select_library_configurations(plist)

 if (NOT plist_FOUND)

 	message(FATAL_ERROR "plist not found.")

diff --git a/ports/libgpod/CONTROL b/ports/libgpod/CONTROL
index 2d6fe295c..f681cdf35 100644
--- a/ports/libgpod/CONTROL
+++ b/ports/libgpod/CONTROL
@@ -1,6 +1,6 @@
 Source: libgpod

 Version: 2019-08-29

-Port-Version: 1

+Port-Version: 2

 Homepage: https://github.com/fadingred/libgpod

 Description: libgpod is a library meant to abstract access to an iPod content.

 Build-Depends: glib, libplist, sqlite3
\ No newline at end of file
diff --git a/ports/libideviceactivation/CMakeLists.txt b/ports/libideviceactivation/CMakeLists.txt
index 3b4095eba..05ab295e6 100644
--- a/ports/libideviceactivation/CMakeLists.txt
+++ b/ports/libideviceactivation/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 project(libideviceactivation C)
 
 # find dependencies
-find_library(libplist plist REQUIRED)
+find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED)
 find_path(libimobiledevice_INCLUDES endianness.h)
-find_library(libimobiledevice libimobiledevice REQUIRED)
+find_library(libimobiledevice NAMES imobiledevice imobiledevice-1.0 libimobiledevice libimobiledevice-1.0 REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(CURL REQUIRED)
 
diff --git a/ports/libideviceactivation/CONTROL b/ports/libideviceactivation/CONTROL
index 9fc1ed98e..24bec86a7 100644
--- a/ports/libideviceactivation/CONTROL
+++ b/ports/libideviceactivation/CONTROL
@@ -1,4 +1,4 @@
 Source: libideviceactivation

-Version: 1.2.137
+Version: 1.2.235

 Description: A library to handle the activation process of iOS devices

-Build-Depends: libimobiledevice, libxml2, curl, libplist
\ No newline at end of file
+Build-Depends: libimobiledevice, libxml2, curl, libplist

diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake
index 87eecc757..ad5bbfbcb 100644
--- a/ports/libideviceactivation/portfile.cmake
+++ b/ports/libideviceactivation/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/libideviceactivation

-    REF de6008a6bd66a96bb11468b8b137704f0fef2c54 # v1.2.137
-    SHA512 cdf72702c465cb3e405db067fa96e2979b8c32e7798bcdb9e7286c4bc9392639cb0d31622c321453f635ef5212e645d300f3b420a847fb16fa05425c4882be95

+    REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.2.235
+    SHA512 18fdf1b42744da33e0f0f037e83a72b76cc0b63a0b712e78d9736adcde113582327f3712bc2bfa7b6fdb692465700a9106286f383fd7d11f9351ca7939b20e24

     HEAD_REF msvc-master

 )

 

diff --git a/ports/libimobiledevice/CMakeLists.txt b/ports/libimobiledevice/CMakeLists.txt
index 2e71ec0cd..176eb8933 100644
--- a/ports/libimobiledevice/CMakeLists.txt
+++ b/ports/libimobiledevice/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 project(libimobiledevice C)
 
 # find dependencies
-find_library(libplist plist REQUIRED)
+find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED)
 find_library(libusbmuxd libusbmuxd REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_path(dirent_INCLUDE_DIR dirent.h)
@@ -20,6 +20,7 @@ file(GLOB_RECURSE IMOBDEV_PRIVATE_HDR src/*.h)
 file(GLOB_RECURSE IMOBDEV_SRC src/*.c)
 
 add_library(libimobiledevice ${IMOBDEV_SRC} ${IMOBDEV_PUBLIC_HDR} ${IMOBDEV_PUBLIC_SUB_HDR} ${IMOBDEV_PRIVATE_HDR} ${IMOBDEV_COMMON_HDR} ${IMOBDEV_COMMON_SRC})
+set_target_properties(libimobiledevice PROPERTIES OUTPUT_NAME libimobiledevice-1.0)
 target_include_directories(libimobiledevice PRIVATE ${dirent_INCLUDE_DIR} include .)
 target_compile_definitions(libimobiledevice PRIVATE -DHAVE_OPENSSL)
 target_link_libraries(libimobiledevice PRIVATE ${libplist} ${libusbmuxd} ${getopt} OpenSSL::SSL OpenSSL::Crypto)
@@ -35,6 +36,15 @@ install(
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
 )
+
+set(LIBPLIST_VERSION 2.0)
+set(LIBUSBMUXD_VERSION 2.0)
+set(PACKAGE_NAME libimobiledevice)
+set(PACKAGE_VERSION 1.0)
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix \${prefix})
+set(libdir \${prefix}/lib)
+set(includedir \${prefix}/../include)
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-1.0.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc
@@ -42,7 +52,7 @@ configure_file(
 )
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc
-    DESTINATION lib/libimobiledevice
+    DESTINATION lib/pkgconfig
 )
 
 install(FILES ${IMOBDEV_PUBLIC_HDR} DESTINATION include)
diff --git a/ports/libimobiledevice/CONTROL b/ports/libimobiledevice/CONTROL
index 8a517ec22..8f84a4eb4 100644
--- a/ports/libimobiledevice/CONTROL
+++ b/ports/libimobiledevice/CONTROL
@@ -1,5 +1,5 @@
 Source: libimobiledevice

-Version: 1.2.185

+Version: 1.3.6
 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
diff --git a/ports/libimobiledevice/fix-functions-declaration.patch b/ports/libimobiledevice/fix-functions-declaration.patch
new file mode 100644
index 000000000..704df70bb
--- /dev/null
+++ b/ports/libimobiledevice/fix-functions-declaration.patch
@@ -0,0 +1,112 @@
+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 3e6dca5ad..4453de357 100644
--- a/ports/libimobiledevice/portfile.cmake
+++ b/ports/libimobiledevice/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/libimobiledevice

-    REF 37cb65f04249705eb5844821fd925b9edee8866c # v1.2.185
-    SHA512 00a44de9552d3cf3daf3d490ad700188e20c72b24b8a6e9ca32d1d9fa53572479a5cbe85d130cd24fb1a2528c5e2cb238ab4caab35c5d93033c53b5c4c189bc6

+    REF b30267ac1fb46f2b1d2d5e585aaa73c0f4ce8ad8 # v1.3.6

+    SHA512 47912571726c38fe3c306a5e7c76b4042994b53a30794432a5af7eae5a30855d39828c52048b1a90b837306e6d5c447fc11d8521669258e76231cfdd6aef17d9

     HEAD_REF msvc-master

+    PATCHES

+        fix-functions-declaration.patch

 )

 

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

@@ -15,6 +17,7 @@ vcpkg_configure_cmake(
 

 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

+vcpkg_fixup_pkgconfig()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 

diff --git a/ports/libplist/CMakeLists.txt b/ports/libplist/CMakeLists.txt
index 0752c2e5b..9feb69746 100644
--- a/ports/libplist/CMakeLists.txt
+++ b/ports/libplist/CMakeLists.txt
@@ -1,33 +1,75 @@
 cmake_minimum_required(VERSION 3.8)

-project(plist C)

+project(plist C CXX)

 

 file(GLOB_RECURSE PLIST_HEADER include/plist/*.h)

-file(GLOB_RECURSE PLIST_SRC src/*.c)

+

+set(PLIST_SRC

+    src/base64.c

+    src/bytearray.c

+    src/hashtable.c

+    src/ptrarray.c

+    src/time64.c

+    src/xplist.c

+    src/bplist.c

+    src/plist.c

+)

+

+set(PLISTPP_SRC

+    src/Node.cpp

+    src/Structure.cpp

+    src/Array.cpp

+    src/Boolean.cpp

+    src/Data.cpp

+    src/Date.cpp

+    src/Dictionary.cpp

+    src/Integer.cpp

+    src/Key.cpp

+    src/Real.cpp

+    src/String.cpp

+    src/Uid.cpp

+)

 

 file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h)

 file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c)

 

 add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})

 target_include_directories(plist PRIVATE src include libcnary/include)

+set_target_properties(plist PROPERTIES OUTPUT_NAME plist-2.0)

+

+add_library(plist++ STATIC ${PLISTPP_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})

+set_target_properties(plist++ PROPERTIES OUTPUT_NAME plist++-2.0)

+target_include_directories(plist++ PRIVATE src include libcnary/include)

 

-if(WIN32)

+if(WIN32 AND BUILD_SHARED_LIBS)

     target_compile_options(plist PRIVATE -W3 -WX- -sdl-)

     target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS)

+    target_compile_options(plist++ PRIVATE -W3 -WX- -sdl-)

+    target_compile_definitions(plist++ PRIVATE -DLIBPLIST_EXPORTS)

 endif()

+target_link_libraries(plist++ PRIVATE plist)

 

 install(

-    TARGETS plist

+    TARGETS plist plist++

     RUNTIME DESTINATION bin

     ARCHIVE DESTINATION lib

     LIBRARY DESTINATION lib

 )

+

+set(PACKAGE_NAME libplist)

+set(PACKAGE_VERSION 2.0)

+set(prefix ${CMAKE_INSTALL_PREFIX})

+set(exec_prefix \${prefix})

+set(libdir \${prefix}/lib)

+set(includedir \${prefix}/../include)

+foreach (PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc)

 configure_file(

-    ${CMAKE_CURRENT_SOURCE_DIR}/src/libplist.pc.in

-    ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc

+    ${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in

+    ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}

     @ONLY

 )

 install(

-    FILES ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc

+    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}

     DESTINATION lib/pkgconfig)

+endforeach()

 

-install(FILES ${PLIST_HEADER} DESTINATION include/plist)
\ No newline at end of file
+install(FILES ${PLIST_HEADER} DESTINATION include/plist)

diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL
index b7aa23a76..e6ba166f0 100644
--- a/ports/libplist/CONTROL
+++ b/ports/libplist/CONTROL
@@ -1,3 +1,3 @@
 Source: libplist

-Version: 1.2.185
+Version: 1.3.6
 Description: A library to handle Apple Property List format in binary or XML 

diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake
index 4e59e9081..5137b4046 100644
--- a/ports/libplist/portfile.cmake
+++ b/ports/libplist/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_CRT ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/libplist

-    REF efeba335a63110d9ce2b3cd2481743cb0028d9c7 # v1.2.185
-    SHA512 c2f742a60c7a6e0601d33eae03d934f2cdb01fdd121be33212955f261a6756c14753ff3c8e173375b228f44f007d7a96ff6833ae66b5a8a6c7c245017cdc9b07

+    REF bbba7cabb78aad180a7a982ada5e1f21ff0ba873 # v1.3.6
+    SHA512 4cd59ed87c647259d0da99a20a05e01aa880f01f6b5cecd29e4247029a3d29f0f68b4552571eb3fd3c5549b4cb357801ffe43338b8ff34d44d6be5393d2e6b9d

     HEAD_REF msvc-master

     PATCHES dllexport.patch

 )

@@ -18,6 +18,7 @@ vcpkg_configure_cmake(
 

 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

+vcpkg_fixup_pkgconfig()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 

diff --git a/ports/libusbmuxd/CMakeLists.txt b/ports/libusbmuxd/CMakeLists.txt
index 3b314fb35..254a70d7e 100644
--- a/ports/libusbmuxd/CMakeLists.txt
+++ b/ports/libusbmuxd/CMakeLists.txt
@@ -4,7 +4,7 @@ project(libusbmuxd C)
 # find dependencies
 find_path(libplist_INCLUDES plist.h PATH_SUFFIXES plist)
 set(libplist_INCLUDES ${libplist_INCLUDES}/../)
-find_library(libplist plist REQUIRED)
+find_library(libplist NAMES plist libplist plist-2.0 libplist-2.0 REQUIRED)
 
 # ready to create library
 file(GLOB_RECURSE IDVCACTV_TOOLS_HDR common/*.h)
@@ -29,13 +29,21 @@ install(
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
 )
+
+set(LIBPLIST_VERSION 2.0)
+set(PACKAGE_NAME libusbmuxd)
+set(PACKAGE_VERSION 2.0)
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix \${prefix})
+set(libdir \${prefix}/lib)
+set(includedir \${prefix}/../include)
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/libusbmuxd.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd.pc
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/libusbmuxd-2.0.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc
     @ONLY
 )
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd.pc
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc
     DESTINATION lib/pkgconfig
 )
 
diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL
index 615147f46..72d5257cf 100644
--- a/ports/libusbmuxd/CONTROL
+++ b/ports/libusbmuxd/CONTROL
@@ -1,5 +1,5 @@
 Source: libusbmuxd

-Version: 1.2.185-1
+Version: 1.2.219
 Description: A client library to multiplex connections from and to iOS devices

 Build-Depends: libplist

 Supports: !(uwp|linux|osx)

diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake
index 26518b217..5ad0cb01f 100644
--- a/ports/libusbmuxd/portfile.cmake
+++ b/ports/libusbmuxd/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/libusbmuxd

-    REF 65561d92bc4786599c90a257d856cede3519e432 # v1.2.185
-    SHA512 b3bcf2a5d99a605431ba22fe5701068ea6a2c4284044412e3e1d3dc57bb7b42adac20cf21c0d8e09965c8e8f7bcffc72b5949eaefaa48d024d2a3cb16329ed78

+    REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219
+    SHA512 ced85088bc6ebb416ccb635d6b4e79662fb34f427d869b64b61847e5fde7b4ae094cebb1f7916d9387c314aeb84106a618fbd7497dc4b36151b236dcb55bd0e4

     HEAD_REF msvc-master

     PATCHES fix-win-build.patch

 )

@@ -18,6 +18,7 @@ vcpkg_configure_cmake(
 

 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

+vcpkg_fixup_pkgconfig()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 

diff --git a/ports/usbmuxd/CONTROL b/ports/usbmuxd/CONTROL
index 0dee4ed26..9ad179c88 100644
--- a/ports/usbmuxd/CONTROL
+++ b/ports/usbmuxd/CONTROL
@@ -1,5 +1,5 @@
 Source: usbmuxd

-Version: 1.2.76-1

+Version: 1.2.235
 Homepage: http://www.libimobiledevice.org
 Description: A socket daemon to multiplex connections from and to iOS devices

 Build-Depends: libimobiledevice, libusb, libusb-win32, pthreads

diff --git a/ports/usbmuxd/fix-definitions.patch b/ports/usbmuxd/fix-definitions.patch
new file mode 100644
index 000000000..342280524
--- /dev/null
+++ b/ports/usbmuxd/fix-definitions.patch
@@ -0,0 +1,40 @@
+diff --git a/usbmuxd.vcxproj b/usbmuxd.vcxproj

+index 1500a8a..61362c3 100644

+--- a/usbmuxd.vcxproj

++++ b/usbmuxd.vcxproj

+@@ -129,7 +129,7 @@

+       </PrecompiledHeader>

+       <WarningLevel>Level3</WarningLevel>

+       <Optimization>Disabled</Optimization>

+-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>

++      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>

+       <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>

+     </ClCompile>

+     <Link>

+@@ -144,7 +144,7 @@

+       </PrecompiledHeader>

+       <WarningLevel>Level3</WarningLevel>

+       <Optimization>Disabled</Optimization>

+-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>

++      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>

+     </ClCompile>

+     <Link>

+       <SubSystem>Console</SubSystem>

+@@ -160,7 +160,7 @@

+       <Optimization>MaxSpeed</Optimization>

+       <FunctionLevelLinking>true</FunctionLevelLinking>

+       <IntrinsicFunctions>true</IntrinsicFunctions>

+-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>

++      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>

+       <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>

+     </ClCompile>

+     <Link>

+@@ -179,7 +179,7 @@

+       <Optimization>MaxSpeed</Optimization>

+       <FunctionLevelLinking>true</FunctionLevelLinking>

+       <IntrinsicFunctions>true</IntrinsicFunctions>

+-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>

++      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>

+     </ClCompile>

+     <Link>

+       <SubSystem>Console</SubSystem>

diff --git a/ports/usbmuxd/fix-dependence-libimobiledevice.patch b/ports/usbmuxd/fix-dependence-libimobiledevice.patch
deleted file mode 100644
index 77308345d..000000000
--- a/ports/usbmuxd/fix-dependence-libimobiledevice.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/preflight.c b/src/preflight.c
-index aca193e..f012286 100644
---- a/src/preflight.c
-+++ b/src/preflight.c
-@@ -54,9 +54,6 @@
- #include "log.h"
- 
- #ifdef HAVE_LIBIMOBILEDEVICE
--enum connection_type {
--	CONNECTION_USBMUXD = 1
--};
- 
- struct idevice_private {
- 	char *udid;
diff --git a/ports/usbmuxd/portfile.cmake b/ports/usbmuxd/portfile.cmake
index be0a1d8e4..c9ac23d35 100644
--- a/ports/usbmuxd/portfile.cmake
+++ b/ports/usbmuxd/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/usbmuxd

-    REF v1.2.76
-    SHA512 b1bb479bf4ba0a71d7b70f55db4d01b68e024fe559265947e096d85cd736e4cc23c9ddbe07360641b63a5e1276c243e7fe2aa557323d1f5d22058c9a45de4f1a

+    REF f1329e742825c93fd080bdb8253d710ef8b6f751 # v1.2.235
+    SHA512 3259040a3266ce068a6fa1fdecdea824d22f04391ca073fc61d72a1f6d401d93469b9681ddc89a8016ef410bb7443875b2c5df2b571227dd34c66248cbe87fe7

     HEAD_REF master-msvc

     PATCHES

         fix-dependence-pthreads.patch

-        fix-dependence-libimobiledevice.patch

+        fix-definitions.patch

 )

 

 vcpkg_install_msbuild(