Merge branch 'master' into yuv420

Author: connortechnology

.cirrus.yml

@@ -3,10 +3,10 @@ task:
   freebsd_instance:
     matrix:
       - image_family: freebsd-14-0
-      - image_family: freebsd-13-2
+      - image_family: freebsd-13-3
 
   prepare_script:
-    - pkg install -yq git cmake pkgconf jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap v4l_compat
+    - pkg install -yq git cmake pkgconf jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch2 p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap v4l_compat
 
   configure_script:
     - git submodule update --init --recursive

.eslintignore

@@ -7,7 +7,7 @@ web/js/videojs.zoomrotate.js
 web/js/fontfaceobserver.standalone.js
 web/skins/classic/js/bootstrap-4.5.0.js
 web/skins/classic/js/bootstrap.bundle.min.js
-web/skins/classic/js/bootstrap-table-1.22.3
+web/skins/classic/js/bootstrap-table-1.23.5
 web/skins/classic/js/chosen
 web/skins/classic/js/dateTimePicker
 web/skins/classic/js/jquery-*.js
@@ -16,7 +16,6 @@ web/skins/classic/js/jquery.js
 web/skins/classic/js/moment.js
 web/skins/classic/js/video.js
 web/skins/classic/assets
-web/tools/mootools
 web/js/janus.js
 web/js/ajaxQueue.js
 web/js/hls.js

.github/workflows/ci-bookworm.yml

@@ -47,7 +47,7 @@ jobs:
           libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libavdevice-dev
           libcurl4-gnutls-dev libvlc-dev libvncserver-dev
           libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
-          libpolkit-gobject-1-dev
+          libpolkit-gobject-1-dev gsoap
           ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
       - name: Prepare
         run: mkdir build

.github/workflows/create-packages.yml

@@ -21,6 +21,9 @@ jobs:
           - os: ubuntu
             dist: jammy
             arch: x86_64
+          - os: ubuntu
+            dist: noble
+            arch: x86_64
           - os: debian
             dist: bookworm
             arch: x86_64

.gitignore

@@ -199,10 +199,6 @@ web/cmake_install.cmake
 web/events/
 web/images/
 web/includes/config.php
-web/tools/mootools/CMakeFiles/
-web/tools/mootools/cmake_install.cmake
-web/tools/mootools/mootools-core.js
-web/tools/mootools/mootools-more.js
 web/undef.log
 zm.conf
 zmconfgen.pl

.readthedocs.yaml

@@ -7,6 +7,7 @@ build:
 
 sphinx:
   fail_on_warning: true
+  configuration: docs/conf.py
 
 python:
   install:

.well-known/funding-manifest-urls

@@ -0,0 +1 @@
+https://zoneminder.com/funding.json

CMakeLists.txt

@@ -445,7 +445,7 @@ if(NOT ZM_NO_MQTT)
   find_package(MOSQUITTO)
   if(MOSQUITTO_FOUND)
     include_directories(${MOSQUITTO_INCLUDE_DIRS})
-    list(APPEND ZM_BIN_LIBS "${MOSQUITTO_LIBRARIES}")
+    list(APPEND ZM_BIN_LIBS "${MOSQUITTO_LIBRARY}")
     set(optlibsfound "${optlibsfound} Mosquitto")
   else()
     set(optlibsnotfound "${optlibsnotfound} Mosquitto")
@@ -454,7 +454,7 @@ if(NOT ZM_NO_MQTT)
   find_package(MOSQUITTOPP)
   if(MOSQUITTOPP_FOUND)
     include_directories(${MOSQUITTOPP_INCLUDE_DIRS})
-    list(APPEND ZM_BIN_LIBS "${MOSQUITTOPP_LIBRARIES}")
+    list(APPEND ZM_BIN_LIBS "${MOSQUITTOPP_LIBRARY}")
     set(optlibsfound "${optlibsfound} Mosquittopp")
   else()
     set(optlibsnotfound "${optlibsnotfound} Mosquittopp")

cmake/Modules/Pod2Man.cmake

@@ -47,7 +47,7 @@ MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
 
 	ADD_CUSTOM_COMMAND(
 		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-		COMMAND ${GZIP} --best -c ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
+		COMMAND ${GZIP} -n --best -c ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
 		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
 	)
 

db/triggers.sql

@@ -133,7 +133,7 @@ BEGIN
       UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Storage.Id = NEW.StorageId;
     END IF;
     IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Storage.Id = OLD.StorageId;
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
     END IF;
   END IF;
 
@@ -172,7 +172,6 @@ BEGIN
         TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
       WHERE Event_Summaries.MonitorId=OLD.MonitorId;
   END IF;
-
 END;
 
 //