Correct patch-src_zm__thread.h and patch-src_zm_signal_cpp to make all the funtional changes as patched against ZoneMinder 1.29.0. Intended to repair the build against NetBSD 9.0.

[davidsainty <david.sainty%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	davidsainty <david.sainty%gmail.com@localhost>
Pushed By:	dsainty
Date:		Tue Jan 18 00:50:10 2022 +1300
Changeset:	2d49af6d6c391d78607c809ce47529412a19f0fc

Modified Files:
	zoneminder/distinfo
	zoneminder/patches/patch-src_zm__thread.h
	zoneminder/patches/patch-src_zm_signal_cpp

Log Message:
Correct patch-src_zm__thread.h and patch-src_zm_signal_cpp  to make all the funtional changes as patched against ZoneMinder 1.29.0.  Intended to repair the build against NetBSD 9.0.

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

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

diffstat:
 zoneminder/distinfo                        |  4 ++--
 zoneminder/patches/patch-src_zm__thread.h  | 20 ++++++++++++--------
 zoneminder/patches/patch-src_zm_signal_cpp | 22 +++++++++++++++++++++-
 3 files changed, 35 insertions(+), 11 deletions(-)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index d8822f5e09..1761eab565 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -14,7 +14,7 @@ SHA1 (patch-src_zm__monitor.cpp) = 95400e1e524c6efe479a6eb3512596ba0f284334
 SHA1 (patch-src_zm__rtp__ctrl.h) = 4e0fd8e80932de8d77b3386a356cc026ddc23113
 SHA1 (patch-src_zm__rtp__source.cpp) = 039257e76768df2e32a5550625ba7f8d1cb9ba26
 SHA1 (patch-src_zm__sdp.cpp) = ce1b8a9e597ce7b500533a42d14390f580c72de7
-SHA1 (patch-src_zm__thread.h) = 7d9d7dfcd79491f1dd28b6d233aba4d623d882a4
+SHA1 (patch-src_zm__thread.h) = 8ac734f991c74a8744f7ee7015e583a701517951
 SHA1 (patch-src_zm__timer.h) = d91d41ef987fa4cc67d6f55c25afc581ef3a273f
 SHA1 (patch-src_zm__utils.cpp) = d5012fb54b0a91640fa49a16daf7c5f0eb54228e
 SHA1 (patch-src_zm__utils.h) = 4ffb7eafa8602076766fd4ae00be797866a229d9
@@ -22,7 +22,7 @@ SHA1 (patch-src_zm_comms_cpp) = bd3c3e6dd4d11ea0845d2da662e99169cd6e6680
 SHA1 (patch-src_zm_comms_h) = 64c0a8e98f9ac551113f3428dafff12a61ea9afe
 SHA1 (patch-src_zm_logger_cpp) = 3ad97a499643d9af5bbd1f86d9b4101bc24be4df
 SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
-SHA1 (patch-src_zm_signal_cpp) = e86a79f9ca8b5fba58907fc1c67d95fe29819dcc
+SHA1 (patch-src_zm_signal_cpp) = 6863c33f22d40fd9dabdab7ba7056d56fae9d418
 SHA1 (patch-src_zm_thread_cpp) = 5f50ce734df427ca8d63082ac0798a136ed0dad1
 SHA1 (patch-src_zmc_cpp) = a7ff8186639ce459d74920e505de0d877d3f3cd3
 SHA1 (patch-src_zmf.cpp) = 73affd763e7f37109e607cc6474fb8e87f783bdf
diff --git a/zoneminder/patches/patch-src_zm__thread.h b/zoneminder/patches/patch-src_zm__thread.h
index 8bd75c2ddc..c2ae453bae 100644
--- a/zoneminder/patches/patch-src_zm__thread.h
+++ b/zoneminder/patches/patch-src_zm__thread.h
@@ -8,9 +8,9 @@ portable than syscall(SYS_gettid).
 
 \todo Fix correctly upstream.
 
---- src/zm_thread.h.orig	2019-02-22 15:38:47.000000000 +0000
-+++ src/zm_thread.h
-@@ -22,16 +22,17 @@
+--- src/zm_thread.h.orig	2019-02-23 04:38:47.000000000 +1300
++++ src/zm_thread.h	2022-01-18 00:14:30.000000000 +1300
+@@ -22,20 +22,21 @@
  
  #include <unistd.h>
  #include <pthread.h>
@@ -31,18 +31,22 @@ portable than syscall(SYS_gettid).
  class ThreadException : public Exception
  {
  private:
-@@ -55,7 +56,9 @@ private:
+-#ifndef SOLARIS
++#ifndef USE_PTHREAD
+   pid_t pid() {
+     pid_t tid; 
+ #ifdef __FreeBSD__ 
+@@ -55,7 +56,8 @@
    pthread_t pid() { return( pthread_self() ); }
  #endif
  public:
 -  ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) ) {
 +  /* The type of pid() varies by OS */
 +  ThreadException( const std::string &message ) : Exception( stringtf( ("(%jd) "+message).c_str(), (intmax_t)pid() ) ) {
-+
    }
  };
  
-@@ -217,7 +220,7 @@ protected:
+@@ -217,7 +219,7 @@
  
    Mutex mThreadMutex;
    Condition mThreadCondition;
@@ -51,7 +55,7 @@ portable than syscall(SYS_gettid).
    pid_t mPid;
  #else
    pthread_t mPid;
-@@ -230,7 +233,7 @@ protected:
+@@ -230,7 +232,7 @@
    Thread();
    virtual ~Thread();
  
@@ -60,7 +64,7 @@ portable than syscall(SYS_gettid).
    pid_t id() const
    {
      pid_t tid; 
-@@ -269,7 +272,7 @@ public:
+@@ -269,7 +271,7 @@
    void kill( int signal );
    bool isThread()
    {
diff --git a/zoneminder/patches/patch-src_zm_signal_cpp b/zoneminder/patches/patch-src_zm_signal_cpp
index ece9e8193b..9ca264a583 100644
--- a/zoneminder/patches/patch-src_zm_signal_cpp
+++ b/zoneminder/patches/patch-src_zm_signal_cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_zm_signal_cpp,v 1.1 2015/04/10 02:58:49 dsainty Exp $
+$NetBSD: patch-src_zm_signal_cpp,v 1.2 2020/08/25 16:42:21 gdt Exp $
 
 Don't assume machine-dependent IP register details are available for any
 platform except Linux.  Only Linux is sure to have this style of mcontext_t.
@@ -6,3 +6,23 @@ platform except Linux.  Only Linux is sure to have this style of mcontext_t.
 Resolves build on systems that have ucontext_t but an mcontext_t that
 doesn't look like Linux.
 
+--- src/zm_signal.cpp.orig	2019-02-23 04:38:47.000000000 +1300
++++ src/zm_signal.cpp	2022-01-18 00:42:50.000000000 +1300
+@@ -66,13 +66,17 @@
+ 	    #ifdef __FreeBSD_kernel__
+ 		ip = (void *)(uc->uc_mcontext.mc_rip);
+ 	    #else
++		#if defined(__linux__)
+ 		ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]);
++		#endif
+ 	    #endif
+     #else
+ 	    #ifdef __FreeBSD_kernel__
+ 		ip = (void *)(uc->uc_mcontext.mc_eip);
+ 	    #else
++		#if defined(__linux__)
+ 		ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
++		#endif
+ 	    #endif
+     #endif				// defined(__x86_64__)
+