CVS commit: pkgsrc/games/devilutionx

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Mar 30 19:36:39 UTC 2020

Modified Files:
        pkgsrc/games/devilutionx: Makefile distinfo
Added Files:
        pkgsrc/games/devilutionx/patches:
            patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp

Log Message:
Don't force UBsan. Fix kqueue fallout on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/devilutionx/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/devilutionx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp

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

Modified files:

Index: pkgsrc/games/devilutionx/Makefile
diff -u pkgsrc/games/devilutionx/Makefile:1.11 pkgsrc/games/devilutionx/Makefile:1.12
--- pkgsrc/games/devilutionx/Makefile:1.11      Mon Mar  9 10:53:22 2020
+++ pkgsrc/games/devilutionx/Makefile   Mon Mar 30 19:36:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/03/09 10:53:22 nia Exp $
+# $NetBSD: Makefile,v 1.12 2020/03/30 19:36:39 joerg Exp $
 
 DISTNAME=      devilutionx-1.0.1
 CATEGORIES=    games
@@ -23,7 +23,7 @@ CONFIGURE_DIRS=       build
 CMAKE_ARG_PATH=        ..
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+=   -DASAN=OFF
+CMAKE_ARGS+=   -DASAN=OFF -DUBSAN=OFF
 CMAKE_ARGS+=   -DDEBUG=OFF
 CMAKE_ARGS+=   -DFASTER=OFF
 

Index: pkgsrc/games/devilutionx/distinfo
diff -u pkgsrc/games/devilutionx/distinfo:1.7 pkgsrc/games/devilutionx/distinfo:1.8
--- pkgsrc/games/devilutionx/distinfo:1.7       Mon Mar  9 10:53:22 2020
+++ pkgsrc/games/devilutionx/distinfo   Mon Mar 30 19:36:39 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2020/03/09 10:53:22 nia Exp $
+$NetBSD: distinfo,v 1.8 2020/03/30 19:36:39 joerg Exp $
 
 SHA1 (devilutionx-1.0.1.tar.gz) = 891c1b2d1956e8d7cef14d486e99f448c98a6694
 RMD160 (devilutionx-1.0.1.tar.gz) = 07bb1f4afef0a354b717add0afb0528689258868
 SHA512 (devilutionx-1.0.1.tar.gz) = 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
 Size (devilutionx-1.0.1.tar.gz) = 2005920 bytes
+SHA1 (patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = fdbfcc0d6e796a060d66013fcd59df6ef9383769

Added files:

Index: pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
diff -u /dev/null pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp:1.1
--- /dev/null   Mon Mar 30 19:36:39 2020
+++ pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp   Mon Mar 30 19:36:39 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp,v 1.1 2020/03/30 19:36:39 joerg Exp $
+
+--- 3rdParty/asio/include/asio/detail/impl/kqueue_reactor.ipp.orig     2020-03-09 00:37:54.000000000 +0000
++++ 3rdParty/asio/include/asio/detail/impl/kqueue_reactor.ipp
+@@ -28,6 +28,9 @@
+ #include "asio/detail/push_options.hpp"
+ 
+ #if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++#if defined(__NetBSD__) && (__NetBSD_Version__ - 0 < 999001500)
+ # define ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \
+     EV_SET(ev, ident, filt, flags, fflags, data, \
+       reinterpret_cast<intptr_t>(static_cast<void*>(udata)))