[libusb] Fix usage (#35498)

* fix usage * update version * redo x64-windows.cmake * resolve conflicts * updaet git-tree * fix downstream * update version * fix libirecovery * update git-tree * fix pkg_check_modules * update git-tree * fix libfreenect2 * update version * fix libuvc * update version * fix libuvc patch * update git-tree * fix libuvc build_fix.patch * update git-tree * format * update git-tree * undo supports * update git-tree * fix azure-kinect-sensor-sdk * update version * add pkg-config.exe * update git-tree * disable build examples and tests * update git-tree --------- Co-authored-by: Monica <v-liumonica@microsoft.com>
2024-11-27 19:19:01 +08:00 · 2023-12-14 00:07:17 -08:00 · 2023-12-14 00:07:17 -08:00 · 8abeb71402
commit 8abeb71402
parent 7d10d3d55d
31 changed files with 181 additions and 85 deletions
--- a/ports/azure-kinect-sensor-sdk/fix-builds.patch
+++ b/ports/azure-kinect-sensor-sdk/fix-builds.patch
@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f002b5..d48f3f2 100644
+index 4f002b5..dd9b1df 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -27,8 +27,6 @@ option(K4A_BUILD_DOCS "Build K4A doxygen documentation" OFF)
@ -11,7 +11,7 @@ index 4f002b5..d48f3f2 100644
 # Set the project version
 include(K4AProjectVersion)
 
-@@ -100,6 +98,43 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
+@@ -100,6 +98,42 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
     set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 endif()
 
@ -34,14 +34,13 @@ index 4f002b5..d48f3f2 100644
 +add_definitions(-DMATROSKA_VERSION=2)
 +find_package(libsoundio CONFIG REQUIRED)
 +if (NOT WIN32)
-+   find_package(libusb CONFIG REQUIRED)
 +   find_package(libuvc CONFIG REQUIRED)
 +   add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic)
 +   find_package(OpenSSL REQUIRED)
 +   find_package(ZLIB REQUIRED)
-+else()
-+   find_library(LibUSB libusb-1.0 REQUIRED)
 +endif()
+FIND_PACKAGE(PkgConfig REQUIRED)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 +find_package(libyuv CONFIG REQUIRED)
 +find_package(spdlog CONFIG REQUIRED)
 +if (BUILD_TOOLS)
@ -295,7 +294,7 @@ index e4a696e..6ee6696 100644
     k4ainternal::deloader)
 
 diff --git a/src/usbcommand/CMakeLists.txt b/src/usbcommand/CMakeLists.txt
-index f75bd55..5403216 100644
+index f75bd55..7130728 100644
 --- a/src/usbcommand/CMakeLists.txt
 +++ b/src/usbcommand/CMakeLists.txt
@@ -12,8 +12,8 @@ target_include_directories(k4a_usb_cmd PUBLIC
@ -305,7 +304,7 @@ index f75bd55..5403216 100644
 -    azure::aziotsharedutil
 -    LibUSB::LibUSB
 +    aziotsharedutil
-+    ${LibUSB}
+    PkgConfig::libusb
     k4ainternal::allocator
     k4ainternal::image
     k4ainternal::logging)
@ -585,7 +584,7 @@ index c544e1e..9489bf8 100644
     k4ainternal::logging
     k4ainternal::utcommon)
 diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt
-index 98578c0..6ab38d9 100644
+index 98578c0..244c867 100644
 --- a/tools/k4aviewer/CMakeLists.txt
 +++ b/tools/k4aviewer/CMakeLists.txt
@@ -60,10 +60,11 @@ set(EXTERNAL_LIBRARIES
@ -595,7 +594,7 @@ index 98578c0..6ab38d9 100644
 -    LibUSB::LibUSB
 -    libyuv::libyuv
 -    glfw::glfw
-+    ${LibUSB}
+    PkgConfig::libusb
 +    yuv
 +    glfw
     ${OPENGL_LIBRARIES}
--- a/ports/azure-kinect-sensor-sdk/portfile.cmake
+++ b/ports/azure-kinect-sensor-sdk/portfile.cmake
@ -2,7 +2,7 @@ set(VERSION 1.4.1)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO microsoft/Azure-Kinect-Sensor-SDK
-    REF v${VERSION}
+    REF "v${VERSION}"
    SHA512 ef94c072caae43b0a105b192013e09082d267d4064e6676fac981b52e7576a663f59fcb53f0afe66b425ef2cea0cb3aa224ff7be6485c0b5543ff9cdabd82d4d
    HEAD_REF master
    PATCHES
@ -14,6 +14,7 @@ vcpkg_from_github(
 )

 vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_program(PKGCONFIG)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")

@ -27,7 +28,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    DISABLE_PARALLEL_CONFIGURE
-    OPTIONS ${FEATURE_OPTIONS}
+    OPTIONS 
+    "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+    ${FEATURE_OPTIONS}
    -DK4A_SOURCE_LINK=OFF
    -DK4A_MTE_VERSION=ON
    -DBUILD_EXAMPLES=OFF
@ -88,4 +91,4 @@ else()
 endif()

 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/azure-kinect-sensor-sdk/vcpkg.json
+++ b/ports/azure-kinect-sensor-sdk/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "azure-kinect-sensor-sdk",
  "version": "1.4.1",
-  "port-version": 5,
+  "port-version": 6,
  "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
  "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
  "supports": "linux | windows",
--- a/ports/dv-processing/portfile.cmake
+++ b/ports/dv-processing/portfile.cmake
@ -24,11 +24,14 @@ vcpkg_check_features(
        tools   ENABLE_UTILITIES
 )

+vcpkg_find_acquire_program(PKGCONFIG)
+
 set(VCPKG_BUILD_TYPE release) # no lib binaries
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    DISABLE_PARALLEL_CONFIGURE # writes to include/dv-processing/version.hpp
    OPTIONS
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
        ${FEATURE_OPTIONS}
        "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
        -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
--- a/ports/dv-processing/vcpkg.json
+++ b/ports/dv-processing/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "dv-processing",
  "version": "1.7.9",
+  "port-version": 1,
  "description": "Generic algorithms for event cameras. (C++20 required.)",
  "homepage": "https://gitlab.com/inivation/dv/dv-processing",
  "license": "Apache-2.0",
--- a/ports/libcaer/fix-libusb.diff
+++ b/ports/libcaer/fix-libusb.diff
@ -1,17 +1,62 @@
 diff --git a/cmakemod/libcaerConfig.cmake.in b/cmakemod/libcaerConfig.cmake.in
-index cdf9f88..475d543 100644
+index cdf9f88..f0a17ba 100644
 --- a/cmakemod/libcaerConfig.cmake.in
 +++ b/cmakemod/libcaerConfig.cmake.in
-@@ -21,6 +21,12 @@
+@@ -21,6 +21,10 @@
 CMAKE_POLICY(PUSH)
 CMAKE_POLICY(VERSION 3.10)
 
 +include(CMakeFindDependencyMacro)
-+if(NOT "@CC_MSVC@")
-+    find_dependency(PkgConfig)
-+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
-+endif()
+find_dependency(PkgConfig)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 +
 INCLUDE(@PACKAGE_export_destination@/libcaer-exports.cmake)
 SET(libcaer_INCLUDE_DIRS @PACKAGE_include_dirs@)
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ce94a6..f03d7ae 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -52,16 +52,12 @@ MESSAGE(STATUS "Base libraries: ${BASE_LIBS}")
+ INCLUDE(FindPkgConfig)
+ 
+ # Required: basic USB devices support
+-IF(CC_MSVC)
+-	FIND_PACKAGE(libusb CONFIG REQUIRED)
+-ELSE()
+-	PKG_CHECK_MODULES(
+-		libusb
+-		REQUIRED
+-		IMPORTED_TARGET
+-		libusb-1.0>=1.0.17)
+-	SET(LIBCAER_PKGCONFIG_REQUIRES_PRIVATE "libusb-1.0 >= 1.0.17")
+-ENDIF()
+PKG_CHECK_MODULES(
+    libusb
+    REQUIRED
+    IMPORTED_TARGET
+    libusb-1.0>=1.0.17)
+SET(LIBCAER_PKGCONFIG_REQUIRES_PRIVATE "libusb-1.0 >= 1.0.17")
+ 
+ # Optional: serial devices support
+ IF(ENABLE_SERIALDEV)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0ef4ac7..6f70a26 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -49,12 +49,11 @@ ENDIF()
+ 
+ IF(CC_MSVC)
+ 	LIST(APPEND LIBCAER_SOURCES ../thirdparty/simple-stdatomic/stdatomic.c)
+-	INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS})
+-	LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE ${LIBUSB_LIBRARIES})
+-ELSE()
+-	LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE PkgConfig::libusb)
+ ENDIF()
+ 
+LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE PkgConfig::libusb)
+
+
+ # Set full RPATH
+ SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ 
--- a/ports/libcaer/vcpkg.json
+++ b/ports/libcaer/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "libcaer",
  "version": "3.3.15",
+  "port-version": 1,
  "description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.",
  "homepage": "https://gitlab.com/inivation/dv/libcaer",
  "license": "BSD-2-Clause AND Apache-2.0",
--- a/ports/libfreenect2/fix-dependency-libusb.patch
+++ b/ports/libfreenect2/fix-dependency-libusb.patch
@ -1,31 +1,31 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e0d192..aedc576 100644
+index 3648fb5..43c3d28 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -90,7 +90,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+@@ -91,7 +91,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
 # dependencies
 FIND_PACKAGE(PkgConfig)    # try find PKGConfig as it will be used if found
 -FIND_PACKAGE(LibUSB REQUIRED)
-+FIND_PACKAGE(libusb CONFIG REQUIRED)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 
 # Add includes
 INCLUDE_DIRECTORIES(
-@@ -98,7 +98,7 @@ INCLUDE_DIRECTORIES(
+@@ -99,7 +99,7 @@ INCLUDE_DIRECTORIES(
   "${MY_DIR}/include/internal"
   ${PROJECT_BINARY_DIR} # for generated headers
   ${LIBFREENECT2_THREADING_INCLUDE_DIR}
 -  ${LibUSB_INCLUDE_DIRS}
-+  ${LIBUSB_INCLUDE_DIRS}
+  ${libusb_INCLUDE_DIRS}
 )
 
 SET(RESOURCES_INC_FILE "${PROJECT_BINARY_DIR}/resources.inc.h")
-@@ -154,7 +154,7 @@ SET(SOURCES
+@@ -157,7 +157,7 @@ SET(SOURCES
 )
 
 SET(LIBRARIES
 -  ${LibUSB_LIBRARIES}
-+  ${LIBUSB_LIBRARIES}
+  PkgConfig::libusb
   ${LIBFREENECT2_THREADING_LIBRARIES}
 )
 
--- a/ports/libfreenect2/portfile.cmake
+++ b/ports/libfreenect2/portfile.cmake
@ -21,13 +21,26 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
        openni2    BUILD_OPENNI2_DRIVER
 )

+vcpkg_find_acquire_program(PKGCONFIG)
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    set(path_suffix "/debug")
+endif()
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    set(path_suffix "")
+endif()
+vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH)
+vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig")
+
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
        -DENABLE_CUDA=OFF
        -DBUILD_EXAMPLES=OFF
        ${FEATURE_OPTIONS}
 )
+vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH)

 vcpkg_cmake_install()

--- a/ports/libfreenect2/vcpkg.json
+++ b/ports/libfreenect2/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "libfreenect2",
  "version": "0.2.1",
+  "port-version": 1,
  "description": "Open source drivers for the Kinect for Windows v2 device",
  "homepage": "https://github.com/OpenKinect/libfreenect2",
  "license": "GPL-2.0-only",
--- a/ports/libirecovery/CMakeLists.txt
+++ b/ports/libirecovery/CMakeLists.txt
@ -41,9 +41,9 @@ target_link_libraries(libirecovery
        unofficial::libimobiledevice-glue::libimobiledevice-glue
 )
 if(NOT WIN32 AND NOT APPLE)
-    find_package(libusb CONFIG REQUIRED)
-    target_include_directories(libirecovery PRIVATE ${LIBUSB_INCLUDE_DIRS})
-    target_link_libraries(libirecovery PRIVATE ${LIBUSB_LIBRARIES})
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
+    target_link_libraries(libirecovery PRIVATE PkgConfig::libusb)
 endif()
 set_target_properties(libirecovery PROPERTIES OUTPUT_NAME irecovery-1.0)

@ -111,9 +111,9 @@ if(BUILD_TOOLS)
        target_link_libraries(irecovery PRIVATE "-framework IOKit" "-framework CoreFoundation")
    endif()
    if(NOT WIN32 AND NOT APPLE)
-        find_package(libusb CONFIG REQUIRED)
-        target_include_directories(irecovery PRIVATE ${LIBUSB_INCLUDE_DIRS})
-        target_link_libraries(irecovery PRIVATE ${LIBUSB_LIBRARIES})
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
+        target_link_libraries(irecovery PRIVATE PkgConfig::libusb)
    endif()
    find_package(PkgConfig REQUIRED)
    pkg_check_modules(readline REQUIRED IMPORTED_TARGET readline)
--- a/ports/libirecovery/portfile.cmake
+++ b/ports/libirecovery/portfile.cmake
@ -50,6 +50,10 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-c
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
 "include(CMakeFindDependencyMacro)
 find_dependency(unofficial-libimobiledevice-glue CONFIG)
+if(NOT WIN32 AND NOT APPLE)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
+endif()
 ${cmake_config}
 ")

--- a/ports/libirecovery/vcpkg.json
+++ b/ports/libirecovery/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "libirecovery",
  "version-date": "2023-05-13",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux",
  "homepage": "https://libimobiledevice.org/",
  "license": "LGPL-2.1-or-later",
--- a/ports/libusb/portfile.cmake
+++ b/ports/libusb/portfile.cmake
@ -55,7 +55,10 @@ else()
    vcpkg_configure_make(
        SOURCE_PATH "${SOURCE_PATH}"
        AUTOCONFIG
-        OPTIONS ${MAKE_OPTIONS}
+        OPTIONS 
+            ${MAKE_OPTIONS}
+            "--enable-examples-build=no"
+            "--enable-tests-build=no"
    )
    vcpkg_install_make()
 endif()
@ -63,5 +66,4 @@ endif()
 vcpkg_fixup_pkgconfig()

 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
--- a/ports/libusb/usage
+++ b/ports/libusb/usage
@ -1,5 +1,5 @@
-libusb provides CMake targets:
+libusb can be imported via CMake FindPkgConfig module:
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)

-    find_package(libusb CONFIG REQUIRED)
-    target_include_directories(main PRIVATE ${LIBUSB_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${LIBUSB_LIBRARIES})
+    target_link_libraries(main PRIVATE PkgConfig::libusb)
--- a/ports/libusb/vcpkg-cmake-wrapper.cmake
+++ b/ports/libusb/vcpkg-cmake-wrapper.cmake
@ -1,17 +0,0 @@
-include(SelectLibraryConfigurations)
-
-find_path(LIBUSB_INCLUDE_DIR libusb.h PATH_SUFFIXES libusb-1.0)
-find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
-find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
-
-select_library_configurations(LIBUSB)
-
-set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}")
-
-list(APPEND LIBUSB_LIBRARIES @LIBUSB_LINK_LIBRARIES@)
-
-if (@VCPKG_TARGET_IS_OSX@)
-    list(APPEND LIBUSB_LIBRARIES "-framework Cocoa")
-    list(APPEND LIBUSB_LIBRARIES "-framework IOKit")
-    list(APPEND LIBUSB_LIBRARIES "-framework Security")
-endif()
--- a/ports/libusb/vcpkg.json
+++ b/ports/libusb/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "libusb",
  "version": "1.0.26.11791",
-  "port-version": 5,
+  "port-version": 6,
  "description": "a cross-platform library to access USB devices",
  "homepage": "https://github.com/libusb/libusb",
  "license": "LGPL-2.1-or-later",
--- a/ports/libuvc/build_fix.patch
+++ b/ports/libuvc/build_fix.patch
@ -1,13 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3c8116..b9a6d38 100644
+index fbaffc9..451b689 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -39,10 +39,10 @@ set(SOURCES
+@@ -39,10 +39,11 @@ set(SOURCES
   src/misc.c
 )
 
 -find_package(LibUSB)
-+find_package(libusb CONFIG REQUIRED)
+FIND_PACKAGE(PkgConfig REQUIRED)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 
 # JpegPkg name to differ from shipped with CMake
 -find_package(JpegPkg QUIET)
@ -15,23 +16,20 @@ index f3c8116..b9a6d38 100644
 if(JPEG_FOUND)
   message(STATUS "Building libuvc with JPEG support.")
   set(LIBUVC_HAS_JPEG TRUE)
-@@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS)
-       $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-       $<INSTALL_INTERFACE:include>
+@@ -116,7 +117,7 @@ foreach(target_name IN LISTS UVC_TARGETS)
   )
-+  target_include_directories(${target_name} PRIVATE ${LIBUSB_INCLUDE_DIRS})
   target_link_libraries(${target_name}
     # libusb-1.0 used internally so we link to it privately.
-    PRIVATE LibUSB::LibUSB
-+    PRIVATE ${LIBUSB_LIBRARIES}
+-    PRIVATE LibUSB::LibUSB ${threads}
+    PRIVATE PkgConfig::libusb ${threads}
   )
   if(JPEG_FOUND)
     target_link_libraries(${target_name}
 diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake
-index b9887ea..e8f09dc 100644
+index b9887ea..c704ab5 100644
 --- a/libuvcConfig.cmake
 +++ b/libuvcConfig.cmake
-@@ -10,8 +10,8 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
+@@ -10,8 +10,11 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
   list(APPEND extraArgs REQUIRED)
 endif()
 
@ -39,6 +37,9 @@ index b9887ea..e8f09dc 100644
 -find_package(LibUSB ${extraArgs})
 +include(CMakeFindDependencyMacro)
 +find_dependency(JPEG ${extraArgs})
+find_dependency(Threads)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake")
 
 set(libuvc_FOUND TRUE)
--- a/ports/libuvc/portfile.cmake
+++ b/ports/libuvc/portfile.cmake
@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libuvc/libuvc
-    REF c612d4509eb0ff19ce414abc3dca18d0f6263a84
-    SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32
+    REF "v${VERSION}"
+    SHA512 cf2c0a6cc04717f284f25bed17f178a4b2b2a2bb3e5937e50be144e88db2c481c5ea763c164fe0234834fea4837f96fcc13bdbdafd4610d2985943562dfcc72f
    HEAD_REF master
    PATCHES build_fix.patch
 )
@ -29,4 +29,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_

 vcpkg_fixup_pkgconfig()
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
--- a/ports/libuvc/vcpkg.json
+++ b/ports/libuvc/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "libuvc",
-  "version-date": "2020-11-24",
-  "port-version": 4,
+  "version": "0.0.7",
  "description": "a cross-platform library for USB video devices",
  "homepage": "https://github.com/libuvc/libuvc",
  "supports": "linux",
--- a/ports/usbmuxd/CMakeLists.txt
+++ b/ports/usbmuxd/CMakeLists.txt
@ -28,19 +28,19 @@ endif()

 find_package(unofficial-libimobiledevice CONFIG REQUIRED)
 find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED)
-find_package(libusb CONFIG REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED)

 add_executable(usbmuxd ${USBMUXD_SOURCE})
 target_include_directories(usbmuxd PRIVATE
-    ${LIBUSB_INCLUDE_DIRS}
    ${DIRENT_INCLUDE_DIR}
 )
 target_compile_definitions(usbmuxd PRIVATE ${DEFINITIONS})
 target_link_libraries(usbmuxd PRIVATE
    unofficial::libimobiledevice::libimobiledevice
    unofficial::libimobiledevice-glue::libimobiledevice-glue
-    ${LIBUSB_LIBRARIES}
+    PkgConfig::libusb
 )
 if(WIN32)
    find_package(PThreads4W REQUIRED)
--- a/ports/usbmuxd/vcpkg.json
+++ b/ports/usbmuxd/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "usbmuxd",
  "version-date": "2023-07-21",
+  "port-version": 1,
  "description": "A socket daemon to multiplex connections from and to iOS devices",
  "homepage": "http://www.libimobiledevice.org",
  "license": "LGPL-2.0-or-later",
--- a/versions/a-/azure-kinect-sensor-sdk.json
+++ b/versions/a-/azure-kinect-sensor-sdk.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f5fbd0b39a805bc47da22f4bc462bec175518ae1",
+      "version": "1.4.1",
+      "port-version": 6
+    },
    {
      "git-tree": "e2a1e6a1a145f9436731cbcc9019f807325298c1",
      "version": "1.4.1",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -438,7 +438,7 @@
    },
    "azure-kinect-sensor-sdk": {
      "baseline": "1.4.1",
-      "port-version": 5
+      "port-version": 6
    },
    "azure-macro-utils-c": {
      "baseline": "2022-01-21",
@ -2310,7 +2310,7 @@
    },
    "dv-processing": {
      "baseline": "1.7.9",
-      "port-version": 0
+      "port-version": 1
    },
    "dx": {
      "baseline": "1.0.1",
@ -4118,7 +4118,7 @@
    },
    "libcaer": {
      "baseline": "3.3.15",
-      "port-version": 0
+      "port-version": 1
    },
    "libcanberra": {
      "baseline": "0.30",
@ -4298,7 +4298,7 @@
    },
    "libfreenect2": {
      "baseline": "0.2.1",
-      "port-version": 0
+      "port-version": 1
    },
    "libfs": {
      "baseline": "1.0.8",
@ -4438,7 +4438,7 @@
    },
    "libirecovery": {
      "baseline": "2023-05-13",
-      "port-version": 1
+      "port-version": 2
    },
    "libjpeg-turbo": {
      "baseline": "3.0.1",
@ -4974,7 +4974,7 @@
    },
    "libusb": {
      "baseline": "1.0.26.11791",
-      "port-version": 5
+      "port-version": 6
    },
    "libusb-win32": {
      "baseline": "1.2.6.0",
@ -4993,8 +4993,8 @@
      "port-version": 1
    },
    "libuvc": {
-      "baseline": "2020-11-24",
-      "port-version": 4
+      "baseline": "0.0.7",
+      "port-version": 0
    },
    "libvault": {
      "baseline": "0.56.0",
@ -8722,7 +8722,7 @@
    },
    "usbmuxd": {
      "baseline": "2023-07-21",
-      "port-version": 0
+      "port-version": 1
    },
    "usd": {
      "baseline": "23.5",
--- a/versions/d-/dv-processing.json
+++ b/versions/d-/dv-processing.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "cd165ee3da5e52cb1a2a9bf22a87d04c2e100d4e",
+      "version": "1.7.9",
+      "port-version": 1
+    },
    {
      "git-tree": "70c0ee933303903d8a550f89a138bba0541222dc",
      "version": "1.7.9",
--- a/versions/l-/libcaer.json
+++ b/versions/l-/libcaer.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "45485054e1276ff51ad1ec68a8c31de0ecf9d795",
+      "version": "3.3.15",
+      "port-version": 1
+    },
    {
      "git-tree": "f90f31425f85b3bb2544a34fc0b9247491ecbf2b",
      "version": "3.3.15",
--- a/versions/l-/libfreenect2.json
+++ b/versions/l-/libfreenect2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "41b1ddb75208930631ff81c5a19a86c7f0308791",
+      "version": "0.2.1",
+      "port-version": 1
+    },
    {
      "git-tree": "bfa5e96443079122b324178a6ed421423067039a",
      "version": "0.2.1",
--- a/versions/l-/libirecovery.json
+++ b/versions/l-/libirecovery.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d47bd1d38f72799238f2d815b96b11bb11d9ea14",
+      "version-date": "2023-05-13",
+      "port-version": 2
+    },
    {
      "git-tree": "72b9637bc62e62eb478d09618545c419bf21ed48",
      "version-date": "2023-05-13",
--- a/versions/l-/libusb.json
+++ b/versions/l-/libusb.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "53ad48778a3278668b2ede66ac49fa20a9d03414",
+      "version": "1.0.26.11791",
+      "port-version": 6
+    },
    {
      "git-tree": "f4d325ede3cd1de2acd9a2d8f2708ec1e758cf0a",
      "version": "1.0.26.11791",
--- a/versions/l-/libuvc.json
+++ b/versions/l-/libuvc.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "930185d807e87c0ebec6aefd21e2ca336ee0cc3c",
+      "version": "0.0.7",
+      "port-version": 0
+    },
    {
      "git-tree": "578c4d06e3d518e46edee324e3c8048826c503ec",
      "version-date": "2020-11-24",
--- a/versions/u-/usbmuxd.json
+++ b/versions/u-/usbmuxd.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4aa97c2a8eb36aa9f4a3a7ca0fb028dc27f8215b",
+      "version-date": "2023-07-21",
+      "port-version": 1
+    },
    {
      "git-tree": "edc61063b642372c7d9de82f7ecc55ed39971c3d",
      "version-date": "2023-07-21",