blob: 87ed62c8dadb2e57d3ad0c486f195e481efef9b8 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
- Git cannot be used as poudriere disables network access during build
- ExternalProject_Add fails to build with Ninja
- https://github.com/letoram/arcan/commit/66efdebb236c requires newer libuvc, so guard
--- frameserver/decode/default/CMakeLists.txt.orig 2020-11-27 15:29:00 UTC
+++ frameserver/decode/default/CMakeLists.txt
@@ -52,31 +52,18 @@ if (LIBVLC_FOUND)
${DECODE_DEFS}
)
- pkg_check_modules(LIBUSB_1 REQUIRED libusb-1.0)
pkg_check_modules(FFMPEG REQUIRED libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale)
+ pkg_check_modules(LIBUVC libuvc)
- ExternalProject_Add(libuvc
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/frameserver/decode/libuvc"
- BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libuvc_static"
- UPDATE_COMMAND ""
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/libuvc"
- ${EXTERNAL_DEFS}
- ${CMAKE_EXTERNAL_DEFS}
- -DBUILD_UVC_STATIC=ON
- )
-
- set(DECODE_DEPS libuvc)
set(DECODE_INCLUDE_DIRS
${DECODE_INCLUDE_DIRS}
- ${LIBUSB_1_INCLUDE_DIRS}
${FFMPEG_INCLUDE_DIRS}
- ${CMAKE_CURRENT_BINARY_DIR}/libuvc_static/include
+ ${LIBUVC_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}/../../../include)
set(DECODE_LIBS
${FFMPEG_LINK_LIBRARIES}
${DECODE_LIBS}
- ${LIBUSB_1_LINK_LIBRARIES}
- ${CMAKE_CURRENT_BINARY_DIR}/libuvc_static/libuvc.a
+ ${LIBUVC_LINK_LIBRARIES}
)
set(DECODE_SOURCES
${DECODE_SOURCES}
|
