Merge remote-tracking branch 'upstream/master'

.github/ISSUE_TEMPLATE/issue.yml

@@ -5,11 +5,11 @@ body:
   - type: markdown
     attributes:
       value: |
-        Use this form for reporting problems with the code. 
+        Use this form for reporting problems with the code.
   - type: dropdown
     id: readdocs
     attributes:
-      label: Did you read the guide? 
+      label: Did you read the guide?
       multiple: false
       options:
         - 'Yes'
@@ -19,7 +19,7 @@ body:
   - type: dropdown
     id: baseversion
     attributes:
-      label: What is the base version number of Motion being used? 
+      label: What is the base version number of Motion being used?
       multiple: false
       options:
         - 4.0.x
@@ -34,7 +34,7 @@ body:
   - type: dropdown
     id: buildtype
     attributes:
-      label: What was the install method? 
+      label: What was the install method?
       multiple: false
       options:
         - Built from source code
@@ -44,7 +44,7 @@ body:
   - type: dropdown
     id: buildarch
     attributes:
-      label: What is base architecture?  
+      label: What is base architecture?
       multiple: false
       options:
         - ARM-32bit
@@ -56,7 +56,7 @@ body:
   - type: dropdown
     id: distrotype
     attributes:
-      label: What is the distro being used?  
+      label: What is the distro being used?
       multiple: false
       options:
         - Raspbian
@@ -76,7 +76,7 @@ body:
   - type: dropdown
     id: camtype
     attributes:
-      label: Camera type(s) being used? 
+      label: Camera type(s) being used?
       multiple: true
       options:
         - v4l2 USB camera
@@ -91,16 +91,16 @@ body:
   - type: textarea
     id: what-happened
     attributes:
-      label: Describe the issue/problem and steps to reproduce 
+      label: Describe the issue/problem and steps to reproduce
       description: Issue/Problem Description
       placeholder: Tell us what went wrong
     validations:
       required: true
   - type: textarea
     id: logs
     attributes:
-      label: Relevant Motion log output (at log_level 8)
-      description: Please copy and paste the log output. This will be automatically formatted into code, so no need for backticks.
+      label: Motion log output at log_level 8
+      description: Provide the entire log output from Motion start up to when the issue occurs so we can see the parameters.  This will be automatically formatted into code, so no need for backticks.
       render: shell
     validations:
       required: true

Makefile.am

@@ -1,19 +1,18 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src po man
+SUBDIRS = src po
 
-sysconfdir = @sysconfdir@/$(PACKAGE)
-sysconf_DATA = \
+pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+dist_pkgsysconf_DATA = \
 	data/motion-dist.conf \
 	data/camera1-dist.conf \
 	data/camera2-dist.conf \
 	data/camera3-dist.conf \
 	data/camera4-dist.conf
 
-man_MANS = man/motion.1
+dist_man_MANS = man/motion.1
 
-docdir = $(datadir)/doc/@PACKAGE@
-doc_DATA = \
+dist_doc_DATA = \
 	doc/mask1.png \
 	doc/normal.jpg \
 	doc/outputmotion1.jpg  \

configure.ac

@@ -191,8 +191,8 @@ AS_IF([test "${WEBP}" = "yes" ], [
     AS_IF([pkg-config libwebpmux ], [
         AC_MSG_RESULT(yes)
         AC_DEFINE([HAVE_WEBP], [1], [Define to 1 if WEBP is around])
-        TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux`
-        TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux`
+        TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux libwebp`
+        TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp`
       ],[
         AC_MSG_RESULT(no)
       ]
@@ -496,7 +496,6 @@ AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
   po/Makefile.in
-  man/Makefile
   data/camera1-dist.conf
   data/camera2-dist.conf
   data/camera3-dist.conf

doc/CHANGELOG

@@ -1,3 +1,22 @@
+Summary of changes for version 4.6.0 are below
+    * Documentation updates
+    * Fix segfault on vaapi decoding
+    * Add support for DRM HW decode
+    * Remove default for allowed_media_types
+    * Fix libweb includes
+    * Fix autotools and translation files
+    * Update documentation on libcamerify
+    * Fix movie_extpipe
+    * Fix threshold_tune
+    * Add pragma for mmal code
+    * Update year in copyright notice
+    * Revise issue template
+    * Allow for bad packets when processing file
+    * Implement consistent time values
+    * Implement consistent calculation for pixel difference
+    * Fix compiler warnings
+    * Revise ioctl for devices to use long variable
+    * Print log message of signals
 Summary of changes for version 4.5.1 are below
     * Improve closing of v4l2 devices
     * Fix creation of pid_file

doc/motion_build.html

@@ -67,7 +67,7 @@ <h1>
       <button class="dropbtn">Distribution Specific Building</button>
       <div class="dropdown-content">
         <a href="#Preparation_For_Building"> Preparation For Building </a>
-        <a href="#BUILD_DEBIAN">Debian/Ubuntu/Raspbian</a>
+        <a href="#BUILD_DEBIAN">Debian/Ubuntu/Raspberry Pi OS</a>
         <a href="#BUILD_OPENSUSE">Open SUSE</a>
         <a href="#BUILD_FREEBSD">Free BSD</a>
         <a href="#BUILD_CENTOS">CentOS</a>
@@ -100,7 +100,7 @@ <h1>
     <h3><a name="Install_Apt"></a> Installing with apt </h3>
     <ul>
       <p></p>
-      Motion is part of the Debian, Ubuntu and Raspbian repositories and can be installed with the apt tool.  The
+      Motion is part of the Debian, Ubuntu and Raspberry Pi OS repositories and can be installed with the apt tool.  The
       version included with apt will be the version that was available when the distribution version
       was initially deployed and therefore may not represent the latest release.
       <p></p>
@@ -179,11 +179,11 @@ <h3><a name="Abbreviated_Building"></a> Abbreviated Building Guide  </a> </h3>
       script.  If errors occur during the process or you wish to customize the build, please
       review the extended building instructions further below.
       <p></p>
-      Debian / Ubuntu / Raspbian Packages
+      Debian / Ubuntu / Raspberry Pi OS Packages
       <ul>
           <code><strong>sudo apt-get install autoconf automake autopoint build-essential pkgconf libtool libzip-dev
           libjpeg-dev git libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev
-          libwebp-dev gettext libmicrohttpd-dev</strong></code>
+          libwebp-dev gettext libmicrohttpd-dev libcamera-tools libcamera-dev</strong></code>
           <p></p>
           <code><strong>cd ~</strong></code>
           <br /><code><strong>git clone https://github.com/Motion-Project/motion.git</strong></code>
@@ -247,13 +247,13 @@ <h3><a name="Preparation_For_Building"></a> Preparation For Building</a> </h3>
       <p></p>
       <p></p>
 
-      <h4><a name="BUILD_DEBIAN"></a>Debian/Ubuntu/Raspbian</a> </h4>
+      <h4><a name="BUILD_DEBIAN"></a>Debian/Ubuntu/Raspberry Pi OS</a> </h4>
       <ul>
         <li>Required</li>
         <ul>
           <p></p>
-          <code><strong>sudo apt-get install autoconf automake autopoint build-essential pkgconf
-          libtool git libzip-dev libjpeg62-turbo-dev gettext libmicrohttpd-dev</strong></code>
+          <code><strong>sudo apt-get install autoconf automake autopoint build-essential pkgconf libtool libzip-dev
+          libjpeg-dev git gettext libmicrohttpd-dev </strong></code>
           <p></p>
         </ul>
         <p></p>
@@ -293,10 +293,10 @@ <h4><a name="BUILD_DEBIAN"></a>Debian/Ubuntu/Raspbian</a> </h4>
             <code><strong>sudo apt-get install libsqlite3-dev</strong></code>
             <p></p>
           </ul>
-          <li>JPEG Turbo</li>
+          <li>libcamera</li>
           <ul>
             <p></p>
-            <code><strong>sudo apt-get install libjpeg-turbo8 libjpeg-turbo8-dev</strong></code>
+            <code><strong>sudo apt-get install libcamera-tools libcamera-dev</strong></code>
             <p></p>
           </ul>
           <li>Webp Image Support</li>

doc/motion_config.html

@@ -234,26 +234,18 @@ <h2><a name="Basic_Setup"></a>  Basic Setup </h2>
       <p></p>
 
       <a name="basic_setup_picam"></a>
-      <strong>The raspberry Pi camera</strong> is set up multiple ways depending upon the distro being used.
-      <p></p>
-      In the Raspbian version based upon Debian release of 'bullseye' (and presumably later releases), Raspbian
-      allows access to the PI camera via an application called
+      <strong>The raspberry Pi camera</strong> is set up via an application called
       <i><small><code>libcamera</code></small></i>.  <i><small><code>libcamera</code></small></i> provides
       access to the camera as a v4l2 device but this interface is only available when using a special
       application.  Users must run Motion using the
       command <i><small><code>libcamerify motion</code></small></i> and
-      then specify /dev/video0 in the Motion configuration file.
+      then specify the /dev/videoX device in the Motion configuration file.
       <p></p>
-      For Raspbian releases prior to 'bullseye', the PI camera can be set up two different ways.  If Motion is installed by using the
-      apt packages (e.g. apt-get install motion), then the camera must be set up using the bcm2835-v4l2 module which creates
-      a v4l2 device for the camera.  Users will need to install this module using the
-      command <code>sudo modprobe bcm2835-v4l2</code>.  This
-      will set up the camera as a normal v4l2 device and it can be accessed via a standard /dev/videoX device.  If Motion is
-      built from source or installed via the deb packages on the project release page, then an additional option is to set
-      up the camera using the <a href="#mmalcam_name" >mmalcam_name</a> parameter or using
-      the bcm2835-v4l2 module.  <strong>When Motion is installed via apt, the mmalcam option is not available.</strong>
-      It has been noted that this historical method of accessing the PI camera may be available in newer
-      releases via the enabling the legacy camera stack but it is unclear how long this method will be permitted.
+      With just one camera connected to the Pi, the device name should normally be
+      <i><small><code>/dev/video0</code></small></i>.  With multiple cameras connected, e.g. a regular
+      USB web and the Pi camera, you will need to determine the device associated with the
+      Pi camera and the USB camera.  The list of devices can be seen using the command
+      (<i><small><code>v4l2-ctl --list-devices</code></small></i>).
       <p></p>
 
       <a name="basic_setup_composite"></a>