early-access version 2853
This commit is contained in:
44
externals/vcpkg/ports/libuvc/build_fix.patch
vendored
Executable file
44
externals/vcpkg/ports/libuvc/build_fix.patch
vendored
Executable file
@@ -0,0 +1,44 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f3c8116..b9a6d38 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -39,10 +39,10 @@ set(SOURCES
|
||||
src/misc.c
|
||||
)
|
||||
|
||||
-find_package(LibUSB)
|
||||
+find_package(libusb CONFIG REQUIRED)
|
||||
|
||||
# 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)
|
||||
@@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS)
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
)
|
||||
+ 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}
|
||||
)
|
||||
if(JPEG_FOUND)
|
||||
target_link_libraries(${target_name}
|
||||
diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake
|
||||
index b9887ea..e8f09dc 100644
|
||||
--- a/libuvcConfig.cmake
|
||||
+++ b/libuvcConfig.cmake
|
||||
@@ -10,8 +10,8 @@ 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})
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake")
|
||||
|
||||
set(libuvc_FOUND TRUE)
|
32
externals/vcpkg/ports/libuvc/portfile.cmake
vendored
Executable file
32
externals/vcpkg/ports/libuvc/portfile.cmake
vendored
Executable file
@@ -0,0 +1,32 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libuvc/libuvc
|
||||
REF c612d4509eb0ff19ce414abc3dca18d0f6263a84
|
||||
SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32
|
||||
HEAD_REF master
|
||||
PATCHES build_fix.patch
|
||||
)
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
set(BUILD_TARGET "Shared")
|
||||
else()
|
||||
set(BUILD_TARGET "Static")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
OPTIONS
|
||||
-DCMAKE_BUILD_TARGET=${BUILD_TARGET}
|
||||
-DBUILD_EXAMPLE=OFF
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME libuvc CONFIG_PATH lib/cmake/libuvc)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
# Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
21
externals/vcpkg/ports/libuvc/vcpkg.json
vendored
Executable file
21
externals/vcpkg/ports/libuvc/vcpkg.json
vendored
Executable file
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"name": "libuvc",
|
||||
"version-date": "2020-11-24",
|
||||
"port-version": 3,
|
||||
"description": "a cross-platform library for USB video devices",
|
||||
"homepage": "https://github.com/libuvc/libuvc",
|
||||
"supports": "linux",
|
||||
"dependencies": [
|
||||
"libjpeg-turbo",
|
||||
"libusb",
|
||||
"libusb",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
Reference in New Issue
Block a user