diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index ae0b59fd1c46..620591761308 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -1,118 +1,118 @@ PORTNAME= zoneminder -DISTVERSION= 1.36.5 +DISTVERSION= 1.36.12 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru COMMENT= Complete security camera solution, fully web based with image analysis LICENSE= GPLv2 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 \ p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \ p5-Data-Entropy>=0:security/p5-Data-Entropy \ zip:archivers/zip USES= cmake:insource,noninja cpe jpeg mysql perl5 php shebangfix ssl USE_GITHUB= yes -GH_TUPLE= FriendsOfCake:crud:0bd63fb:crud/web/api/app/Plugin/Crud \ +GH_TUPLE= FriendsOfCake:crud:1429237:crud/web/api/app/Plugin/Crud \ ZoneMinder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin/web/api/app/Plugin/CakePHP-Enum-Behavior \ ZoneMinder:RtspServer:cd7fd49:rtsp_server/dep/RtspServer USE_RC_SUBR= zoneminder USE_PHP= json pdo_mysql session gd sockets ctype opcache openssl hash OPTIONS_DEFINE= NLS V4L 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}" SUB_FILES= pkg-message 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 \ scripts/zmrecover.pl.in 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 .if ${OPSYS} == FreeBSD EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt .endif RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR} PKGMESSAGE= ${WRKDIR}/pkg-message 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: # zmsystemctl.pl is only for systend-based systems @cd ${STAGEDIR}${PREFIX} && \ ${RM} \ bin/zmsystemctl.pl \ man/man8/zmsystemctl.pl.8.gz .include diff --git a/multimedia/zoneminder/distinfo b/multimedia/zoneminder/distinfo index 37613e2db517..3bde15a93e04 100644 --- a/multimedia/zoneminder/distinfo +++ b/multimedia/zoneminder/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1629145711 -SHA256 (zoneminder-zoneminder-1.36.5_GH0.tar.gz) = c618a0aaf23739ed31ce529245dee9dc7219f3abbcbdbb4c227872545b1bf6f1 -SIZE (zoneminder-zoneminder-1.36.5_GH0.tar.gz) = 11347787 -SHA256 (FriendsOfCake-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579 -SIZE (FriendsOfCake-crud-0bd63fb_GH0.tar.gz) = 73129 +TIMESTAMP = 1641049619 +SHA256 (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 8f2772c9aa891e3e3de6b73e4ce95189af4d5faa886ac13d7ce20972d11c31dd +SIZE (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 11350267 +SHA256 (FriendsOfCake-crud-1429237_GH0.tar.gz) = 4dc57f344623d3c0e735b53ed583e5382aa9e43012215f641cbd8ebad381aadc +SIZE (FriendsOfCake-crud-1429237_GH0.tar.gz) = 73018 SHA256 (ZoneMinder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1 SIZE (ZoneMinder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3500 SHA256 (ZoneMinder-RtspServer-cd7fd49_GH0.tar.gz) = 0a397ca5810ecff1c66955348b65903114c5da8f390e3af137a4d0fa33672762 SIZE (ZoneMinder-RtspServer-cd7fd49_GH0.tar.gz) = 1395694 diff --git a/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp b/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp deleted file mode 100644 index 6148f7585ee2..000000000000 --- a/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp +++ /dev/null @@ -1,12 +0,0 @@ -- workaround for https://github.com/ZoneMinder/zoneminder/issues/3330 - ---- src/zm_local_camera.cpp.orig 2021-08-16 21:01:02 UTC -+++ src/zm_local_camera.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #if ZM_HAS_V4L - diff --git a/multimedia/zoneminder/files/patch-src_zm__utils.cpp b/multimedia/zoneminder/files/patch-src_zm__utils.cpp deleted file mode 100644 index 90527e79b228..000000000000 --- a/multimedia/zoneminder/files/patch-src_zm__utils.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/zm_utils.cpp.orig 2021-11-28 23:56:36 UTC -+++ src/zm_utils.cpp -@@ -224,8 +224,9 @@ void HwCapsDetect() { - #elif defined(__arm__) - // ARM processor in 32bit mode - // To see if it supports NEON, we need to get that information from the kernel -- unsigned long auxval = getauxval(AT_HWCAP); -- if (auxval & HWCAP_ARM_NEON) { -+ unsigned long auxval = 0; -+ elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval)); -+ if (auxval & HWCAP_NEON) { - Debug(1,"Detected ARM (AArch32) processor with Neon"); - neonversion = 1; - } else { diff --git a/multimedia/zoneminder/files/pkg-message.in b/multimedia/zoneminder/files/pkg-message.in index 1f945bbf466c..6599d214cc40 100644 --- a/multimedia/zoneminder/files/pkg-message.in +++ b/multimedia/zoneminder/files/pkg-message.in @@ -1,181 +1,181 @@ [ { type: install message: <