1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00

multimedia/zoneminder: Update to 1.36.12

ChangeLog: https://github.com/ZoneMinder/zoneminder/releases

PR:	260869
Reported by:	bsd@abinet.ru (maintainer)
This commit is contained in:
Ivan 2022-01-03 09:14:36 +01:00 committed by Fernando Apesteguía
parent 3c887a65b8
commit e61e7590fc
6 changed files with 20 additions and 42 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= zoneminder
DISTVERSION= 1.36.5
DISTVERSION= 1.36.12
CATEGORIES= multimedia
MAINTAINER= bsd@abinet.ru
@ -35,7 +35,7 @@ RUN_DEPENDS= ${ZM_DEPENDS} \
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

View File

@ -1,8 +1,8 @@
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

View File

@ -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 <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
+#include <unistd.h>
#if ZM_HAS_V4L

View File

@ -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 {

View File

@ -119,24 +119,19 @@ the same server.
sysrc php_fpm_enable="YES"
service php-fpm start
1.5 ZoneMinder constantly keeps the last N frames from its cameras to
preserve them when alarm occurs. This can be a performance hog if
placed on spindle drive. The best practice is put it on tmpfs.
See https://www.freebsd.org/cgi/man.cgi?query=tmpfs for more
1.5 ZoneMinder keeps the last 1-3 frames from monitors as cache when broadcasting
stream through zms. This can be a performance hog if
placed on spindle drive or add wear to SSD. The best practice is put it on
tmpfs. See https://www.freebsd.org/cgi/man.cgi?query=tmpfs for more
information.
ZoneMinder will use /tmp for default. If you plan to change it, see
ZM_PATH_MAP setting.
Mapping /tmp to tmpfs is actually a recommended step under FreeBSD.
Edit /etc/fstab and add the following:
tmpfs /tmp tmpfs rw,nosuid,mode=01777 0 0
The size of temporary files depends on your number of cameras
number and frames you plan to keep. My 12 3Mbit cameras with 25
last frames consumes 6 GB.
2. ZoneMinder installation
Connect to MySQL under root and create zm user and populate database.
@ -176,6 +171,11 @@ If you see error ERROR 1419 (HY000) during database update, set
log_bin_trust_function_creators = 1 in runtime or in mysql server config;
For example, login as root and issue SET GLOBAL log_bin_trust_function_creators = 1;
Starting from version 1.36, ZM doesn't need too much tmpfs space. zmc process now
allocates memory as needed. tmpfs backed /tmp is still needed by zms to store
1-3 images, so you shrink your tmpfs /tmp drasticallyi (if you followed installation
guide).
EOM
}
]

View File

@ -3083,6 +3083,7 @@ etc/zm.conf
%%SITE_PERL%%/ZoneMinder/Control/onvif.pm
%%SITE_PERL%%/ZoneMinder/Database.pm
%%SITE_PERL%%/ZoneMinder/Event.pm
%%SITE_PERL%%/ZoneMinder/Event_Summary.pm
%%SITE_PERL%%/ZoneMinder/Filter.pm
%%SITE_PERL%%/ZoneMinder/Frame.pm
%%SITE_PERL%%/ZoneMinder/General.pm
@ -6151,6 +6152,7 @@ etc/zm.conf
%%PERL5_MAN3%%/ZoneMinder::Control::mjpgStreamer.3.gz
%%PERL5_MAN3%%/ZoneMinder::Database.3.gz
%%PERL5_MAN3%%/ZoneMinder::Event.3.gz
%%PERL5_MAN3%%/ZoneMinder::Event_Summary.3.gz
%%PERL5_MAN3%%/ZoneMinder::Filter.3.gz
%%PERL5_MAN3%%/ZoneMinder::Frame.3.gz
%%PERL5_MAN3%%/ZoneMinder::General.3.gz
@ -6368,6 +6370,8 @@ share/applications/zoneminder.desktop
%%DATADIR%%/db/zm_update-1.35.7.sql
%%DATADIR%%/db/zm_update-1.35.8.sql
%%DATADIR%%/db/zm_update-1.35.9.sql
%%DATADIR%%/db/zm_update-1.36.6.sql
%%DATADIR%%/db/zm_update-1.36.9.sql
%%DATADIR%%/fonts/default.zmfnt
%%DATADIR%%/icons/16x16/icon.xpm
%%WWWDIR%%/ajax/add_monitors.php