diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile index 04c42c748903..b83484e3e684 100644 --- a/multimedia/arcan/Makefile +++ b/multimedia/arcan/Makefile @@ -1,115 +1,116 @@ PORTNAME= arcan DISTVERSION= 0.6.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 9b807ac75c6f.patch:-p2 # https://github.com/letoram/arcan/issues/258 +PATCHFILES+= 9020c030cbd3.patch:-p2 # evdev crashfix MAINTAINER= jbeich@FreeBSD.org COMMENT= Display Server, Multimedia Framework, Game Engine WWW= https://arcan-fe.com/ 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 BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto 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= -DDISTR_TAG:STRING="portbld" \ -DENGINE_BUILDTAG:STRING="${DISTVERSIONFULL}" LDFLAGS+= -Wl,--as-needed # bzip2, ffmpeg, librt, libutil, lzma, zlib LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE= ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND OPTIONS_DEFAULT=ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND OPTIONS_SUB= yes ESPEAK_LIB_DEPENDS= libespeak-ng.so:audio/espeak-ng FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg MANPAGES_USES= ruby:build LUAJIT_DESC= Use LuaJIT instead of standard Lua LUAJIT_USES= luajit LUAJIT_USES_OFF= lua:51 LUAJIT_CMAKE_BOOL_OFF= DISABLE_JIT SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_CMAKE_BOOL= HYBRID_SDL SUID_DESC= setuid bit on "${PORTNAME}" binary SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) " SUID_PLIST_SUB_OFF= MAYBE_SUID="@(,,0755) " 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_CATEGORIES= wayland 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 pre-configure-MANPAGES-on: @${RUBY} -C ${WRKSRC:H}/doc -Ku docgen.rb mangen 2>/dev/null 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 diff --git a/multimedia/arcan/distinfo b/multimedia/arcan/distinfo index 917534939345..b7f99d53f485 100644 --- a/multimedia/arcan/distinfo +++ b/multimedia/arcan/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1665606234 SHA256 (letoram-arcan-0.6.2.1_GH0.tar.gz) = 7bf083412bc61555472877313c13116431a0a36fccbf142f97559db43b4a1475 SIZE (letoram-arcan-0.6.2.1_GH0.tar.gz) = 11812923 SHA256 (9b807ac75c6f.patch) = 158b194c6ac99922c3ad44e9887d471523a8044a5acdb4786754d9e0a1c6509b SIZE (9b807ac75c6f.patch) = 1191 +SHA256 (9020c030cbd3.patch) = 1a2108c0cef32ec10ef62a8205992d870e5593a1be6ed22c0f897c308ffa8e50 +SIZE (9020c030cbd3.patch) = 3932 diff --git a/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD b/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD deleted file mode 100644 index af4661e3174a..000000000000 --- a/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD +++ /dev/null @@ -1,15 +0,0 @@ -Partially revert https://github.com/letoram/arcan/commit/3c1674a8f5db - ---- platform/cmake/CMakeLists.BSD.orig 2022-10-12 20:23:54 UTC -+++ platform/cmake/CMakeLists.BSD -@@ -74,6 +74,10 @@ else() - set(BSD_VARIANT_DEFINITIONS - -DCLOCK_MONOTONIC_RAW=CLOCK_REALTIME_FAST) - -+# FreeBSD 12.1 enabled evdev but Arcan crashes -+ if(${INPUT_PLATFORM} STREQUAL "evdev") -+ SET(INPUT_PLATFORM "syscons") -+ endif() - if (VIDEO_PLATFORM STREQUAL "egl-dri") - list(APPEND ARCAN_PLATFORM ${PLATFORM_PATH}/psep_open.c) - else()