From a8320e43e583c02d151088e726aefc0791f2c3cb Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 28 Nov 2020 23:48:42 +0000 Subject: multimedia/arcan: switch to upstreamable UVC fix --- multimedia/arcan/files/patch-system-libuvc | 40 ------------------------------ 1 file changed, 40 deletions(-) delete mode 100644 multimedia/arcan/files/patch-system-libuvc (limited to 'multimedia/arcan/files/patch-system-libuvc') diff --git a/multimedia/arcan/files/patch-system-libuvc b/multimedia/arcan/files/patch-system-libuvc deleted file mode 100644 index f77d5d59d32d..000000000000 --- a/multimedia/arcan/files/patch-system-libuvc +++ /dev/null @@ -1,40 +0,0 @@ -- Git cannot be used as poudriere disables network access during build -- ExternalProject_Add fails to build with Ninja - ---- 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} -- cgit v1.2.3