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

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

4 files changed, 44 insertions, 18 deletions

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(