Index: head/multimedia/zoneminder/Makefile =================================================================== --- head/multimedia/zoneminder/Makefile (revision 503282) +++ head/multimedia/zoneminder/Makefile (revision 503283) @@ -1,125 +1,125 @@ # $FreeBSD$ PORTNAME= zoneminder PORTVERSION= 1.32.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru COMMENT= Complete security camera solution, fully web based with image analysis LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>=0:databases/p5-DBD-mysql \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Test-LWP-UserAgent>=0:www/p5-Test-LWP-UserAgent \ p5-Sys-Mmap>=0:devel/p5-Sys-Mmap \ p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \ p5-Sys-CPU>=0:devel/p5-Sys-CPU \ p5-Sys-MemInfo>=0:devel/p5-Sys-MemInfo \ p5-Data-Dump>=0:devel/p5-Data-Dump \ p5-SOAP-WSDL>=0:devel/p5-SOAP-WSDL \ p5-Data-UUID>=0:devel/p5-Data-UUID \ p5-IO-Socket-Multicast>=0:net/p5-IO-Socket-Multicast \ p5-Number-Bytes-Human>=0:devel/p5-Number-Bytes-Human \ p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \ ffmpeg:multimedia/ffmpeg BUILD_DEPENDS= ${ZM_DEPENDS} LIB_DEPENDS= libx264.so:multimedia/libx264 \ libmp4v2.so:multimedia/mp4v2 \ libgcrypt.so:security/libgcrypt RUN_DEPENDS= ${ZM_DEPENDS} \ sudo:security/sudo \ p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \ zip:archivers/zip USES= cmake:insource,noninja jpeg mysql perl5 php shebangfix ssl USE_GITHUB= yes GH_PROJECT= zoneminder GH_TUPLE= zoneminder:crud:0bd63fb:crud \ zoneminder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin USE_RC_SUBR= zoneminder USE_PHP= json pdo_mysql session gd sockets ctype opcache CONFLICTS_INSTALL= zoneminder-h264 OPTIONS_DEFINE= NLS V4L DOCS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" SHEBANG_FILES= scripts/zmaudit.pl.in \ scripts/zmcamtool.pl.in \ scripts/zmcontrol.pl.in \ scripts/zmdc.pl.in \ scripts/zmfilter.pl.in \ scripts/zmpkg.pl.in \ scripts/zmstats.pl.in \ scripts/zmtelemetry.pl.in \ scripts/zmtrack.pl.in \ scripts/zmtrigger.pl.in \ scripts/zmupdate.pl.in \ scripts/zmvideo.pl.in \ scripts/zmwatch.pl.in \ scripts/zmx10.pl.in \ scripts/zmonvif-probe.pl.in PORTDOCS= AUTHORS BUGS ChangeLog INSTALL NEWS README.FreeBSD TODO CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \ -DZM_CONFIG_DIR=${PREFIX}/etc \ -DZM_CONFIG_SUBDIR=${PREFIX}/etc/zoneminder \ -DZM_WEBDIR=${WWWDIR} \ -DZM_CGIDIR=${WWWDIR}/cgi-bin \ -DZM_CONTENTDIR=/var/db/zoneminder \ -DZM_MANPAGE_DEST_PREFIX=${PREFIX}/man \ -DHAVE_SENDFILE=0 \ -DZM_NO_CURL=ON \ -DZM_NO_LIBVLC=ON \ -DPCRE_LIBRARIES=0 \ -DZM_PATH_MAP=/tmp \ -DGNUTLS_LIBRARIES=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" .include RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR} PKGMESSAGE= ${WRKDIR}/pkg-message post-extract: ${CP} -R ${WRKSRC_crud}/* ${WRKSRC}/web/api/app/Plugin/Crud ${CP} -R ${WRKSRC_crud_plugin}/* ${WRKSRC}/web/api/app/Plugin/CakePHP-Enum-Behavior ${CP} ${FILESDIR}/README.FreeBSD ${WRKSRC} ${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE} ${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in # ${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php post-patch: # Avoid conflict with C++20 by adding .txt suffix @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt @${REINPLACE_CMD} -i .c++20 's/"version/&.txt/' \ ${WRKSRC}/CMakeLists.txt pre-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/temp ${MKDIR} ${STAGEDIR}${WWWDIR}/api/app/tmp ${MKDIR} ${STAGEDIR}/var/cache/zoneminder ${MKDIR} ${STAGEDIR}/var/cache/zoneminder/events ${MKDIR} ${STAGEDIR}/var/cache/zoneminder/images ${MKDIR} ${STAGEDIR}/var/db/zoneminder ${MKDIR} ${STAGEDIR}/var/run/zm ${MKDIR} ${STAGEDIR}/var/tmp/zm post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/multimedia/zoneminder/files/patch-src_zm__video.cpp =================================================================== --- head/multimedia/zoneminder/files/patch-src_zm__video.cpp (nonexistent) +++ head/multimedia/zoneminder/files/patch-src_zm__video.cpp (revision 503283) @@ -0,0 +1,17 @@ +--- src/zm_video.cpp.orig 2018-12-08 14:22:36 UTC ++++ src/zm_video.cpp +@@ -455,11 +455,12 @@ int X264MP4Writer::x264encodeloop(bool bFlush) { + + /* Write the sample */ + if ( !buffer.empty() ) { ++ unsigned int bufSize = buffer.size(); + if ( !MP4WriteSample( + mp4h, + mp4vtid, +- buffer.extract(buffer.size()), +- buffer.size(), ++ buffer.extract(bufSize), ++ bufSize, + duration, + offset, + prevKeyframe) ) { Property changes on: head/multimedia/zoneminder/files/patch-src_zm__video.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property