From b760d0be48c2ebf9fc0ff2b991cd9c80e07ca502 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 25 Mar 2023 21:03:40 -0600
Subject: [PATCH 01/20] Revise to always use long for ioctl calls.  Closes
 #1644

---
 src/video_v4l2.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/video_v4l2.c b/src/video_v4l2.c
index ccfc5708..fd02823a 100644
--- a/src/video_v4l2.c
+++ b/src/video_v4l2.c
@@ -126,11 +126,7 @@ static void v4l2_palette_init(palette_item *palette_array)
 
 }
 
-#if defined (BSD)
 static int xioctl(src_v4l2_t *vid_source, unsigned long request, void *arg)
-#else
-static int xioctl(src_v4l2_t *vid_source, int request, void *arg)
-#endif
 {
     int ret;
 

From a96fa47ac74fd7508011397ed55140d5b68d2952 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 25 Mar 2023 21:11:27 -0600
Subject: [PATCH 02/20] Resolve compiler warnings.  Closes #1632

---
 src/alg.c  | 2 +-
 src/util.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/alg.c b/src/alg.c
index 7025e681..8d083fea 100644
--- a/src/alg.c
+++ b/src/alg.c
@@ -1290,7 +1290,7 @@ static char alg_diff_fast(struct context *cnt, int max_n_changes, unsigned char
     i = imgs->motionsize;
 
     for (; i > 0; i -= step) {
-        register unsigned char curdiff = (int)(abs((char)(*ref - *new))); /* Using a temp variable is 12% faster. */
+        register unsigned char curdiff = (int)(abs(*ref - *new)); /* Using a temp variable is 12% faster. */
         if (curdiff >  noise) {
             diffs++;
             if (diffs > max_n_changes) {
diff --git a/src/util.c b/src/util.c
index 90e81d0e..ee01185b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -212,8 +212,8 @@ void *myrealloc(void *ptr, size_t size, const char *desc)
     if (size == 0) {
         free(ptr);
         MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO
-            ,_("Warning! Function %s tries to resize memoryblock at %p to 0 bytes!")
-            ,desc, ptr);
+            ,_("Warning! Function %s tries to resize memoryblock to 0 bytes!")
+            ,desc);
     } else {
         dummy = realloc(ptr, size);
         if (!dummy) {

From 746edce28bad959d7a0a98da795620522ca1780e Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sun, 26 Mar 2023 00:10:49 -0600
Subject: [PATCH 03/20] Revise alg diff to use same calc for standard and fast

---
 src/alg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/alg.c b/src/alg.c
index 8d083fea..c8ca553d 100644
--- a/src/alg.c
+++ b/src/alg.c
@@ -1232,7 +1232,7 @@ int alg_diff_standard(struct context *cnt, unsigned char *new)
      */
 
     for (; i > 0; i--) {
-        register unsigned char curdiff = (int)(abs(*ref - *new)); /* Using a temp variable is 12% faster. */
+        int curdiff = abs((char)*ref - (char)*new);
         /* Apply fixed mask */
         if (mask) {
             curdiff = ((int)(curdiff * *mask++) / 255);
@@ -1290,7 +1290,7 @@ static char alg_diff_fast(struct context *cnt, int max_n_changes, unsigned char
     i = imgs->motionsize;
 
     for (; i > 0; i -= step) {
-        register unsigned char curdiff = (int)(abs(*ref - *new)); /* Using a temp variable is 12% faster. */
+        int curdiff = abs((char)*ref - (char)*new);
         if (curdiff >  noise) {
             diffs++;
             if (diffs > max_n_changes) {

From 46e298f320548282fb71f6bd6a8f096a449b3ed0 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sun, 26 Mar 2023 00:21:56 -0600
Subject: [PATCH 04/20] Update to use consistent timeval variables.  Closes
 #1617

---
 src/event.c       |  6 ++--
 src/motion.c      | 70 +++++++++++++++++++++--------------------------
 src/motion.h      | 14 ++++------
 src/webu_status.c | 12 ++++----
 4 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/src/event.c b/src/event.c
index e9cfeecf..58a0d2cb 100644
--- a/src/event.c
+++ b/src/event.c
@@ -780,7 +780,8 @@ static void event_create_extpipe(struct context *cnt, motion_event eventtype
 
         cnt->movie_last_shot = -1;
         cnt->movie_fps = cnt->lastrate;
-        cnt->movietime = tv1->tv_sec;
+        cnt->movie_tv.tv_sec = tv1->tv_sec;
+        cnt->movie_tv.tv_usec = tv1->tv_usec;
 
         MOTION_LOG(INF, TYPE_EVENTS, NO_ERRNO, _("Source FPS %d"), cnt->movie_fps);
 
@@ -910,7 +911,8 @@ static void event_ffmpeg_newfile(struct context *cnt, motion_event eventtype
 
     cnt->movie_last_shot = -1;
     cnt->movie_fps = cnt->lastrate;
-    cnt->movietime = tv1->tv_sec;
+    cnt->movie_tv.tv_sec = tv1->tv_sec;
+    cnt->movie_tv.tv_usec = tv1->tv_usec;
 
     MOTION_LOG(INF, TYPE_EVENTS, NO_ERRNO, _("Source FPS %d"), cnt->movie_fps);
 
diff --git a/src/motion.c b/src/motion.c
index 2bb022ee..08044656 100644
--- a/src/motion.c
+++ b/src/motion.c
@@ -514,6 +514,7 @@ static void motion_detected(struct context *cnt, int dev, struct image_data *img
     struct config *conf = &cnt->conf;
     struct images *imgs = &cnt->imgs;
     struct coord *location = &img->location;
+    struct tm event_tm;
     int indx;
 
     /* Draw location */
@@ -552,10 +553,10 @@ static void motion_detected(struct context *cnt, int dev, struct image_data *img
              * in both time_t and struct tm format.
              */
             cnt->prev_event = cnt->event_nr;
-            cnt->eventtime = img->timestamp_tv.tv_sec;
-            localtime_r(&cnt->eventtime, cnt->eventtime_tm);
+            cnt->event_tv = img->timestamp_tv;
+            localtime_r(&cnt->event_tv.tv_sec, &event_tm);
             sprintf(cnt->eventid,"%05d",cnt->camera_id);
-            strftime(cnt->eventid+5, 15,"%Y%m%d%H%M%S", cnt->eventtime_tm);
+            strftime(cnt->eventid+5, 15,"%Y%m%d%H%M%S", &event_tm);
             /*
              * Since this is a new event we create the event_text_string used for
              * the %C conversion specifier. We may already need it for
@@ -1047,11 +1048,7 @@ static int motion_init(struct context *cnt)
     /* Store thread number in TLS. */
     pthread_setspecific(tls_key_threadnr, (void *)((unsigned long)cnt->threadnr));
 
-    cnt->currenttime_tm = mymalloc(sizeof(struct tm));
-    cnt->eventtime_tm = mymalloc(sizeof(struct tm));
-    /* Init frame time */
-    cnt->currenttime = time(NULL);
-    localtime_r(&cnt->currenttime, cnt->currenttime_tm);
+    gettimeofday(&cnt->current_tv, NULL);
 
     cnt->smartmask_speed = 0;
 
@@ -1394,7 +1391,15 @@ static int motion_init(struct context *cnt)
     cnt->timenow = 0;
     cnt->timebefore = 0;
     cnt->rate_limit = 0;
-    cnt->lastframetime = 0;
+
+    cnt->last_tv.tv_sec = 0;
+    cnt->last_tv.tv_usec = 0;
+    cnt->lastframe_tv = cnt->last_tv;
+    cnt->event_tv = cnt->last_tv;
+    cnt->movie_tv = cnt->last_tv;
+    cnt->lostconnection_tv = cnt->last_tv;
+    cnt->lastframe_tv = cnt->last_tv;
+
     cnt->minimum_frame_time_downcounter = cnt->conf.minimum_frame_time;
     cnt->get_image = 1;
 
@@ -1547,14 +1552,6 @@ static void motion_cleanup(struct context *cnt)
         cnt->rolling_average_data = NULL;
     }
 
-    /* Cleanup the current time structure */
-    free(cnt->currenttime_tm);
-    cnt->currenttime_tm = NULL;
-
-    /* Cleanup the event time structure */
-    free(cnt->eventtime_tm);
-    cnt->eventtime_tm = NULL;
-
     dbse_deinit(cnt);
 
 }
@@ -1726,23 +1723,17 @@ static void mlp_prepare(struct context *cnt)
     }
 
     /* Get time for current frame */
-    cnt->currenttime = time(NULL);
-
-    /*
-     * localtime returns static data and is not threadsafe
-     * so we use localtime_r which is reentrant and threadsafe
-     */
-    localtime_r(&cnt->currenttime, cnt->currenttime_tm);
+    gettimeofday(&cnt->current_tv, NULL);
 
     /*
      * If we have started on a new second we reset the shots variable
      * lastrate is updated to be the number of the last frame. last rate
      * is used as the ffmpeg framerate when motion is detected.
      */
-    if (cnt->lastframetime != cnt->currenttime) {
+    if (cnt->lastframe_tv.tv_sec != cnt->current_tv.tv_sec) {
         cnt->lastrate = cnt->shots + 1;
         cnt->shots = -1;
-        cnt->lastframetime = cnt->currenttime;
+        cnt->lastframe_tv = cnt->current_tv;
 
         if (cnt->conf.minimum_frame_time) {
             cnt->minimum_frame_time_downcounter--;
@@ -1815,7 +1806,7 @@ static void mlp_resetimages(struct context *cnt)
     }
 
     /* Store time with pre_captured image */
-    gettimeofday(&cnt->current_image->timestamp_tv, NULL);
+    cnt->current_image->timestamp_tv = cnt->current_tv;
 
     /* Store shot number with pre_captured image */
     cnt->current_image->shot = cnt->shots;
@@ -1826,7 +1817,7 @@ static int mlp_retry(struct context *cnt)
 {
     int size_high, height, width;
 
-    if (cnt->video_dev < 0 && cnt->currenttime % 10 == 0 && cnt->shots == 0) {
+    if (cnt->video_dev < 0 && cnt->current_tv.tv_sec % 10 == 0 && cnt->shots == 0) {
         MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO
             ,_("Retrying until successful connection with camera"));
 
@@ -1904,7 +1895,8 @@ static int mlp_capture(struct context *cnt)
     // VALID PICTURE
     if (vid_return_code == 0) {
         cnt->lost_connection = 0;
-        cnt->connectionlosttime = 0;
+        cnt->lostconnection_tv.tv_sec = 0;
+        cnt->lostconnection_tv.tv_usec = 0;
 
         /* If all is well reset missing_frame_counter */
         if (cnt->missing_frame_counter >= MISSING_FRAMES_TIMEOUT * cnt->conf.framerate) {
@@ -1982,8 +1974,8 @@ static int mlp_capture(struct context *cnt)
          * First missed frame - store timestamp
          * Don't reset time when thread restarts
          */
-        if (cnt->connectionlosttime == 0) {
-            cnt->connectionlosttime = cnt->currenttime;
+        if (cnt->lostconnection_tv.tv_sec == 0) {
+            cnt->lostconnection_tv = cnt->current_tv;
         }
 
 
@@ -2008,10 +2000,9 @@ static int mlp_capture(struct context *cnt)
                 tmpin = "UNABLE TO OPEN VIDEO DEVICE\\nSINCE %Y-%m-%d %T";
             }
 
-            tv1.tv_sec=cnt->connectionlosttime;
-            tv1.tv_usec = 0;
             memset(cnt->current_image->image_norm, 0x80, cnt->imgs.size_norm);
-            mystrftime(cnt, tmpout, sizeof(tmpout), tmpin, &tv1, NULL, 0);
+            mystrftime(cnt, tmpout, sizeof(tmpout), tmpin
+                , &cnt->lostconnection_tv, NULL, 0);
             draw_text(cnt->current_image->image_norm, cnt->imgs.width, cnt->imgs.height,
                       10, 20 * cnt->text_scale, tmpout, cnt->text_scale);
 
@@ -2020,7 +2011,8 @@ static int mlp_capture(struct context *cnt)
                 MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO
                     ,_("Video signal lost - Adding grey image"));
                 // Event for lost video signal can be called from here
-                event(cnt, EVENT_CAMERA_LOST, NULL, NULL, NULL, &tv1);
+                event(cnt, EVENT_CAMERA_LOST, NULL, NULL, NULL
+                    , &cnt->lostconnection_tv);
             }
 
             /*
@@ -2433,7 +2425,7 @@ static void mlp_actions(struct context *cnt)
 
     /* Update last frame saved time, so we can end event after gap time */
     if (cnt->current_image->flags & IMAGE_SAVE) {
-        cnt->lasttime = cnt->current_image->timestamp_tv.tv_sec;
+        cnt->last_tv = cnt->current_image->timestamp_tv;
     }
 
     mlp_areadetect(cnt);
@@ -2442,7 +2434,7 @@ static void mlp_actions(struct context *cnt)
 
     /* Check event gap */
     if ((cnt->conf.event_gap > 0) &&
-        ((cnt->currenttime - cnt->lasttime) >= cnt->conf.event_gap )) {
+        ((cnt->current_tv.tv_sec - cnt->last_tv.tv_sec) >= cnt->conf.event_gap )) {
         cnt->event_stop = TRUE;
     }
     /* Note that event_stop can be set elsewhere in code as well */
@@ -2485,7 +2477,7 @@ static void mlp_actions(struct context *cnt)
      */
     if ((cnt->conf.movie_max_time > 0) &&
         (cnt->event_nr == cnt->prev_event) &&
-        (cnt->current_image->timestamp_tv.tv_sec - cnt->movietime >= cnt->conf.movie_max_time) &&
+        (cnt->current_image->timestamp_tv.tv_sec - cnt->movie_tv.tv_sec >= cnt->conf.movie_max_time) &&
         ( !(cnt->current_image->flags & IMAGE_POSTCAP)) &&
         ( !(cnt->current_image->flags & IMAGE_PRECAP))) {
         event(cnt, EVENT_MOVIE_END, NULL, NULL, NULL, &cnt->current_image->timestamp_tv);
@@ -2544,7 +2536,7 @@ static void mlp_snapshot(struct context *cnt)
      */
 
     /* time_current_frame is used both for snapshot and timelapse features */
-    cnt->time_current_frame = cnt->currenttime;
+    cnt->time_current_frame = cnt->current_tv.tv_sec;
 
     if ((cnt->conf.snapshot_interval > 0 && cnt->shots == 0 &&
          cnt->time_current_frame % cnt->conf.snapshot_interval <= cnt->time_last_frame % cnt->conf.snapshot_interval) ||
diff --git a/src/motion.h b/src/motion.h
index 35a3fe6c..5fdf31df 100644
--- a/src/motion.h
+++ b/src/motion.h
@@ -445,14 +445,13 @@ struct context {
     int postcap;                             /* downcounter, frames left to to send post event */
     int shots;
     unsigned int detecting_motion;
-    struct tm *currenttime_tm;
-    struct tm *eventtime_tm;
 
-    time_t currenttime;
-    time_t lasttime;
-    time_t eventtime;
-    time_t movietime;
-    time_t connectionlosttime;               /* timestamp from connection lost */
+    struct timeval current_tv;
+    struct timeval last_tv;
+    struct timeval event_tv;
+    struct timeval movie_tv;
+    struct timeval lostconnection_tv;               /* timestamp from connection lost */
+    struct timeval lastframe_tv;
 
     unsigned int lastrate;
     unsigned int startup_frames;
@@ -516,7 +515,6 @@ struct context {
     unsigned long long int timenow, timebefore;
 
     unsigned int rate_limit;
-    time_t lastframetime;
     int minimum_frame_time_downcounter;
     unsigned int get_image;    /* Flag used to signal that we capture new image when we run the loop */
 
diff --git a/src/webu_status.c b/src/webu_status.c
index f0213050..ade6d7d0 100644
--- a/src/webu_status.c
+++ b/src/webu_status.c
@@ -163,9 +163,9 @@ static void webu_json_cam_status_single(struct webui_ctx *webui, struct context
         const char *name;
         time_t value;
     } timestamps[] = {
-        { "lasttime", cnt->lasttime },
-        { "eventtime", cnt->eventtime },
-        { "connectionlosttime", cnt->connectionlosttime },
+        { "lasttime", cnt->last_tv.tv_sec },
+        { "eventtime", cnt->event_tv.tv_sec },
+        { "connectionlosttime", cnt->lostconnection_tv.tv_sec },
         { NULL, 0 },
     }, *cur_timestamp;
 
@@ -196,9 +196,9 @@ static void webu_json_cam_status_single(struct webui_ctx *webui, struct context
     webu_write(webui, buf);
 
     webu_write(webui, ", \"currenttime\": ");
-    webu_json_write_timestamp(webui, cnt->currenttime);
+    webu_json_write_timestamp(webui, cnt->current_tv.tv_sec);
     webu_write(webui, ", \"currenttime_iso8601\": ");
-    webu_json_write_timestamp_iso8601(webui, cnt->currenttime);
+    webu_json_write_timestamp_iso8601(webui, cnt->current_tv.tv_sec);
 
     for (cur_timestamp = timestamps; cur_timestamp && cur_timestamp->name;
          ++cur_timestamp) {
@@ -220,7 +220,7 @@ static void webu_json_cam_status_single(struct webui_ctx *webui, struct context
             webu_write(webui, "null");
         } else {
             webu_json_write_timestamp_elapsed(webui, cur_timestamp->value,
-                                              cnt->currenttime);
+                                              cnt->current_tv.tv_sec);
         }
     }
 

From bc19eeebc4ec6d19403dd35eea2ce4843031ba39 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sun, 26 Mar 2023 00:30:31 -0600
Subject: [PATCH 05/20] Allow for bad packets when file processing.  Closes
 #1651

---
 src/netcam_rtsp.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.c
index e729ef0a..5c475ab8 100644
--- a/src/netcam_rtsp.c
+++ b/src/netcam_rtsp.c
@@ -464,7 +464,12 @@ static int netcam_rtsp_decode_video(struct rtsp_context *rtsp_data)
             av_strerror(retcd, errstr, sizeof(errstr));
             MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
                 ,_("Error sending packet to codec: %s"), errstr);
-            return -1;
+            /* This is non fatal for file processing */
+            if (mystreq(rtsp_data->service, "file")) {
+                return 0;
+            } else {
+                return -1;
+            }
         }
 
         if (mystrceq(rtsp_data->decoder_nm,"vaapi")) {

From df920a5bd0c7a9cfd4e778c9b4ed473df479237c Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sun, 26 Mar 2023 10:25:40 -0600
Subject: [PATCH 06/20] Revise the issue template

---
 .github/ISSUE_TEMPLATE/issue.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml
index 597d1ee1..a9fc075a 100644
--- a/.github/ISSUE_TEMPLATE/issue.yml
+++ b/.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,7 +91,7 @@ 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:
@@ -99,8 +99,8 @@ body:
   - 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

From f4a643f15580f5bac31a803388763a851b55eae3 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sun, 26 Mar 2023 17:16:32 -0600
Subject: [PATCH 07/20] Update year

---
 src/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf.c b/src/conf.c
index c4958f1a..e583761f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3217,7 +3217,7 @@ static struct context **config_camera(struct context **cnt, const char *str, int
  */
 static void usage()
 {
-    printf("motion Version "VERSION", Copyright 2000-2021 Jeroen Vreeken/Folkert van Heusden/Kenneth Lavrsen/Motion-Project maintainers\n");
+    printf("motion Version "VERSION", Copyright 2000-2023 Jeroen Vreeken/Folkert van Heusden/Kenneth Lavrsen/Motion-Project maintainers\n");
     printf("\nHome page :\t https://motion-project.github.io/ \n");
     printf("\nusage:\tmotion [options]\n");
     printf("\n\n");

From 68172aec4cbd67fd499d05355c57d6b1a661fcf1 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sun, 26 Mar 2023 17:21:36 -0600
Subject: [PATCH 08/20] Add pragma ignore for MMAL code

---
 src/mmalcam.c                  | 22 ++++++++++++----------
 src/raspicam/RaspiCamControl.c | 13 +++++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/mmalcam.c b/src/mmalcam.c
index bd128e4e..b2f7d49a 100644
--- a/src/mmalcam.c
+++ b/src/mmalcam.c
@@ -33,16 +33,18 @@
 #include "rotate.h"
 
 #ifdef HAVE_MMAL
-
-#include "interface/vcos/vcos.h"
-#include "interface/mmal/mmal.h"
-#include "interface/mmal/mmal_buffer.h"
-#include "interface/mmal/mmal_port.h"
-#include "interface/mmal/util/mmal_util.h"
-#include "interface/mmal/util/mmal_util_params.h"
-#include "interface/mmal/util/mmal_default_components.h"
-#include "interface/mmal/util/mmal_connection.h"
-#include "raspicam/RaspiCamControl.h"
+#pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wredundant-decls"
+    #include "interface/vcos/vcos.h"
+    #include "interface/mmal/mmal.h"
+    #include "interface/mmal/mmal_buffer.h"
+    #include "interface/mmal/mmal_port.h"
+    #include "interface/mmal/util/mmal_util.h"
+    #include "interface/mmal/util/mmal_util_params.h"
+    #include "interface/mmal/util/mmal_default_components.h"
+    #include "interface/mmal/util/mmal_connection.h"
+    #include "raspicam/RaspiCamControl.h"
+#pragma GCC diagnostic pop
 
 #define MMALCAM_OK        0
 #define MMALCAM_ERROR    -1
diff --git a/src/raspicam/RaspiCamControl.c b/src/raspicam/RaspiCamControl.c
index 4c89b1f5..46e11a05 100644
--- a/src/raspicam/RaspiCamControl.c
+++ b/src/raspicam/RaspiCamControl.c
@@ -31,6 +31,7 @@ This file was modified to be used with the motion project. The controls are pars
 via "mmalcam_control_params" function in motion to the raspicam driver. To fulfill
 such functionality without bloating the motion code, the following changes were
 made:
+- Add pragma gcc diagnostic to whole module to ignore warnings
 - remove call to helper module "RaspiHelpers.h";
 - include only "mmal_status_to_int" function from "RaspiHelpers.h". This function
 was copied exactly as written in "RaspiHelpers.h" file.
@@ -41,6 +42,16 @@ was copied exactly as written in "RaspiHelpers.h" file.
 #include <memory.h>
 #include <ctype.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
+#pragma GCC diagnostic ignored "-Wunused"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
 #include "interface/vcos/vcos.h"
 
 #include "interface/vmcs_host/vc_vchi_gencmd.h"
@@ -1913,3 +1924,5 @@ void default_camera_control_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *bu
 
    mmal_buffer_header_release(buffer);
 }
+
+pragma GCC diagnostic pop

From f710f915e98f2ff001804360c09868cfac8182d6 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sun, 26 Mar 2023 18:00:55 -0600
Subject: [PATCH 09/20] Fix pragma pop

---
 src/raspicam/RaspiCamControl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/raspicam/RaspiCamControl.c b/src/raspicam/RaspiCamControl.c
index 46e11a05..ec02a277 100644
--- a/src/raspicam/RaspiCamControl.c
+++ b/src/raspicam/RaspiCamControl.c
@@ -1925,4 +1925,4 @@ void default_camera_control_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *bu
    mmal_buffer_header_release(buffer);
 }
 
-pragma GCC diagnostic pop
+#pragma GCC diagnostic pop

From c3fc8a9e3da0f918ec11dbe379dfc31062a6efeb Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Thu, 6 Apr 2023 20:10:31 -0600
Subject: [PATCH 10/20] Fix threshold_tune.  Closes #1663

---
 src/motion.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/motion.c b/src/motion.c
index 08044656..40a45d44 100644
--- a/src/motion.c
+++ b/src/motion.c
@@ -2720,17 +2720,6 @@ static void mlp_parmsupdate(struct context *cnt)
 
     dbse_sqlmask_update(cnt);
 
-    cnt->threshold = cnt->conf.threshold;
-    if (cnt->conf.threshold_maximum > cnt->conf.threshold ) {
-        cnt->threshold_maximum = cnt->conf.threshold_maximum;
-    } else {
-        cnt->threshold_maximum = (cnt->imgs.height * cnt->imgs.width * 3) / 2;
-    }
-
-    if (!cnt->conf.noise_tune) {
-        cnt->noise = cnt->conf.noise_level;
-    }
-
 }
 
 static void mlp_frametiming(struct context *cnt)

From 8d376979a1f6f69bc15a2883e1a96ba3e5c57b7a Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Thu, 6 Apr 2023 20:15:12 -0600
Subject: [PATCH 11/20] Set extpipe to NULL upon close.  Closes #1659

---
 src/event.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/event.c b/src/event.c
index 58a0d2cb..a36e2496 100644
--- a/src/event.c
+++ b/src/event.c
@@ -761,6 +761,7 @@ static void event_extpipe_end(struct context *cnt, motion_event eventtype
         MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("pclose return: %d"),
                    pclose(cnt->extpipe));
         event(cnt, EVENT_FILECLOSE, NULL, cnt->extpipefilename, (void *)FTYPE_MPEG, tv1);
+        cnt->extpipe = NULL;
     }
 }
 

From c28d41b2f7ee3a20dd65c5e158e126991de898c7 Mon Sep 17 00:00:00 2001
From: Peter Parkkali <peter.parkkali@iki.fi>
Date: Sun, 16 Apr 2023 17:06:45 +0300
Subject: [PATCH 12/20] Update docs with details on using libcamerify and
 multiple cameras on Raspberry Pi

---
 doc/motion_config.html | 43 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/doc/motion_config.html b/doc/motion_config.html
index 12d0e137..1ce9672c 100644
--- a/doc/motion_config.html
+++ b/doc/motion_config.html
@@ -242,7 +242,48 @@ <h2><a name="Basic_Setup"></a>  Basic Setup </h2>
       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>
+      The PI camera's drivers expose the camera's full functionality as a set of low-level /dev/videoX
+      devices, while Motion (and other applications) expect a single high-level /dev/videoX device. The
+      libcamerify wrapper transparently manages these low-level devices and presents a high-level
+      interface on one of the /dev/videoX device nodes to Motion
+      (<a href="https://libcamera.org/docs.html#v4l2-compatibility-layer">libcamera docs</a>).
+      <p></p>
+      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 should use the device names provided by V4L
+      (<i><small><code>v4l2-ctl --list-devices</code></small></i>). The wrapper doesn't seem to affect
+      the device names seen by Motion. In the below example, the PI camera is at
+      <i><small><code>/dev/video2</code></small></i> while an external USB camera is at
+      <i><small><code>/dev/video0</code></small></i> ("CSI" stands for the
+      <a href="https://en.wikipedia.org/wiki/Camera_Serial_Interface">interface	used by the Pi camera</a>).
+      <p></p>
+      Also, /dev/videoN names are dynamically assigned and may not always point to the same camera (e.g.
+      when a USB camera is hot-plugged). Take a look at the stable symlinks under
+      <i><small><code>/dev/v4l/by-path/</code></small></i> and consider using them in your Motion config
+      instead of /dev/videoX.
+      <pre>
+root@raspberrypi:~# v4l2-ctl --list-devices
+unicam (platform:3f801000.csi):
+/dev/video2                        # <== PI Camera
+/dev/media2
+
+bcm2835-codec-decode (platform:bcm2835-codec):
+/dev/video10                       # <=== Low level devices
+/dev/video11                       # for the Pi cam, ignore
+....
+
+bcm2835-isp (platform:bcm2835-isp):
+/dev/video13                      # <=== Low level devices
+/dev/video14                      # for the Pi cam, ignore
+....
+
+Venus USB2.0 Camera: Venus USB2 (usb-3f980000.usb-1.2):
+/dev/video0                         # <== USB webcam
+/dev/video1
+/dev/media4
+      </pre>
       <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

From 2d8d68cfcc1cf4fc8861671e185fdf235dcf9740 Mon Sep 17 00:00:00 2001
From: David Seifert <16636962+SoapGentoo@users.noreply.github.com>
Date: Fri, 30 Jun 2023 05:37:50 +0200
Subject: [PATCH 13/20] Gettext 0.22 (#1681)

* po: fix gettext 0.22 format specifier

Bug: https://bugs.gentoo.org/908965
Bug: https://savannah.gnu.org/bugs/index.php?64334#comment1

* Autotools: fix `make distcheck`

* use correct `dist_` specifiers for including files in tarball
* do not override `docdir`, since this is a user variable
* include headers in tarball
---
 Makefile.am     | 11 +++++------
 configure.ac    |  1 -
 man/Makefile.am |  1 -
 po/de.po        |  2 +-
 po/fi.po        |  2 +-
 src/Makefile.am | 52 ++++++++++++++++++++++++++++++++++++-------------
 6 files changed, 46 insertions(+), 23 deletions(-)
 delete mode 100644 man/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3d2f968e..5ae03cd2 100644
--- a/Makefile.am
+++ b/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  \
diff --git a/configure.ac b/configure.ac
index dfcf5eae..ce588f65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 14aa069f..00000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-man_MANS = motion.1
\ No newline at end of file
diff --git a/po/de.po b/po/de.po
index 9142c919..ccd5f09d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3458,7 +3458,7 @@ msgstr "Sprache: Deutsch"
 #: src/util.c
 #, c-format
 msgid "Could not allocate %llu bytes of memory!"
-msgstr "%Llu Bytes Speicher konnten nicht zugeordnet werden!"
+msgstr "%llu Bytes Speicher konnten nicht zugeordnet werden!"
 
 #: src/util.c
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index 1afbdb68..d3117a92 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3432,7 +3432,7 @@ msgstr "Kieli: englanti"
 #: src/util.c
 #, c-format
 msgid "Could not allocate %llu bytes of memory!"
-msgstr "%Llu-tavua muistia ei voitu varata!"
+msgstr "%llu-tavua muistia ei voitu varata!"
 
 #: src/util.c
 #, c-format
diff --git a/src/Makefile.am b/src/Makefile.am
index f93decf5..6f9d02e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,43 @@
-AM_CPPFLAGS= -Dsysconfdir=\"$(sysconfdir)/motion\" -DLOCALEDIR=\"$(DESTDIR)$(localedir)\"
-
-if INC_MMAL_SRC
-MMAL_SRC=raspicam/RaspiCamControl.c raspicam/RaspiCLI.c
-endif
-
-LIBS = @LIBINTL@ @LIBS@
+AM_CPPFLAGS= -Dsysconfdir=\"$(sysconfdir)/motion\" -DLOCALEDIR=\"$(localedir)\"
+LDADD = $(LIBINTL)
 
 bin_PROGRAMS = motion
 
-motion_SOURCES = motion.c logger.c conf.c draw.c jpegutils.c video_loopback.c \
-	video_v4l2.c video_common.c video_bktr.c netcam.c netcam_http.c netcam_ftp.c \
-	netcam_jpeg.c netcam_wget.c netcam_rtsp.c track.c alg.c event.c picture.c \
-	rotate.c translate.c ffmpeg.c util.c dbse.c webu_status.c \
-	webu.c webu_html.c webu_stream.c webu_text.c mmalcam.c $(MMAL_SRC)
-
+motion_SOURCES = \
+	alg.h alg.c \
+	conf.h conf.c \
+	dbse.h dbse.c \
+	draw.h draw.c \
+	event.h event.c \
+	ffmpeg.h ffmpeg.c \
+	jpegutils.h jpegutils.c \
+	logger.h logger.c \
+	mmalcam.h mmalcam.c \
+	motion.h motion.c \
+	netcam.h netcam.c \
+	netcam_ftp.h netcam_ftp.c \
+	netcam_http.h netcam_http.c \
+	netcam_jpeg.h netcam_jpeg.c \
+	netcam_rtsp.h netcam_rtsp.c \
+	netcam_wget.h netcam_wget.c \
+	picture.h picture.c \
+	rotate.h rotate.c \
+	track.h track.c \
+	translate.h translate.c \
+	util.h util.c \
+	video_bktr.h video_bktr.c \
+	video_common.h video_common.c \
+	video_loopback.h video_loopback.c \
+	video_v4l2.h video_v4l2.c \
+	webu.h webu.c \
+	webu_html.h webu_html.c \
+	webu_status.h webu_status.c \
+	webu_stream.h webu_stream.c \
+	webu_text.h webu_text.c \
+	mmx.h pwc-ioctl.h
 
+if INC_MMAL_SRC
+motion_SOURCES += \
+	raspicam/RaspiCamControl.h raspicam/RaspiCamControl.c \
+	raspicam/RaspiCLI.h raspicam/RaspiCLI.c
+endif

From 40ecd71ff361442f1579089481619dd7cae90ffd Mon Sep 17 00:00:00 2001
From: Piotr Mionskowski <piotr.mionskowski@gmail.com>
Date: Sun, 9 Jul 2023 01:44:49 +0200
Subject: [PATCH 14/20] Include libwebp when WEBP is enabled

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce588f65..ee45ac37 100644
--- a/configure.ac
+++ b/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)
       ]

From fd29523cbf969467da6330be58c25fc8aa21c393 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 8 Jul 2023 18:10:40 -0600
Subject: [PATCH 15/20] Remove default for allowed_media_types.  Closes #1665

---
 src/netcam_rtsp.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.c
index 5c475ab8..592c7721 100644
--- a/src/netcam_rtsp.c
+++ b/src/netcam_rtsp.c
@@ -1345,7 +1345,6 @@ static void netcam_rtsp_set_options(struct rtsp_context *rtsp_data)
         MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("%s: Setting rtsp/rtmp")
             ,rtsp_data->cameratype);
         util_parms_add_default(rtsp_data->parameters,"rtsp_transport","tcp");
-        util_parms_add_default(rtsp_data->parameters,"allowed_media_types", "video");
 
     } else if (strncmp(rtsp_data->service, "http", 4) == 0 ) {
         MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO

From 1b3a8262fef5d6d1c249a726957b1aa607f39196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michele=20Zuccal=C3=A0?= <ardutu@gmail.com>
Date: Fri, 21 Jul 2023 01:07:30 +0200
Subject: [PATCH 16/20] netcam_rtsp: add support for DRM PRIME HW decode
 acceleration (#1691)

This change add support for DRM PRIME HW decode acceleration for RTSP stream.
Set netcam_params decoder=drm to enable it.
---
 src/netcam_rtsp.c | 132 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 1 deletion(-)

diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.c
index 592c7721..52675a88 100644
--- a/src/netcam_rtsp.c
+++ b/src/netcam_rtsp.c
@@ -426,6 +426,58 @@ static int netcam_decode_cuda(struct rtsp_context *rtsp_data)
     #endif
 }
 
+static int netcam_decode_drm(struct rtsp_context *rtsp_data)
+{
+
+    #if ( MYFFVER >= 57083)
+
+        int retcd;
+        char errstr[128];
+        AVFrame *hw_frame = NULL;
+
+        hw_frame = my_frame_alloc();
+
+        retcd = avcodec_receive_frame(rtsp_data->codec_context, hw_frame);
+        if ((rtsp_data->interrupted) || (rtsp_data->finish) || (retcd < 0) ){
+            if (retcd == AVERROR(EAGAIN)){
+                retcd = 0;
+            } else if (retcd == AVERROR_INVALIDDATA) {
+                MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
+                    ,_("%s: Ignoring packet with invalid data")
+                    ,rtsp_data->cameratype);
+                retcd = 0;
+            } else if (retcd < 0) {
+                av_strerror(retcd, errstr, sizeof(errstr));
+                    MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
+                        ,_("%s: Rec frame error: %s")
+                        ,rtsp_data->cameratype, errstr);
+                retcd = -1;
+            } else {
+                retcd = -1;
+            }
+            my_frame_free(hw_frame);
+            return retcd;
+        }
+        rtsp_data->frame->format=AV_PIX_FMT_NV12;
+
+        retcd = av_hwframe_transfer_data(rtsp_data->frame, hw_frame, 0);
+        if (retcd < 0) {
+            MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
+                ,_("%s: Error transferring HW decoded to system memory")
+                ,rtsp_data->cameratype);
+            my_frame_free(hw_frame);
+            return -1;
+        }
+
+        my_frame_free(hw_frame);
+
+        return 1;
+    #else
+        (void)rtsp_data;
+        return 1;
+    #endif
+}
+
 /* netcam_rtsp_decode_video
  *
  * Return values:
@@ -476,6 +528,8 @@ static int netcam_rtsp_decode_video(struct rtsp_context *rtsp_data)
             retcd = netcam_decode_vaapi(rtsp_data);
         } else if (mystrceq(rtsp_data->decoder_nm,"cuda")) {
             retcd = netcam_decode_cuda(rtsp_data);
+        } else if (mystrceq(rtsp_data->decoder_nm,"drm")) {
+            retcd = netcam_decode_drm(rtsp_data);
         } else {
             retcd = netcam_decode_sw(rtsp_data);
         }
@@ -559,7 +613,7 @@ static void netcam_hwdecoders(struct rtsp_context *rtsp_data)
                 ,_("%s: HW Devices: ")
                 , rtsp_data->cameratype);
             while((rtsp_data->hw_type = av_hwdevice_iterate_types(rtsp_data->hw_type)) != AV_HWDEVICE_TYPE_NONE){
-                if (rtsp_data->hw_type == AV_HWDEVICE_TYPE_VAAPI || rtsp_data->hw_type == AV_HWDEVICE_TYPE_CUDA) {
+                if (rtsp_data->hw_type == AV_HWDEVICE_TYPE_VAAPI || rtsp_data->hw_type == AV_HWDEVICE_TYPE_CUDA || rtsp_data->hw_type == AV_HWDEVICE_TYPE_DRM) {
                     MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
                         ,_("%s: %s (available)")
                         , rtsp_data->cameratype
@@ -628,6 +682,26 @@ static enum AVPixelFormat netcam_getfmt_cuda(AVCodecContext *avctx, const enum A
     #endif
 }
 
+static enum AVPixelFormat netcam_getfmt_drm(AVCodecContext *avctx, const enum AVPixelFormat *pix_fmts)
+{
+    #if ( MYFFVER >= 57083)
+        const enum AVPixelFormat *p;
+        (void)avctx;
+
+        for (p = pix_fmts; *p != -1; p++) {
+            if (*p == AV_PIX_FMT_DRM_PRIME) return *p;
+        }
+
+        MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("Failed to get drm pix format"));
+        return AV_PIX_FMT_NONE;
+    #else
+        (void)avctx;
+        (void)pix_fmts;
+        return AV_PIX_FMT_NONE;
+    #endif
+}
+
+
 static void netcam_rtsp_decoder_error(struct rtsp_context *rtsp_data, int retcd, const char* fnc_nm)
 {
 
@@ -785,6 +859,59 @@ static int netcam_init_cuda(struct rtsp_context *rtsp_data)
     #endif
 }
 
+static int netcam_init_drm(struct rtsp_context *rtsp_data)
+{
+
+    #if ( MYFFVER >= 57083)
+
+        int retcd;
+
+        MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
+            ,_("%s: Initializing drm decoder"),rtsp_data->cameratype);
+
+        rtsp_data->hw_type = av_hwdevice_find_type_by_name("drm");
+        if (rtsp_data->hw_type == AV_HWDEVICE_TYPE_NONE){
+            MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("%s: Unable to find drm hw device")
+                , rtsp_data->cameratype);
+            netcam_rtsp_decoder_error(rtsp_data, 0, "av_hwdevice");
+            return -1;
+        }
+
+        rtsp_data->codec_context = avcodec_alloc_context3(rtsp_data->decoder);
+        if ((rtsp_data->codec_context == NULL) || (rtsp_data->interrupted)){
+            netcam_rtsp_decoder_error(rtsp_data, 0, "avcodec_alloc_context3");
+            return -1;
+        }
+
+        retcd = avcodec_parameters_to_context(rtsp_data->codec_context,rtsp_data->strm->codecpar);
+        if ((retcd < 0) || (rtsp_data->interrupted)) {
+            netcam_rtsp_decoder_error(rtsp_data, retcd, "avcodec_parameters_to_context");
+            return -1;
+        }
+
+        rtsp_data->hw_pix_fmt = AV_PIX_FMT_DRM_PRIME;
+        rtsp_data->codec_context->get_format  = netcam_getfmt_drm;
+        av_opt_set_int(rtsp_data->codec_context, "refcounted_frames", 1, 0);
+        rtsp_data->codec_context->sw_pix_fmt = AV_PIX_FMT_YUV420P;
+        rtsp_data->codec_context->hwaccel_flags=
+            AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH |
+            AV_HWACCEL_FLAG_IGNORE_LEVEL;
+
+        retcd = av_hwdevice_ctx_create(&rtsp_data->hw_device_ctx, rtsp_data->hw_type, NULL, NULL, 0);
+        if (retcd < 0){
+            netcam_rtsp_decoder_error(rtsp_data, retcd, "hwctx");
+            return -1;
+        }
+        rtsp_data->codec_context->hw_device_ctx = av_buffer_ref(rtsp_data->hw_device_ctx);
+
+        return 0;
+    #else
+        (void)rtsp_data;
+        (void)netcam_getfmt_drm;
+        return 0;
+    #endif
+}
+
 static int netcam_init_swdecoder(struct rtsp_context *rtsp_data)
 {
 
@@ -872,6 +999,8 @@ static int netcam_rtsp_open_codec(struct rtsp_context *rtsp_data)
             retcd = netcam_init_vaapi(rtsp_data);
         } else if (mystrceq(rtsp_data->decoder_nm,"cuda")){
             retcd = netcam_init_cuda(rtsp_data);
+	} else if (mystrceq(rtsp_data->decoder_nm,"drm")){
+            retcd = netcam_init_drm(rtsp_data);
         } else {
             retcd = netcam_init_swdecoder(rtsp_data);
         }
@@ -2277,3 +2406,4 @@ void netcam_rtsp_cleanup(struct context *cnt, int init_retry_flag)
 
 }
 
+

From 1ff5dd6052201d32eb7d4dad618411ca689870eb Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 11 Nov 2023 16:51:37 -0700
Subject: [PATCH 17/20] Fix segfault using VAAPI decode.  AVFrame must be
 pristine

---
 src/netcam_rtsp.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.c
index 52675a88..9ff5e637 100644
--- a/src/netcam_rtsp.c
+++ b/src/netcam_rtsp.c
@@ -354,7 +354,6 @@ static int netcam_decode_vaapi(struct rtsp_context *rtsp_data)
             my_frame_free(hw_frame);
             return retcd;
         }
-        rtsp_data->frame->format=AV_PIX_FMT_YUV420P;
 
         retcd = av_hwframe_transfer_data(rtsp_data->frame, hw_frame, 0);
         if (retcd < 0) {

From e2472c7bfe73170fbd2bddf6e58f21cc1e2e0628 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 11 Nov 2023 18:27:56 -0700
Subject: [PATCH 18/20] Update Documentation

---
 doc/CHANGELOG          |  19 ++++
 doc/motion_build.html  |  18 +--
 doc/motion_config.html |  57 +---------
 doc/motion_guide.html  | 242 ++++++++++++++++++++++++++++++++++++-----
 4 files changed, 246 insertions(+), 90 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 8c8ac069..4e08ff20 100644
--- a/doc/CHANGELOG
+++ b/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
diff --git a/doc/motion_build.html b/doc/motion_build.html
index 18b34d66..f40f6813 100644
--- a/doc/motion_build.html
+++ b/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>
diff --git a/doc/motion_config.html b/doc/motion_config.html
index 1ce9672c..ba568fcd 100644
--- a/doc/motion_config.html
+++ b/doc/motion_config.html
@@ -234,67 +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 the /dev/videoX device in the Motion configuration file.
       <p></p>
-      The PI camera's drivers expose the camera's full functionality as a set of low-level /dev/videoX
-      devices, while Motion (and other applications) expect a single high-level /dev/videoX device. The
-      libcamerify wrapper transparently manages these low-level devices and presents a high-level
-      interface on one of the /dev/videoX device nodes to Motion
-      (<a href="https://libcamera.org/docs.html#v4l2-compatibility-layer">libcamera docs</a>).
-      <p></p>
       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 should use the device names provided by V4L
-      (<i><small><code>v4l2-ctl --list-devices</code></small></i>). The wrapper doesn't seem to affect
-      the device names seen by Motion. In the below example, the PI camera is at
-      <i><small><code>/dev/video2</code></small></i> while an external USB camera is at
-      <i><small><code>/dev/video0</code></small></i> ("CSI" stands for the
-      <a href="https://en.wikipedia.org/wiki/Camera_Serial_Interface">interface	used by the Pi camera</a>).
-      <p></p>
-      Also, /dev/videoN names are dynamically assigned and may not always point to the same camera (e.g.
-      when a USB camera is hot-plugged). Take a look at the stable symlinks under
-      <i><small><code>/dev/v4l/by-path/</code></small></i> and consider using them in your Motion config
-      instead of /dev/videoX.
-      <pre>
-root@raspberrypi:~# v4l2-ctl --list-devices
-unicam (platform:3f801000.csi):
-/dev/video2                        # <== PI Camera
-/dev/media2
-
-bcm2835-codec-decode (platform:bcm2835-codec):
-/dev/video10                       # <=== Low level devices
-/dev/video11                       # for the Pi cam, ignore
-....
-
-bcm2835-isp (platform:bcm2835-isp):
-/dev/video13                      # <=== Low level devices
-/dev/video14                      # for the Pi cam, ignore
-....
-
-Venus USB2.0 Camera: Venus USB2 (usb-3f980000.usb-1.2):
-/dev/video0                         # <== USB webcam
-/dev/video1
-/dev/media4
-      </pre>
-      <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.
+      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>
diff --git a/doc/motion_guide.html b/doc/motion_guide.html
index c0510374..be56081b 100644
--- a/doc/motion_guide.html
+++ b/doc/motion_guide.html
@@ -42,39 +42,225 @@ <h1>
     </section>
     <section class="main-content">
 
-      <h3><a name="Current_Release"></a> Latest Stable Release</h3>
-      <ul>
-      <li> <a href="motion_build.html"> Installing with apt/debs and building from source </a></li>
-      <li> <a href="motion_config.html"> Configuration </a></li>
-      <li> <a href="motion_config.html#commandlineoptions"> Command Line Options </a></li>
-      <li> <a href="motion_config.html#configfiles">Configuration Files</a></li>
-      <li> <a href="motion_config.html#Signals_Sent"> Signals (sent with e.g. kill command) </a></li>
-      <li> Configuration Options</li>
-        <ul>
-          <li> <a href="motion_config.html#Configuration_OptionsAlpha"> Listed alphabetically with mapping of old option names to current names </a></li>
-          <li> <a href="motion_config.html#Configuration_OptionsTopic"> Listed by topic </a></li>
-          <li> <a href="motion_config.html#Configuration_OptionsDetail"> Detail descriptions of each option</a></li>
-          </ul>
       <p></p>
+      The links below provide the documentation associated with the various releases of the Motion and MotionPlus software.
       <p></p>
-      </ul>
       <p></p>
-      <h3><a name="Prior"></a> Prior Release Versions</h3>
-      <ul>
-      <li> <a href="4.3.2/motion_config.html"> Version 4.3.2</a></li>
-      <li> <a href="4.3.1/motion_config.html"> Version 4.3.1</a></li>
-      <li> <a href="4.3.0/motion_config.html"> Version 4.3.0</a></li>
-      <li> <a href="4.2.2/motion_config.html"> Version 4.2.2</a></li>
-      <li> <a href="4.2.1/motion_config.html"> Version 4.2.1</a></li>
-      <li> <a href="4.2/motion_config.html"> Version 4.2</a></li>
-      <li> <a href="4.1.1/motion_guide.html"> Version 4.1.1</a></li>
-      <li> <a href="4.1/motion_guide.html"> Version 4.1</a></li>
-      <li> <a href="4.0.1/motion_guide.html"> Version 4.0.1</a></li>
-      <li> <a href="4.0/motion_guide.html"> Version 4.0</a></li>
-      <li> <a href="3.4.1/motion_guide.html"> Version 3.4.1</a></li>
+
+
+      <h3><a name="Current_Release"></a>Documentation For Latest Releases</h3>
+      <div class="tblreleasecurrent">
+      <table style="border-width:0.5px; text-align: center;" cellspacing="0" cellpadding="0" >
+        <colgroup>
+          <col width="300px">
+          <col width="300px">
+          <col width="300px">
+        </colgroup>
+        <thead >
+          <tr >
+            <th word-wrap:break-word > Motion </th>
+            <td word-wrap:break-word > </td>
+            <th word-wrap:break-word > MotionPlus </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td word-wrap:break-word > <a href="motion_build.html">Installing and building from source </a></td>
+            <td word-wrap:break-word > </td>
+            <td word-wrap:break-word > <a href="motionplus_build.html">Installing and building from source </a></td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > <a href="motion_config.html">Configuration</a></td>
+            <td word-wrap:break-word > </td>
+            <td word-wrap:break-word > <a href="motionplus_config.html">Configuration</a></td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > </a></td>
+            <td word-wrap:break-word > </td>
+            <td word-wrap:break-word > <a href="motionplus_examples.html">Examples</a></td>
+          </tr>
+
+        </tbody>
+      </table>
+      </div>
+
+      <p></p>
+      <p></p>
+      <p></p>
+      <p></p>
+
+      <h3><a name="Comparison"></a>Comparison Of Motion vs MotionPlus</h3>
+      <div>
+      <table class="tblcomp" >
+        <colgroup>
+          <col width="300px">
+          <col width="300px">
+          <col width="300px">
+        </colgroup>
+        <thead >
+          <tr >
+            <th bgcolor="#edf4f9" word-wrap:break-word >Motion</th>
+            <th bgcolor="#edf4f9" word-wrap:break-word >Description</th>
+            <th bgcolor="#edf4f9" word-wrap:break-word >MotionPlus</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Limited</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Feature Enhancements</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Optional</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >FFmpeg Libraries</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Required</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Supported</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Multiple input v4l2 cards(RoundRobin)</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Not Supported</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Supported</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Brooktree video cards</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Not Supported</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Internal partial legacy</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Camera Tracking</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >External scripts only</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Optional</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Multiple ports for web control and streams</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Single port only</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >OpenCV Cascades/HOG/DNN</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Direct libcamera support</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Sound recording from passthrough cameras</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Sound frequency detection</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Download/Play movies via web page</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Add/Delete cameras via web page</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+          <tr>
+            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Additional Motion detection measures</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
+          </tr>
+
+        </tbody>
+      </table>
+      </div>
+
       <p></p>
       <p></p>
-      </ul>
+      <p></p>
+      <p></p>
+
+      <h3><a name="Prior"></a>Documentation For Prior Releases</h3>
+      <p></p>
+      The documentation is provided as it was included in each release.
+      <p></p>
+      <p></p>
+
+      <div class="tblreleaseprior">
+      <table style="border-width:0.5px; text-align: center;" cellspacing="0" cellpadding="0" >
+        <colgroup>
+          <col width="500px">
+          <col width="500px">
+        </colgroup>
+        <thead >
+          <tr >
+            <th word-wrap:break-word > Motion </th>
+            <th word-wrap:break-word > MotionPlus </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td word-wrap:break-word > <a href="4.5.1/motion_config.html"> Version 4.5.1</a> </td>
+            <td word-wrap:break-word > <a href="mp0.1.0/motionplus_config.html"> Version 0.1.0</a></td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > <a href="4.5.0/motion_config.html"> Version 4.5.0</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > <a href="4.4.0/motion_config.html"> Version 4.4.0</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > <a href="4.3.2/motion_config.html"> Version 4.3.2</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > <a href="4.3.1/motion_config.html"> Version 4.3.1</a></td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > <a href="4.3.0/motion_config.html"> Version 4.3.0</a></td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word ><a href="4.2.2/motion_config.html"> Version 4.2.2</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word ><a href="4.2.1/motion_config.html"> Version 4.2.1</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word ><a href="4.2/motion_config.html"> Version 4.2</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word ><a href="4.1.1/motion_guide.html"> Version 4.1.1</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word ><a href="4.1/motion_guide.html"> Version 4.1</a></td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word ><a href="4.0.1/motion_guide.html"> Version 4.0.1</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word > <a href="4.0/motion_guide.html"> Version 4.0</a></td>
+            <td word-wrap:break-word > </td>
+          </tr>
+          <tr>
+            <td word-wrap:break-word ><a href="3.4.1/motion_guide.html"> Version 3.4.1</a> </td>
+            <td word-wrap:break-word > </td>
+          </tr>
+
+        </tbody>
+      </table>
+      </div>
+
+
     </section>
   </body>
 </html>

From 54c1407c364d21de18a1d90fc9e3173837306b7d Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 11 Nov 2023 18:31:25 -0700
Subject: [PATCH 19/20] Version 4.6.0

---
 scripts/version.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/version.sh b/scripts/version.sh
index cbc08137..340b5f76 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-BASE_VERSION="4.5.1"
+BASE_VERSION="4.6.0"
 if [ -d .git ]; then
     if test "`git diff --name-only`" = "" ; then
         GIT_COMMIT="git"
@@ -13,6 +13,6 @@ if [ -d .git ]; then
 else
     GIT_COMMIT="gitUNKNOWN"
 fi
-#printf "$BASE_VERSION"
-printf "$BASE_VERSION+$GIT_COMMIT"
+printf "$BASE_VERSION"
+#printf "$BASE_VERSION+$GIT_COMMIT"
 

From 7b85a2444ed812833c8e8c3543bb4073d26376b8 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 11 Nov 2023 18:51:05 -0700
Subject: [PATCH 20/20] Update version script

---
 scripts/version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/version.sh b/scripts/version.sh
index 340b5f76..215c62d1 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -13,6 +13,6 @@ if [ -d .git ]; then
 else
     GIT_COMMIT="gitUNKNOWN"
 fi
-printf "$BASE_VERSION"
-#printf "$BASE_VERSION+$GIT_COMMIT"
+#printf "$BASE_VERSION"
+printf "$BASE_VERSION+$GIT_COMMIT"