CVS commit: pkgsrc/emulators/mame

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 27 17:06:06 UTC 2021

Modified Files:
        pkgsrc/emulators/mame: Makefile distinfo
Added Files:
        pkgsrc/emulators/mame/patches:
            patch-src_osd_modules_lib_osdlib__unix.cpp

Log Message:
mame: add patch to fix running mame on NetBSD.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/emulators/mame/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/emulators/mame/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/mame/patches/patch-src_osd_modules_lib_osdlib__unix.cpp

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

Modified files:

Index: pkgsrc/emulators/mame/Makefile
diff -u pkgsrc/emulators/mame/Makefile:1.128 pkgsrc/emulators/mame/Makefile:1.129
--- pkgsrc/emulators/mame/Makefile:1.128        Tue Jan 26 22:10:05 2021
+++ pkgsrc/emulators/mame/Makefile      Wed Jan 27 17:06:06 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2021/01/26 22:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2021/01/27 17:06:06 wiz Exp $
 
 DISTNAME=      mame-0.228
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mamedev/}
 GITHUB_TAG=    ${DISTNAME:S/-//S/.//}

Index: pkgsrc/emulators/mame/distinfo
diff -u pkgsrc/emulators/mame/distinfo:1.101 pkgsrc/emulators/mame/distinfo:1.102
--- pkgsrc/emulators/mame/distinfo:1.101        Tue Jan 26 22:10:05 2021
+++ pkgsrc/emulators/mame/distinfo      Wed Jan 27 17:06:06 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.101 2021/01/26 22:10:05 wiz Exp $
+$NetBSD: distinfo,v 1.102 2021/01/27 17:06:06 wiz Exp $
 
 SHA1 (mame-0.228.tar.gz) = 96d46a78152d15a5e444a48c5f6531ef2ef70241
 RMD160 (mame-0.228.tar.gz) = 2564296e3d99ab8fe3129e3fa931f80f311e7637
@@ -10,3 +10,4 @@ SHA1 (patch-3rdparty_bgfx_examples_commo
 SHA1 (patch-3rdparty_genie_build_gmake.darwin_genie.make) = bb2e8c06d4b5f5869fb48e06390d5ca94a190056
 SHA1 (patch-makefile) = 343fac4d165438a26e2e8077216db1c6c46a5d1e
 SHA1 (patch-scripts_genie.lua) = 6c72b76c9a9ea952a787bf3994680f8711c8b64a
+SHA1 (patch-src_osd_modules_lib_osdlib__unix.cpp) = abc52d25f3d2fa65586c25154bb286ac733ce507

Added files:

Index: pkgsrc/emulators/mame/patches/patch-src_osd_modules_lib_osdlib__unix.cpp
diff -u /dev/null pkgsrc/emulators/mame/patches/patch-src_osd_modules_lib_osdlib__unix.cpp:1.1
--- /dev/null   Wed Jan 27 17:06:06 2021
+++ pkgsrc/emulators/mame/patches/patch-src_osd_modules_lib_osdlib__unix.cpp    Wed Jan 27 17:06:06 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_osd_modules_lib_osdlib__unix.cpp,v 1.1 2021/01/27 17:06:06 wiz Exp $
+
+Prepare mmap'd page for later mprotect().
+https://github.com/mamedev/mame/issues/7712
+
+--- src/osd/modules/lib/osdlib_unix.cpp.orig   2021-01-26 04:43:24.000000000 +0000
++++ src/osd/modules/lib/osdlib_unix.cpp
+@@ -189,7 +189,11 @@ void *virtual_memory_allocation::do_allo
+       // TODO: portable applications are supposed to use -1 for anonymous mappings - detect whatever requires 0 specifically
+       int const fd(0);
+ #endif
++#ifdef __NetBSD__
++      void *const result(mmap(nullptr, s, PROT_MPROTECT(PROT_EXEC|PROT_WRITE|PROT_READ), MAP_ANON | MAP_SHARED, fd, 0));
++#else
+       void *const result(mmap(nullptr, s, PROT_NONE, MAP_ANON | MAP_SHARED, fd, 0));
++#endif
+       if (result == (void *)-1)
+               return nullptr;
+       size = s;