-
Notifications
You must be signed in to change notification settings - Fork 7.6k
[libuvc] added #14749
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
[libuvc] added #14749
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Source: libuvc | ||
| Version: 2020-11-24 | ||
| Build-Depends: libusb | ||
| Homepage: https://github.com/libuvc/libuvc | ||
| Description: a cross-platform library for USB video devices | ||
| Supports: linux |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index f3c8116..0da84a7 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -39,7 +39,7 @@ 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) | ||
| @@ -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} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO libuvc/libuvc | ||
| REF c612d4509eb0ff19ce414abc3dca18d0f6263a84 | ||
| SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32 | ||
| HEAD_REF master | ||
| PATCHES | ||
| build_fix.patch | ||
| ) | ||
|
|
||
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA | ||
| OPTIONS -DBUILD_EXAMPLE=OFF | ||
| ) | ||
| vcpkg_install_cmake() | ||
|
|
||
| vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libuvc) | ||
|
|
||
| vcpkg_copy_pdbs() | ||
|
|
||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) | ||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) | ||
|
|
||
| # Handle copyright | ||
| file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "git-tree": "8550f55866b4387d32614f7353dbb59cdc2e7bd9", | ||
| "version-string": "2020-11-24", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.