zoneminder: Comment patches

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Jan 15 09:55:19 2024 -0500
Changeset:	754bbe9351ff122636ea161a2bc685526d52b900

Modified Files:
	zoneminder/distinfo
	zoneminder/patches/patch-dep_RtspServer_src_net_EventLoop.cpp
	zoneminder/patches/patch-dep_RtspServer_src_net_SocketUtil.cpp
	zoneminder/patches/patch-dep_RtspServer_src_xop_rtsp.h
	zoneminder/patches/patch-src_zm__packet.h

Log Message:
zoneminder: Comment patches

Also clean ^M from diff header lines.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=754bbe9351ff122636ea161a2bc685526d52b900

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/distinfo                                            | 8 ++++----
 zoneminder/patches/patch-dep_RtspServer_src_net_EventLoop.cpp  | 6 +++++-
 zoneminder/patches/patch-dep_RtspServer_src_net_SocketUtil.cpp | 6 +++++-
 zoneminder/patches/patch-dep_RtspServer_src_xop_rtsp.h         | 8 ++++++--
 zoneminder/patches/patch-src_zm__packet.h                      | 4 ++++
 5 files changed, 24 insertions(+), 8 deletions(-)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index 5c89c07b19..cdc386ba55 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -13,10 +13,10 @@ BLAKE2s (ZoneMinder-RtspServer-master.tar.gz) = 8a15c1a1f61b218137721b040c96051f
 SHA512 (ZoneMinder-RtspServer-master.tar.gz) = 80f7310d08f8a32f31f332a221e7b63f09246f4c507846082f691936a180d213d10fc5f9a27bbc31a06b89bb0bbf547e476e8d9fad09980d32d97f7fef5c66b8
 Size (ZoneMinder-RtspServer-master.tar.gz) = 1396607 bytes
 SHA1 (patch-CMakeLists.txt) = dca040058ec7b389474dff9853c46f65fd5626da
-SHA1 (patch-dep_RtspServer_src_net_EventLoop.cpp) = 7cf96a916a2210179383581b917983ce94ca2759
+SHA1 (patch-dep_RtspServer_src_net_EventLoop.cpp) = bf1fe79c2ba1d602adf8895f29f61f7b961eece3
 SHA1 (patch-dep_RtspServer_src_net_Socket.h) = 789e90da4bfc15d6d43d942718538385cb6dfade
-SHA1 (patch-dep_RtspServer_src_net_SocketUtil.cpp) = e33695be6c49942d4dd6ddbc5fccc6823d5f0252
-SHA1 (patch-dep_RtspServer_src_xop_rtsp.h) = 469796d824bb26f861d353539ec0e3e09eaeff21
+SHA1 (patch-dep_RtspServer_src_net_SocketUtil.cpp) = c566652e8e7985a705682ef960118615b6777288
+SHA1 (patch-dep_RtspServer_src_xop_rtsp.h) = 20a014ce423d19549976c2158d39c46ea6892647
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in) = 3bf4e5e8276a682695db640e6608dd14c7315320
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 996670d8a659c0624587da73f8083d9349aaa1ba
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm) = b3de55618915fad3d9263954db71270c800ad6f1
@@ -25,7 +25,7 @@ SHA1 (patch-scripts_zmpkg_pl_in) = eb3166ae3cd9bb0ce1b828b64722506aa4e82368
 SHA1 (patch-src_zm__event.cpp) = 2831f586f140f682dd107a1adb09531c388a1df8
 SHA1 (patch-src_zm__eventstream.cpp) = d2134edf09f142a6a545ca36d3263b13defcadd6
 SHA1 (patch-src_zm__monitor.cpp) = ac6eb821d5d72455b46165e74ea1d321faf9e431
-SHA1 (patch-src_zm__packet.h) = dd0426b46ab9fa192fe0b5ff3ce646b26b9e0749
+SHA1 (patch-src_zm__packet.h) = 96951004741f3d21434d3ca981f6214c07f77c88
 SHA1 (patch-src_zm__rtp__source.cpp) = 288b32cff869103b04e96487b92bb12533b29772
 SHA1 (patch-src_zm__utils.cpp) = e16ffd3f41bd05a32c80142e7246307df12801a8
 SHA1 (patch-src_zm_comms_h) = 33577ab0eac62eadc415fe6fb970b82eb473c8e7
diff --git a/zoneminder/patches/patch-dep_RtspServer_src_net_EventLoop.cpp b/zoneminder/patches/patch-dep_RtspServer_src_net_EventLoop.cpp
index 3a7132de8f..e032f4a05b 100644
--- a/zoneminder/patches/patch-dep_RtspServer_src_net_EventLoop.cpp
+++ b/zoneminder/patches/patch-dep_RtspServer_src_net_EventLoop.cpp
@@ -1,8 +1,12 @@
 $NetBSD$
 
+Add NetBSD to BSD conditional.
+
+\todo File upstream PR.
+
 --- dep/RtspServer/src/net/EventLoop.cpp.orig	2024-01-14 21:16:28.747478445 +0000
 +++ dep/RtspServer/src/net/EventLoop.cpp
-@@ -60,7 +60,7 @@ void EventLoop::Loop()
+@@ -60,7 +60,7 @@ void EventLoop::Loop()
  	{
  #if defined(__linux) || defined(__linux__)
  		std::shared_ptr<TaskScheduler> task_scheduler_ptr(new EpollTaskScheduler(n));
diff --git a/zoneminder/patches/patch-dep_RtspServer_src_net_SocketUtil.cpp b/zoneminder/patches/patch-dep_RtspServer_src_net_SocketUtil.cpp
index 22247bf00c..c5d960e095 100644
--- a/zoneminder/patches/patch-dep_RtspServer_src_net_SocketUtil.cpp
+++ b/zoneminder/patches/patch-dep_RtspServer_src_net_SocketUtil.cpp
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Add NetBSD to BSD conditional.
+
+\todo File upstream PR.
+
 --- dep/RtspServer/src/net/SocketUtil.cpp.orig	2024-01-14 21:17:15.225438102 +0000
 +++ dep/RtspServer/src/net/SocketUtil.cpp
 @@ -23,7 +23,7 @@ bool SocketUtil::Bind(SOCKET sockfd, std
@@ -11,7 +15,7 @@ $NetBSD$
      int flags = fcntl(fd, F_GETFL, 0);
      fcntl(fd, F_SETFL, flags | O_NONBLOCK);
  #elif defined(WIN32) || defined(_WIN32)
-@@ -34,7 +34,7 @@ void SocketUtil::SetNonBlock(SOCKET fd)
+@@ -34,7 +34,7 @@ void SocketUtil::SetNonBlock(SOCKET fd)
  
  void SocketUtil::SetBlock(SOCKET fd, int write_timeout)
  {
diff --git a/zoneminder/patches/patch-dep_RtspServer_src_xop_rtsp.h b/zoneminder/patches/patch-dep_RtspServer_src_xop_rtsp.h
index 787be28fe4..37a4e5dc2d 100644
--- a/zoneminder/patches/patch-dep_RtspServer_src_xop_rtsp.h
+++ b/zoneminder/patches/patch-dep_RtspServer_src_xop_rtsp.h
@@ -1,8 +1,12 @@
 $NetBSD$
 
+Add NetBSD to BSD conditional.
+
+\todo File upstream PR.
+
 --- dep/RtspServer/src/xop/rtsp.h.orig	2024-01-14 21:21:34.574730494 +0000
 +++ dep/RtspServer/src/xop/rtsp.h
-@@ -51,7 +51,7 @@ public:
+@@ -51,7 +51,7 @@ public:
  		char ip[100] = { 0 };
  		char suffix[100] = { 0 };
  		uint16_t port = 0;
@@ -11,7 +15,7 @@ $NetBSD$
  		if (sscanf(url.c_str() + 7, "%[^:]:%hu/%s", ip, &port, suffix) == 3)
  #elif defined(WIN32) || defined(_WIN32)
  		if (sscanf_s(url.c_str() + 7, "%[^:]:%hu/%s", ip, 100, &port, suffix, 100) == 3)
-@@ -59,7 +59,7 @@ public:
+@@ -59,7 +59,7 @@ public:
  		{
  			rtsp_url_info_.port = port;
  		}
diff --git a/zoneminder/patches/patch-src_zm__packet.h b/zoneminder/patches/patch-src_zm__packet.h
index 3bf90a8d9e..77c0345169 100644
--- a/zoneminder/patches/patch-src_zm__packet.h
+++ b/zoneminder/patches/patch-src_zm__packet.h
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Add NetBSD to BSD conditional.
+
+\todo File upstream PR.
+
 --- src/zm_packet.h.orig	2024-01-14 21:29:59.095197872 +0000
 +++ src/zm_packet.h
 @@ -32,7 +32,7 @@ extern "C" {