emulators/mame imgtool SEGVs [patch]

[Paul Ripke <stix%stix.id.au@localhost>]

Noticed while doing some retro 6809 assembler, already patched
upstream.


-- 
Paul Ripke
"Great minds discuss ideas, average minds discuss events, small minds
 discuss people."
-- Disputed: Often attributed to Eleanor Roosevelt. 1948.

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 3a5a19f99350..84f1b63f7bc5 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.160 2022/11/30 09:30:42 wiz Exp $
 
 DISTNAME=	mame-0.250
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mamedev/}
 GITHUB_TAG=	${DISTNAME:S/-//S/.//}
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 8852343478ae..f3bd5d535e24 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -5,3 +5,6 @@ SHA512 (mame-0.250.tar.gz) = eead323df5a2b207f1c545b236d99589f439e210b7ab0d0f329
 Size (mame-0.250.tar.gz) = 186094955 bytes
 SHA1 (patch-3rdparty_genie_build_gmake.darwin_genie.make) = bb2e8c06d4b5f5869fb48e06390d5ca94a190056
 SHA1 (patch-makefile) = 343fac4d165438a26e2e8077216db1c6c46a5d1e
+SHA1 (patch-scripts_src_tools.lua) = 2d58af66ea1b48b113a67a8101b498846c85b308
+SHA1 (patch-src_tools_imgtool_filter.cpp) = da0bd6cde82a162181c415c60c13137979495a0c
+SHA1 (patch-src_tools_imgtool_modules.cpp) = a1307d6851f7fb0a67e171beae885e7b2157956c
diff --git a/emulators/mame/patches/patch-scripts_src_tools.lua b/emulators/mame/patches/patch-scripts_src_tools.lua
new file mode 100644
index 000000000000..6b0c2d263880
--- /dev/null
+++ b/emulators/mame/patches/patch-scripts_src_tools.lua
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Fix imgtool SEGVs
+
+From upstream:
+https://github.com/mamedev/mame/commit/0d93398fb3d48e88209a4f3e07fd389522585ab6
+
+--- scripts/src/tools.lua.orig	2022-11-29 05:41:19.000000000 +0000
++++ scripts/src/tools.lua
+@@ -687,11 +687,9 @@ files {
+ 	MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.h",
+ 	MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp",
+-	MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/dgndos.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/os9.cpp",
+-	MAME_DIR .. "src/tools/imgtool/modules/mac.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/concept.cpp",
+@@ -699,11 +697,8 @@ files {
+ 	MAME_DIR .. "src/tools/imgtool/modules/fat.h",
+ 	MAME_DIR .. "src/tools/imgtool/modules/pc_flop.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/pc_hard.cpp",
+-	MAME_DIR .. "src/tools/imgtool/modules/prodos.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/vzdos.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/thomson.cpp",
+-	MAME_DIR .. "src/tools/imgtool/modules/macutil.cpp",
+-	MAME_DIR .. "src/tools/imgtool/modules/macutil.h",
+ 	MAME_DIR .. "src/tools/imgtool/modules/cybiko.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/cybikoxt.cpp",
+ 	MAME_DIR .. "src/tools/imgtool/modules/psion.cpp",
diff --git a/emulators/mame/patches/patch-src_tools_imgtool_filter.cpp b/emulators/mame/patches/patch-src_tools_imgtool_filter.cpp
new file mode 100644
index 000000000000..7f41372326e2
--- /dev/null
+++ b/emulators/mame/patches/patch-src_tools_imgtool_filter.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix imgtool SEGVs
+
+From upstream:
+https://github.com/mamedev/mame/commit/0d93398fb3d48e88209a4f3e07fd389522585ab6
+
+--- src/tools/imgtool/filter.cpp.orig	2022-11-29 05:41:19.000000000 +0000
++++ src/tools/imgtool/filter.cpp
+@@ -53,7 +53,6 @@ const filter_getinfoproc filters[] =
+ 	filter_eoln_getinfo,
+ 	filter_cocobas_getinfo,
+ 	filter_dragonbas_getinfo,
+-	filter_macbinary_getinfo,
+ 	filter_vzsnapshot_getinfo,
+ 	filter_vzbas_getinfo,
+ 	filter_thombas5_getinfo,
diff --git a/emulators/mame/patches/patch-src_tools_imgtool_modules.cpp b/emulators/mame/patches/patch-src_tools_imgtool_modules.cpp
new file mode 100644
index 000000000000..4c702f1adb31
--- /dev/null
+++ b/emulators/mame/patches/patch-src_tools_imgtool_modules.cpp
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Fix imgtool SEGVs
+
+From upstream:
+https://github.com/mamedev/mame/commit/0d93398fb3d48e88209a4f3e07fd389522585ab6
+
+--- src/tools/imgtool/modules.cpp.orig	2022-11-29 05:41:19.000000000 +0000
++++ src/tools/imgtool/modules.cpp
+@@ -72,8 +72,6 @@ imgtoolerr_t imgtool_create_canonical_li
+ 
+ MODULE(amiga_floppy)
+ MODULE(concept)
+-MODULE(mac_mfs)
+-MODULE(mac_hfs)
+ MODULE(hd)
+ MODULE(rsdos)
+ MODULE(dgndos)
+@@ -87,8 +85,6 @@ MODULE(ti99_ti99hd)
+ MODULE(ti990)
+ MODULE(pc_floppy)
+ MODULE(pc_chd)
+-MODULE(prodos_525)
+-MODULE(prodos_35)
+ MODULE(thom_fd_basic)
+ MODULE(thom_qd_basic)
+ MODULE(thom_sap_basic)