[pkgsrc/trunk]: pkgsrc/emulators/mame Fixed crash on startup.

[nat <nat%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbb233f90ab0
branches:  trunk
changeset: 632351:fbb233f90ab0
user:      nat <nat%pkgsrc.org@localhost>
date:      Wed Mar 26 01:42:48 2014 +0000

description:
Fixed crash on startup.

diffstat:

 emulators/mame/Makefile                         |   3 ++-
 emulators/mame/Makefile.common                  |   4 ++--
 emulators/mame/distinfo                         |   3 ++-
 emulators/mame/patches/patch-src_emu_emualloc.c |  18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diffs (67 lines):

diff -r cae646818d40 -r fbb233f90ab0 emulators/mame/Makefile
--- a/emulators/mame/Makefile   Tue Mar 25 23:19:19 2014 +0000
+++ b/emulators/mame/Makefile   Wed Mar 26 01:42:48 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2014/02/06 10:40:19 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2014/03/26 01:42:48 nat Exp $
 
 DISTNAME=      mame0152s
 PKGNAME=       ${DISTNAME:S/0/-0./:S/s$//}
+PKGREVISION=   1
 MASTER_SITES=  http://mamedev.org/downloader.php?file=releases/
 
 COMMENT=       Multiple Arcade Machine Emulator
diff -r cae646818d40 -r fbb233f90ab0 emulators/mame/Makefile.common
--- a/emulators/mame/Makefile.common    Tue Mar 25 23:19:19 2014 +0000
+++ b/emulators/mame/Makefile.common    Wed Mar 26 01:42:48 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2014/01/25 10:30:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2014/03/26 01:42:48 nat Exp $
 #
 # used by emulators/mame/Makefile
 # used by emulators/mess/Makefile
@@ -29,7 +29,7 @@
 # 0.141 has too many conversion warnings
 MAKE_ENV=              NOWERROR=1
 # we don't want to pull in qt4
-MAKE_ENV=              NO_USE_QTDEBUG=1
+MAKE_ENV+=             NO_USE_QTDEBUG=1
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
diff -r cae646818d40 -r fbb233f90ab0 emulators/mame/distinfo
--- a/emulators/mame/distinfo   Tue Mar 25 23:19:19 2014 +0000
+++ b/emulators/mame/distinfo   Wed Mar 26 01:42:48 2014 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.18 2014/02/06 10:40:19 wiz Exp $
+$NetBSD: distinfo,v 1.19 2014/03/26 01:42:48 nat Exp $
 
 SHA1 (mame0152s.zip) = 2e11509b39c13dc1336a48a102813589b0793788
 RMD160 (mame0152s.zip) = d8f4accbd639e085c6165374d7b7ebd427d3c4d7
 Size (mame0152s.zip) = 36247883 bytes
+SHA1 (patch-src_emu_emualloc.c) = 6df67d1d1aaf982444db3db65c066bc83644ae9b
 SHA1 (patch-src_emu_emualloc.h) = 22cdfbc002cda8053125ef8cedf3bcceea04deaf
 SHA1 (patch-src_emu_netlist_nl__base.h) = 9ee165f601da849a339699f560c371bc58dd0d83
 SHA1 (patch-src_emu_netlist_nl__lists.h) = d31c9cf715f66520e4a1a09584f1c52bbea74fef
diff -r cae646818d40 -r fbb233f90ab0 emulators/mame/patches/patch-src_emu_emualloc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/mame/patches/patch-src_emu_emualloc.c   Wed Mar 26 01:42:48 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_emu_emualloc.c,v 1.1 2014/03/26 01:42:48 nat Exp $
+
+This resolves a crash on startup.
+
+--- src/emu/emualloc.c.orig    2013-10-15 22:14:50.000000000 +0000
++++ src/emu/emualloc.c
+@@ -266,6 +266,11 @@ void resource_pool::add(resource_pool_it
+       memory_entry *entry = memory_entry::find(item.m_ptr);
+       if (entry == NULL)
+               entry = memory_entry::find(reinterpret_cast<UINT8 *>(item.m_ptr) - sizeof(size_t));
++      if (entry == NULL) {
++              osd_lock_release(m_listlock);
++              return;
++      }
++
+       assert(entry != NULL);
+       item.m_id = entry->m_id;
+       if (LOG_ALLOCS)