CVS commit: pkgsrc/games/warzone2100

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Dec 19 22:16:05 UTC 2019

Modified Files:
        pkgsrc/games/warzone2100: distinfo
        pkgsrc/games/warzone2100/patches:
            patch-lib_exceptionhandler_exceptionhandler.cpp
Added Files:
        pkgsrc/games/warzone2100/patches: patch-lib_netplay_netplay.cpp

Log Message:
Add missing errno.h. Explicitly load atomic in switch.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/warzone2100/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/warzone2100/patches/patch-lib_netplay_netplay.cpp

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

Modified files:

Index: pkgsrc/games/warzone2100/distinfo
diff -u pkgsrc/games/warzone2100/distinfo:1.8 pkgsrc/games/warzone2100/distinfo:1.9
--- pkgsrc/games/warzone2100/distinfo:1.8       Fri Dec 14 17:27:01 2018
+++ pkgsrc/games/warzone2100/distinfo   Thu Dec 19 22:16:05 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2018/12/14 17:27:01 triaxx Exp $
+$NetBSD: distinfo,v 1.9 2019/12/19 22:16:05 joerg Exp $
 
 SHA1 (warzone2100-3.2.3.tar.xz) = 33bf08ac130d54d36550ada4e3db99c3545ef153
 RMD160 (warzone2100-3.2.3.tar.xz) = 12b5615b6cea9ea13848dc1a130ca535c7539ad5
 SHA512 (warzone2100-3.2.3.tar.xz) = 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
 Size (warzone2100-3.2.3.tar.xz) = 81314060 bytes
-SHA1 (patch-lib_exceptionhandler_exceptionhandler.cpp) = 04345173f2fc98da9f26c30963507972786571c0
+SHA1 (patch-lib_exceptionhandler_exceptionhandler.cpp) = d20b232d4d93789b4ae6355ed0fdaca6e16ad6fc
+SHA1 (patch-lib_netplay_netplay.cpp) = f78a4aa26702654e32829babb3ce74748b68ef0e
 SHA1 (patch-lib_qtgame_wzapp__qt.cpp) = 45564765d911a52534a14966c1f9418fd417956f

Index: pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp
diff -u pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp:1.1 pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp:1.2
--- pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp:1.1        Fri Dec 14 17:27:01 2018
+++ pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp    Thu Dec 19 22:16:05 2019
@@ -1,10 +1,18 @@
-$NetBSD: patch-lib_exceptionhandler_exceptionhandler.cpp,v 1.1 2018/12/14 17:27:01 triaxx Exp $
+$NetBSD: patch-lib_exceptionhandler_exceptionhandler.cpp,v 1.2 2019/12/19 22:16:05 joerg Exp $
 
 Disable unsupported sigcodes for DragonFlyBSD.
 
 --- lib/exceptionhandler/exceptionhandler.cpp.orig     2017-04-23 13:12:16.000000000 +0000
 +++ lib/exceptionhandler/exceptionhandler.cpp
-@@ -192,18 +192,21 @@ static const char *wz_strsignal(int sign
+@@ -21,6 +21,7 @@
+ #include "lib/framework/string_ext.h"
+ #include "exceptionhandler.h"
+ #include "dumpinfo.h"
++#include <errno.h>
+ 
+ #if defined(WZ_OS_WIN)
+ #include <tchar.h>
+@@ -192,18 +193,21 @@ static const char *wz_strsignal(int sign
        case SIGBUS:
                switch (sigcode)
                {
@@ -26,7 +34,7 @@ Disable unsupported sigcodes for DragonF
                case FPE_INTDIV:
                        return "SIGFPE: Erroneous arithmetic operation: Integer divide by zero";
                case FPE_INTOVF:
-@@ -220,6 +223,7 @@ static const char *wz_strsignal(int sign
+@@ -220,6 +224,7 @@ static const char *wz_strsignal(int sign
                        return "SIGFPE: Erroneous arithmetic operation: Invalid floating-point operation";
                case FPE_FLTSUB:
                        return "SIGFPE: Erroneous arithmetic operation: Subscript out of range";
@@ -34,7 +42,7 @@ Disable unsupported sigcodes for DragonF
                default:
                        return "SIGFPE: Erroneous arithmetic operation";
                };
-@@ -228,6 +232,7 @@ static const char *wz_strsignal(int sign
+@@ -228,6 +233,7 @@ static const char *wz_strsignal(int sign
        case SIGILL:
                switch (sigcode)
                {
@@ -42,7 +50,7 @@ Disable unsupported sigcodes for DragonF
                case ILL_ILLOPC:
                        return "SIGILL: Illegal instruction: Illegal opcode";
                case ILL_ILLOPN:
-@@ -244,6 +249,7 @@ static const char *wz_strsignal(int sign
+@@ -244,6 +250,7 @@ static const char *wz_strsignal(int sign
                        return "SIGILL: Illegal instruction: Coprocessor error";
                case ILL_BADSTK:
                        return "SIGILL: Illegal instruction: Internal stack error";
@@ -50,7 +58,7 @@ Disable unsupported sigcodes for DragonF
                default:
                        return "SIGILL: Illegal instruction";
                }
-@@ -258,10 +264,12 @@ static const char *wz_strsignal(int sign
+@@ -258,10 +265,12 @@ static const char *wz_strsignal(int sign
        case SIGSEGV:
                switch (sigcode)
                {
@@ -63,7 +71,7 @@ Disable unsupported sigcodes for DragonF
                default:
                        return "SIGSEGV: Invalid memory reference";
                }
-@@ -279,10 +287,12 @@ static const char *wz_strsignal(int sign
+@@ -279,10 +288,12 @@ static const char *wz_strsignal(int sign
        case SIGTRAP:
                switch (sigcode)
                {

Added files:

Index: pkgsrc/games/warzone2100/patches/patch-lib_netplay_netplay.cpp
diff -u /dev/null pkgsrc/games/warzone2100/patches/patch-lib_netplay_netplay.cpp:1.1
--- /dev/null   Thu Dec 19 22:16:05 2019
+++ pkgsrc/games/warzone2100/patches/patch-lib_netplay_netplay.cpp      Thu Dec 19 22:16:05 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_netplay_netplay.cpp,v 1.1 2019/12/19 22:16:05 joerg Exp $
+
+--- lib/netplay/netplay.cpp.orig       2019-12-19 16:30:29.430922431 +0000
++++ lib/netplay/netplay.cpp
+@@ -1783,7 +1783,7 @@ static void NETcheckPlayers(void)
+ // We should not block here.
+ bool NETrecvNet(NETQUEUE *queue, uint8_t *type)
+ {
+-      switch (upnp_status)
++      switch (upnp_status.load())
+       {
+       case UPNP_ERROR_CONTROL_NOT_AVAILABLE:
+       case UPNP_ERROR_DEVICE_NOT_FOUND: