[libusb] upgrade and support arm64 (#8976)

4 files changed, 5 insertions, 99 deletions

diff --git a/ports/libusb/CONTROL b/ports/libusb/CONTROL
index d8b7d7042..8e3516132 100644
--- a/ports/libusb/CONTROL
+++ b/ports/libusb/CONTROL
@@ -1,4 +1,4 @@
 Source: libusb
-Version: 1.0.22-4
+Version: 1.0.23
 Homepage: https://github.com/libusb/libusb
 Description: a cross-platform library to access USB devices
diff --git a/ports/libusb/fix_c2001.patch b/ports/libusb/fix_c2001.patch
deleted file mode 100644
index 38c4774a1..000000000
--- a/ports/libusb/fix_c2001.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/msvc/libusb_dll_2015.vcxproj b/msvc/libusb_dll_2015.vcxproj
-index ce562f1..e5a19fd 100644
---- a/msvc/libusb_dll_2015.vcxproj
-+++ b/msvc/libusb_dll_2015.vcxproj
-@@ -53,10 +53,18 @@
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-       <Optimization>Disabled</Optimization>
-       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <ClCompile Condition="'$(Configuration)'=='Release'">
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <Link>
-       <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
-diff --git a/msvc/libusb_dll_2017.vcxproj b/msvc/libusb_dll_2017.vcxproj
-index 8311300..f635aed 100644
---- a/msvc/libusb_dll_2017.vcxproj
-+++ b/msvc/libusb_dll_2017.vcxproj
-@@ -53,10 +53,18 @@
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-       <Optimization>Disabled</Optimization>
-       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <ClCompile Condition="'$(Configuration)'=='Release'">
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <Link>
-       <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
-diff --git a/msvc/libusb_static_2015.vcxproj b/msvc/libusb_static_2015.vcxproj
-index a182171..ce4cc66 100644
---- a/msvc/libusb_static_2015.vcxproj
-+++ b/msvc/libusb_static_2015.vcxproj
-@@ -54,10 +54,18 @@
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-       <Optimization>Disabled</Optimization>
-       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <ClCompile Condition="'$(Configuration)'=='Release'">
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <Lib>
-       <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
-diff --git a/msvc/libusb_static_2017.vcxproj b/msvc/libusb_static_2017.vcxproj
-index 1341693..8908450 100644
---- a/msvc/libusb_static_2017.vcxproj
-+++ b/msvc/libusb_static_2017.vcxproj
-@@ -54,10 +54,18 @@
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-       <Optimization>Disabled</Optimization>
-       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <ClCompile Condition="'$(Configuration)'=='Release'">
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <Lib>
-       <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake
index 9ab38c869..1beb053aa 100644
--- a/ports/libusb/portfile.cmake
+++ b/ports/libusb/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 if (VCPKG_CMAKE_SYSTEM_NAME)
     message(FATAL_ERROR "Error: the port is unsupported on your platform. Please open an issue on github.com/Microsoft/vcpkg to request a fix")
 endif()
@@ -11,11 +9,9 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libusb/libusb
-    REF v1.0.22
-    SHA512 b1fed66aafa82490889ee488832c6884a95d38ce7b28fb7c3234b9bce1f749455d7b91cde397a0abc25101410edb13ab2f9832c59aa7b0ea8c19ba2cf4c63b00
+    REF e782eeb2514266f6738e242cdcb18e3ae1ed06fa # v1.0.23
+    SHA512 27cfff4bbf64d5ec5014acac0871ace74b6af76141bd951309206f4806e3e3f2c7ed32416f5b55fd18d033ca5494052eb2e50ed3cc0be10839be2bd4168a9d4c
     HEAD_REF master
-    PATCHES
-        fix_c2001.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake
index 7c2fdd836..db2874a9f 100644
--- a/scripts/cmake/vcpkg_install_msbuild.cmake
+++ b/scripts/cmake/vcpkg_install_msbuild.cmake
@@ -113,6 +113,8 @@ function(vcpkg_install_msbuild)
             set(_csc_PLATFORM  Win32)
         elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL ARM)
             set(_csc_PLATFORM  ARM)
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+            set(_csc_PLATFORM  arm64)
         else()
             message(FATAL_ERROR "Unsupported target architecture")
         endif()