diff options
| author | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
|---|---|---|
| committer | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
| commit | 54409423f767d8b1cf30cb7d0efca6b4ca138823 (patch) | |
| tree | d915ac7828703ce4b963efdd9728a1777ba18c1e /vcpkg/ports/libuvc/build_fix.patch | |
Diffstat (limited to 'vcpkg/ports/libuvc/build_fix.patch')
| -rw-r--r-- | vcpkg/ports/libuvc/build_fix.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/vcpkg/ports/libuvc/build_fix.patch b/vcpkg/ports/libuvc/build_fix.patch new file mode 100644 index 0000000..4e6bade --- /dev/null +++ b/vcpkg/ports/libuvc/build_fix.patch @@ -0,0 +1,70 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbaffc9..672ebb9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,6 @@ project(libuvc + ) + + # Additional search scripts path for libusb-1.0, libjpeg, OpenCV +-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) + + # Xcode and Visual Studio do not using CMAKE_BUILD_TYPE cache variable + # so we use Release build type only with single configuration generators. +@@ -39,10 +38,11 @@ set(SOURCES + src/misc.c + ) + +-find_package(LibUSB) ++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) ++find_package(JPEG REQUIRED) + if(JPEG_FOUND) + message(STATUS "Building libuvc with JPEG support.") + set(LIBUVC_HAS_JPEG TRUE) +@@ -116,8 +116,11 @@ foreach(target_name IN LISTS UVC_TARGETS) + ) + target_link_libraries(${target_name} + # libusb-1.0 used internally so we link to it privately. +- PRIVATE LibUSB::LibUSB ${threads} ++ PRIVATE PkgConfig::libusb ${threads} + ) ++ if(APPLE) ++ target_link_libraries(${target_name} PRIVATE "-framework IOKit" "-framework CoreFoundation" "-framework Security") ++ endif() + if(JPEG_FOUND) + target_link_libraries(${target_name} + PRIVATE JPEG::JPEG +@@ -191,12 +194,6 @@ install(EXPORT libuvcTargets + DESTINATION ${CMAKE_INSTALL_CMAKEDIR} + ) + +-install(FILES +- cmake/FindLibUSB.cmake +- cmake/FindJpegPkg.cmake +- DESTINATION ${CMAKE_INSTALL_CMAKEDIR} +-) +- + include(CMakePackageConfigHelpers) + write_basic_package_version_file(libuvcConfigVersion.cmake + COMPATIBILITY AnyNewerVersion +diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake +index b9887ea..c704ab5 100644 +--- a/libuvcConfig.cmake ++++ b/libuvcConfig.cmake +@@ -10,8 +10,11 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) + list(APPEND extraArgs REQUIRED) + endif() + +-find_package(JpegPkg ${extraArgs}) +-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) |