Index: head/multimedia/arcan/files/patch-system-libuvc =================================================================== --- head/multimedia/arcan/files/patch-system-libuvc (revision 556540) +++ head/multimedia/arcan/files/patch-system-libuvc (nonexistent) @@ -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} Property changes on: head/multimedia/arcan/files/patch-system-libuvc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/arcan/Makefile =================================================================== --- head/multimedia/arcan/Makefile (revision 556540) +++ head/multimedia/arcan/Makefile (revision 556541) @@ -1,112 +1,114 @@ # $FreeBSD$ PORTNAME= arcan DISTVERSION= 0.6.0 PORTREVISION= 1 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 7cf3d1066faf.patch:-p2 # https://github.com/letoram/arcan/pull/205 PATCHFILES+= f40395b6755d.patch:-p2 # https://github.com/letoram/arcan/pull/205 PATCHFILES+= b519eb023e20.patch:-p2 # https://github.com/letoram/arcan/pull/205 PATCHFILES+= d6b52b1b3601.patch:-p2 # https://github.com/letoram/arcan/pull/205 PATCHFILES+= d8a262d6d19a.patch:-p2 # https://github.com/letoram/arcan/pull/205 PATCHFILES+= f724b748cc72.patch:-p2 # https://github.com/letoram/arcan/pull/205 +PATCHFILES+= 06ca1fd319bf.patch:-p2 # https://github.com/letoram/arcan/pull/209 MAINTAINER= jbeich@FreeBSD.org COMMENT= Display Server, Multimedia Framework, Game Engine LICENSE= BSD3CLAUSE GPLv2+ LGPL21 LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC:H}/data/distr/LICENSE.BSD LICENSE_FILE_GPLv2+ = ${WRKSRC:H}/data/distr/LICENSE.GPL LICENSE_FILE_LGPL21+ = ${WRKSRC:H}/data/distr/LICENSE.LGPL LIB_DEPENDS= libdrm.so:graphics/libdrm \ libfreetype.so:print/freetype2 RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri USES= cmake compiler:c11 gl iconv openal pkgconfig sqlite USE_GITHUB= yes USE_GL= egl gbm gl USE_LDCONFIG= yes GH_ACCOUNT= letoram WRKSRC_SUBDIR= src CMAKE_ON= HYBRID_HEADLESS +CMAKE_OFF= STATIC_LIBUVC CMAKE_ARGS= -DENGINE_BUILDTAG:STRING="${DISTVERSIONFULL}" LDFLAGS+= -Wl,--as-needed # bzip2, ffmpeg, librt, libutil, lzma, zlib LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE= ESPEAK FFMPEG LUAJIT SDL TESSERACT UVC VLC VNC WAYLAND OPTIONS_DEFAULT=ESPEAK FFMPEG LUAJIT SDL TESSERACT UVC VLC VNC WAYLAND OPTIONS_EXCLUDE_aarch64= LUAJIT # bug 225342 OPTIONS_EXCLUDE_powerpc64= LUAJIT OPTIONS_SUB= yes ESPEAK_DESC= Text to speech via eSpeak ESPEAK_LIB_DEPENDS= libespeak.so:audio/espeak FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg LUAJIT_DESC= Use LuaJIT instead of standard Lua LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_USES_OFF= lua:51 LUAJIT_CMAKE_BOOL_OFF= DISABLE_JIT SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_CMAKE_BOOL= HYBRID_SDL TESSERACT_DESC= Optical Character Recognition via Tesseract TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract VLC_DESC= Video decode via libvlc VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc UVC_DESC= USB video cameras via libuvc UVC_LIB_DEPENDS= libuvc.so:multimedia/libuvc UVC_CMAKE_BOOL= FSRV_DECODE_UVC VNC_DESC= VNC client/server support VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libxcb-icccm.so:x11/xcb-util-wm \ libxkbcommon.so:x11/libxkbcommon WAYLAND_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel WAYLAND_USES= xorg WAYLAND_USE= XORG=xcb WAYLAND_CMAKE_BOOL_OFF= DISABLE_WAYLAND post-patch: @${REINPLACE_CMD} -i.prefix 's,/usr/local,${PREFIX},g' \ ${WRKSRC:H}/doc/${PORTNAME}.1 \ ${WRKSRC}/engine/arcan_vr.c \ ${WRKSRC}/frameserver/decode/default/decode_av.c \ ${WRKSRC}/frameserver/terminal/default/arcterm.c \ ${WRKSRC}/frameserver/terminal/default/cli.c \ ${WRKSRC}/frameserver/terminal/default/cli_builtin.c \ ${WRKSRC}/platform/posix/paths.c \ ${WRKSRC}/shmif/arcan_shmif_debugif.c post-patch-ESPEAK-off: @${REINPLACE_CMD} -i.noespeak '/find.*Espeak/d' \ ${WRKSRC}/frameserver/decode/default/CMakeLists.txt post-patch-FFMPEG-off: @${REINPLACE_CMD} -i.noffmpeg '/pkg.*FFMPEG/d' \ ${WRKSRC}/a12/CMakeLists.txt \ ${WRKSRC}/frameserver/decode/default/CMakeLists.txt \ ${WRKSRC}/frameserver/encode/default/CMakeLists.txt post-patch-TESSERACT-off: @${REINPLACE_CMD} -i.notesseract '/pkg.*tesseract/d' \ ${WRKSRC}/frameserver/encode/default/CMakeLists.txt post-patch-VNC-off: @${REINPLACE_CMD} -i.novnc '/pkg.*libvnc/d' \ ${WRKSRC}/frameserver/encode/default/CMakeLists.txt \ ${WRKSRC}/frameserver/remoting/default/CMakeLists.txt .include Index: head/multimedia/arcan/distinfo =================================================================== --- head/multimedia/arcan/distinfo (revision 556540) +++ head/multimedia/arcan/distinfo (revision 556541) @@ -1,15 +1,17 @@ TIMESTAMP = 1606252529 SHA256 (letoram-arcan-0.6.0_GH0.tar.gz) = 7b7aeb0fa6b89b7e3779d2e078b626566bdfa86c756d7ea1cc4f84b9e60d16a0 SIZE (letoram-arcan-0.6.0_GH0.tar.gz) = 11216362 SHA256 (7cf3d1066faf.patch) = f6a03026c263bb0f5e98c094925f75c0300c960079b5b0e0740fcb0e804d548c SIZE (7cf3d1066faf.patch) = 1078 SHA256 (f40395b6755d.patch) = b8e5d7ec724a0cec7045d50aaf2a673dbb23ecdaba233503b0de194bfcdb2ef5 SIZE (f40395b6755d.patch) = 920 SHA256 (b519eb023e20.patch) = ca8b0bd0adf98ada72be83ea20e797fc191c0f66e83bc7edeb95be327bd67ba7 SIZE (b519eb023e20.patch) = 2333 SHA256 (d6b52b1b3601.patch) = e6a54c79de294668ee64a4b13f366257bfcd7856510540fe5f59079f6296382e SIZE (d6b52b1b3601.patch) = 1270 SHA256 (d8a262d6d19a.patch) = 82b04de15212726d33fab17c87600fa0c78e44ea28ee9da764d840ef8f0e1ebf SIZE (d8a262d6d19a.patch) = 804 SHA256 (f724b748cc72.patch) = 33c580b5638060476bfb1bf48d9fe040d15e412c494a2a52432b01f9a55758b8 SIZE (f724b748cc72.patch) = 1348 +SHA256 (06ca1fd319bf.patch) = e65a854e6a51ecb68707f3b257dc3a748b72a840f398f536c455faea0d2d673a +SIZE (06ca1fd319bf.patch) = 3777