Attachment #138325 for bug #184246




# $FreeBSD: head/emulators/mame/Makefile 339634 2014-01-13 21:00:02Z rene $

PORTNAME=	mame
PORTVERSION=	0.152${PATCHSUFFIX}
PORTREVISION=	1
CATEGORIES=	emulators
MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
		http://mame.mirrors.zippykid.com/releases/ \
		http://emumovies.com/aarongiles/releases/ \
		http://mamedev.org/updates/:patchsets
DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		${UPDATE_PATCHES:C/$/.zip:patchsets/}
DIST_SUBDIR=	${PORTNAME}


		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf

OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
OPTIONS_RADIO=	BUILTIN_DEBUGGER
OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
SDL2_DESC=	SDL2 libraries support
BUILTIN_DEBUGGER_DESC=	Builtin debugger support
SDL2_DESC=	SDL2 libraries support

NO_WRKSUBDIR=	yes

USES=		dos2unix gmake pkgconfig shebangfix
DOS2UNIX_FILES=	src/emu/netlist/nl_base.h \
		src/emu/netlist/pstate.h
SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
		src/emu/cpu/m6809/m6809make.py \
		src/emu/cpu/mcs96/mcs96make.py \
		src/emu/cpu/tms57002/tmsmake.py
DOS2UNIX_FILES=	src/osd/sdl/input.c \
		src/osd/sdl/testkeys.c
USE_XORG=	xext xi xinerama xrender
USE_GL=		gl
USE_PYTHON_BUILD=2
MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
MAKEFILE=	makefile


.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
USE_QT4=	gui moc_build qmake_build
.else
MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
.endif

.if ${PORT_OPTIONS:MSDL2}
USE_SDL=	sdl2 ttf2
MAKE_ENV+=	SDL_LIBVER="sdl2"

MAKE_ENV+=	DEBUG=1
.endif

.if ${PORT_OPTIONS:MGTK2}
USE_GNOME=	gtk20 gconf2
MAKE_ENV+=	GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
		GTK_CCOMFLAGS="$$(pkg-config --cflags-only-other gtk+-2.0 gconf-2.0)" \
		GTK_LIBS="$$(pkg-config --libs gtk+-2.0 gconf-2.0)"
.else
MAKE_ENV+=	GTK_INCPATH="" \
		GTK_CCOMFLAGS="" \
		GTK_LIBS=""
.endif

.if ${PORT_OPTIONS:MQT4}
USE_QT4=	gui moc_build qmake_build
.else
MAKE_ENV+=	NO_USE_QTDEBUG=1
.endif

.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
MAKE_ENV+=	NO_DEBUGGER=1
.endif

.include <bsd.port.pre.mk>

.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
CC=		/usr/bin/clang
CPP=		/usr/bin/clang-cpp
CXX=		/usr/bin/clang++
.else
USE_GCC=	yes
.endif

.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
BROKEN=		Does not install on ia64, powerpc, or sparc64
.endif

post-extract:
	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
		${EXTRACT_AFTER_ARGS})
	@${RM} -f ${WRKDIR}/mame.zip
# Use post-extract target to get in before dos2unix-isation
.if defined(UPDATE_PATCHES)


post-patch:
	@${REINPLACE_CMD} -e \
		'/^BUILD_EXPAT /s|^|#| ; \
		 /^BUILD_ZLIB /s|^|#| ; \
		 /^BUILD_FLAC /s|^|#| ; \
		 /^BUILD_JPEGLIB /s|^|#| ; \
		 /^CC /s|^|#| ; \
		 /^LD /s|^|#| ; \
		 /^PYTHON /s|^|#| ; \
		 s|-O$$(OPTIMIZE)|| ; \
		 s| = @python| = ${PYTHON_CMD}| ; \
		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
		 /LDFLAGS/s|-s|| ; \
		 /LIBS/s|-lstdc++|| ; \

		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
	@${REINPLACE_CMD} -e \
		'/LIBS/s|-lpthread|-pthread| ; \
		 /-isystem/s|^|#| ; \
		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \
		 /--cflags-only-other gtk+-2.0/s|=.*|= $$(GTK_CCOMFLAGS)| ; \
		 /--libs gtk+-2.0/s|=.*|= $$(GTK_LIBS)| ; \
		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak

do-install:

Lines 1-2 Link Here

(-)emulators/mame/distinfo (-2 / +2 lines)
1	SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7	1	SHA256 (mame/mame0152s.zip) = dd245297824e0b3938312c74aee31e1d32798d093bbf19f857de56bbd1ea4bdf
2	SIZE (mame/mame0150s.zip) = 35999158	2	SIZE (mame/mame0152s.zip) = 36247883




--- src/emu/netlist/nl_base.h.orig
+++ src/emu/netlist/nl_base.h
@@ -287,7 +287,7 @@
 
 	ATTR_COLD const pstring &name() const;
 
-	PSTATE_INTERFACE(*m_netlist, name())
+	PSTATE_INTERFACE_DECL()
 
 #if 0
 	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
@@ -1120,6 +1120,8 @@
 // Inline implementations
 // ----------------------------------------------------------------------------------------
 
+PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
+
 ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
 {
 	m_param = param;




--- src/emu/netlist/pstate.h.orig
+++ src/emu/netlist/pstate.h
@@ -15,10 +15,13 @@
 // state saving ...
 // ----------------------------------------------------------------------------------------
 
-#define PSTATE_INTERFACE(manager, module)               \
-	template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
+#define PSTATE_INTERFACE_DECL()               \
+	template<class C> ATTR_COLD void save(C &state, const pstring &stname);
+
+#define PSTATE_INTERFACE(obj, manager, module)               \
+	template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
 	{                                                                       \
-		dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname);  \
+		manager->save_manager(state, module + "." + stname);  \
 	}
 
 enum netlist_data_type_e {




--- src/osd/sdl/input.c.orig
+++ src/osd/sdl/input.c
@@ -720,7 +720,11 @@
 	mame_printf_verbose("Joystick: Start initialization\n");
 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 	{
+#if (SDLMAME_SDL2)
+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
+#else
 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
+#endif
 
 		devmap_register(&joy_map, physical_stick, joy_name);
 	}




--- src/osd/sdl/testkeys.c.orig
+++ src/osd/sdl/testkeys.c
@@ -146,7 +146,6 @@
 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 					(int) event.key.keysym.scancode,
-					(int) event.key.keysym.unicode,
 					"");
 				lasttext[0] = 0;
 #else
@@ -165,7 +164,6 @@
 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 					(int) event.key.keysym.scancode,
-					(int) event.key.keysym.unicode,
 					lasttext);
 #else
 			memset(buf, 0, 19);




%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt

%%DATADIR%%/hash/abc1600.xml
%%DATADIR%%/hash/abc80.xml
%%DATADIR%%/hash/abc800.xml
%%DATADIR%%/hash/abc800_hdd.xml
%%DATADIR%%/hash/abc806.xml
%%DATADIR%%/hash/adam_cart.xml
%%DATADIR%%/hash/adam_cass.xml

%%DATADIR%%/hash/ibm5140.xml
%%DATADIR%%/hash/ibm5150.xml
%%DATADIR%%/hash/ibm5150_cass.xml
%%DATADIR%%/hash/ibm5160_flop.xml
%%DATADIR%%/hash/ibm5170.xml
%%DATADIR%%/hash/ibm5170_cdrom.xml
%%DATADIR%%/hash/ibmpcjr_cart.xml
%%DATADIR%%/hash/ibmpcjr_flop.xml
%%DATADIR%%/hash/interact.xml

%%DATADIR%%/hash/msx1_cass.xml
%%DATADIR%%/hash/msx2.hsi
%%DATADIR%%/hash/msx2_cart.xml
%%DATADIR%%/hash/myvision.xml
%%DATADIR%%/hash/mz2000_cass.xml
%%DATADIR%%/hash/mz2000_flop.xml
%%DATADIR%%/hash/mz2500.xml

%%DATADIR%%/hash/pentagon_cass.xml
%%DATADIR%%/hash/pet_cass.xml
%%DATADIR%%/hash/pet_flop.xml
%%DATADIR%%/hash/pet_hdd.xml
%%DATADIR%%/hash/pet_rom.xml
%%DATADIR%%/hash/pico.xml
%%DATADIR%%/hash/pippin.xml

%%DATADIR%%/hash/tvc_cart.xml
%%DATADIR%%/hash/ut88.xml
%%DATADIR%%/hash/uzebox.xml
%%DATADIR%%/hash/v1050_flop.xml
%%DATADIR%%/hash/v1050_hdd.xml
%%DATADIR%%/hash/vboy.xml
%%DATADIR%%/hash/vc4000.xml
%%DATADIR%%/hash/vectrex.xml

Return to bug 184246

Lines 2-16 Link Here

(-)emulators/mame/Makefile (-55 / +25 lines)
2	# $FreeBSD: head/emulators/mame/Makefile 339634 2014-01-13 21:00:02Z rene $	2	# $FreeBSD: head/emulators/mame/Makefile 339634 2014-01-13 21:00:02Z rene $
3		3
4	PORTNAME= mame	4	PORTNAME= mame
5	PORTVERSION= 0.150${PATCHSUFFIX}	5	PORTVERSION= 0.152${PATCHSUFFIX}
6	PORTREVISION= 1
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \	7	MASTER_SITES= http://mame.mirrors.zippykid.com/releases/ \
9	http://mame.mirrors.zippykid.com/releases/ \
10	http://emumovies.com/aarongiles/releases/ \	8	http://emumovies.com/aarongiles/releases/ \
11	http://mamedev.org/updates/:patchsets	9	http://mamedev.org/updates/:patchsets
12	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s	10	DISTFILES= ${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
14	${UPDATE_PATCHES:C/$/.zip:patchsets/}	11	${UPDATE_PATCHES:C/$/.zip:patchsets/}
15	DIST_SUBDIR= ${PORTNAME}	12	DIST_SUBDIR= ${PORTNAME}
16		13
Lines 23-48 Link Here
23	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig	20	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
24	RUN_DEPENDS= liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf	21	RUN_DEPENDS= liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
25		22
26	OPTIONS_DEFINE= SDL2 DEBUG DOCS EXAMPLES	23	OPTIONS_DEFINE= BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
27	OPTIONS_RADIO= BUILTIN_DEBUGGER
28	OPTIONS_RADIO_BUILTIN_DEBUGGER= GTK2 QT4
29	SDL2_DESC= SDL2 libraries support
30	BUILTIN_DEBUGGER_DESC= Builtin debugger support	24	BUILTIN_DEBUGGER_DESC= Builtin debugger support
		25	SDL2_DESC= SDL2 libraries support
31		26
32	NO_WRKSUBDIR= yes	27	NO_WRKSUBDIR= yes
33		28
34	USE_ZIP= yes	29	USES= dos2unix gmake pkgconfig shebangfix
35	USES= gmake pkgconfig shebangfix dos2unix	30	DOS2UNIX_FILES= src/emu/netlist/nl_base.h \
		31	src/emu/netlist/pstate.h
36	SHEBANG_FILES= src/emu/cpu/m6502/m6502make.py \	32	SHEBANG_FILES= src/emu/cpu/m6502/m6502make.py \
37	src/emu/cpu/m6809/m6809make.py \	33	src/emu/cpu/m6809/m6809make.py \
38	src/emu/cpu/mcs96/mcs96make.py \	34	src/emu/cpu/mcs96/mcs96make.py \
39	src/emu/cpu/tms57002/tmsmake.py	35	src/emu/cpu/tms57002/tmsmake.py
40	DOS2UNIX_FILES= src/osd/sdl/input.c \
41	src/osd/sdl/testkeys.c
42	USE_XORG= xext xi xinerama xrender	36	USE_XORG= xext xi xinerama xrender
43	USE_GL= gl	37	USE_GL= gl
44	USE_PYTHON_BUILD=2	38	USE_PYTHON_BUILD=2
45	MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \	39	MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \
		40	LD="${CXX}" PYTHON="${PYTHON_CMD}" \
46	OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \	41	OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
47	TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"	42	TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
48	MAKEFILE= makefile	43	MAKEFILE= makefile
Lines 60-65 Link Here
60		55
61	.include <bsd.port.options.mk>	56	.include <bsd.port.options.mk>
62		57
		58	.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
		59	USE_QT4= gui moc_build qmake_build
		60	.else
		61	MAKE_ENV+= NO_DEBUGGER=1 NO_USE_QTDEBUG=1
		62	.endif
		63
63	.if ${PORT_OPTIONS:MSDL2}	64	.if ${PORT_OPTIONS:MSDL2}
64	USE_SDL= sdl2 ttf2	65	USE_SDL= sdl2 ttf2
65	MAKE_ENV+= SDL_LIBVER="sdl2"	66	MAKE_ENV+= SDL_LIBVER="sdl2"
Lines 71-113 Link Here
71	MAKE_ENV+= DEBUG=1	72	MAKE_ENV+= DEBUG=1
72	.endif	73	.endif
73		74
74	.if ${PORT_OPTIONS:MGTK2}
75	USE_GNOME= gtk20 gconf2
76	MAKE_ENV+= GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
77	GTK_CCOMFLAGS="$$(pkg-config --cflags-only-other gtk+-2.0 gconf-2.0)" \
78	GTK_LIBS="$$(pkg-config --libs gtk+-2.0 gconf-2.0)"
79	.else
80	MAKE_ENV+= GTK_INCPATH="" \
81	GTK_CCOMFLAGS="" \
82	GTK_LIBS=""
83	.endif
84
85	.if ${PORT_OPTIONS:MQT4}
86	USE_QT4= gui moc_build qmake_build
87	.else
88	MAKE_ENV+= NO_USE_QTDEBUG=1
89	.endif
90
91	.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
92	MAKE_ENV+= NO_DEBUGGER=1
93	.endif
94
95	.include <bsd.port.pre.mk>	75	.include <bsd.port.pre.mk>
96		76
97	.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
98	CC= /usr/bin/clang
99	CPP= /usr/bin/clang-cpp
100	CXX= /usr/bin/clang++
101	.else
102	USE_GCC= yes
103	.endif
104
105	.if ${ARCH} == "ia64" \|\| ${ARCH} == "powerpc" \|\| ${ARCH} == "sparc64"	77	.if ${ARCH} == "ia64" \|\| ${ARCH} == "powerpc" \|\| ${ARCH} == "sparc64"
106	BROKEN= Does not install on ia64, powerpc, or sparc64	78	BROKEN= Does not install on ia64, powerpc, or sparc64
107	.endif	79	.endif
108		80
109	post-extract:	81	post-extract:
110	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}	82	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
		83	${EXTRACT_AFTER_ARGS})
111	@${RM} -f ${WRKDIR}/mame.zip	84	@${RM} -f ${WRKDIR}/mame.zip
112	# Use post-extract target to get in before dos2unix-isation	85	# Use post-extract target to get in before dos2unix-isation
113	.if defined(UPDATE_PATCHES)	86	.if defined(UPDATE_PATCHES)
Lines 120-133 Link Here
120		93
121	post-patch:	94	post-patch:
122	@${REINPLACE_CMD} -e \	95	@${REINPLACE_CMD} -e \
123	's\|^BUILD_EXPAT\|# BUILD_EXPAT\| ; \	96	'/^BUILD_EXPAT /s\|^\|#\| ; \
124	s\|^BUILD_ZLIB\|# BUILD_ZLIB\| ; \	97	/^BUILD_ZLIB /s\|^\|#\| ; \
125	s\|^BUILD_FLAC\|# BUILD_FLAC\| ; \	98	/^BUILD_FLAC /s\|^\|#\| ; \
126	s\|^BUILD_JPEGLIB\|# BUILD_JPEGLIB\| ; \	99	/^BUILD_JPEGLIB /s\|^\|#\| ; \
127	s\| = @gcc\| := $$(CC)\| ; \	100	/^CC /s\|^\|#\| ; \
128	s\| = @g++\| := $$(CXX)\| ; \	101	/^LD /s\|^\|#\| ; \
		102	/^PYTHON /s\|^\|#\| ; \
129	s\|-O$$(OPTIMIZE)\|\| ; \	103	s\|-O$$(OPTIMIZE)\|\| ; \
130	s\| = @python\| = ${PYTHON_CMD}\| ; \
131	/--warn-common/s\|= -Wl,\|= $$(GCC_LDFLAGS) -Wl,\| ; \	104	/--warn-common/s\|= -Wl,\|= $$(GCC_LDFLAGS) -Wl,\| ; \
132	/LDFLAGS/s\|-s\|\| ; \	105	/LDFLAGS/s\|-s\|\| ; \
133	/LIBS/s\|-lstdc++\|\| ; \	106	/LIBS/s\|-lstdc++\|\| ; \
Lines 136-145 Link Here
136	'/realloc/s\|^\|// \|' ${WRKSRC}/src/emu/emualloc.h	109	'/realloc/s\|^\|// \|' ${WRKSRC}/src/emu/emualloc.h
137	@${REINPLACE_CMD} -e \	110	@${REINPLACE_CMD} -e \
138	'/LIBS/s\|-lpthread\|-pthread\| ; \	111	'/LIBS/s\|-lpthread\|-pthread\| ; \
139	/-system/s\|/usr/local/\|${LOCALBASE}/\| ; \	112	/-isystem/s\|^\|#\| ; \
140	/--cflags-only-I gtk+-2.0/s\|=.*\|= $$(GTK_INCPATH)\| ; \
141	/--cflags-only-other gtk+-2.0/s\|=.*\|= $$(GTK_CCOMFLAGS)\| ; \
142	/--libs gtk+-2.0/s\|=.*\|= $$(GTK_LIBS)\| ; \
143	/X11R6/s\|^\|#\|' ${WRKSRC}/src/osd/sdl/sdl.mak	113	/X11R6/s\|^\|#\|' ${WRKSRC}/src/osd/sdl/sdl.mak
144		114
145	do-install:	115	do-install:

Line 0 Link Here

(-)emulators/mame/files/patch-src__emu__netlist__nl_base.h (+20 lines)
	1	--- src/emu/netlist/nl_base.h.orig
	2	+++ src/emu/netlist/nl_base.h
	3	@@ -287,7 +287,7 @@
	4
	5	ATTR_COLD const pstring &name() const;
	6
	7	- PSTATE_INTERFACE(*m_netlist, name())
	8	+ PSTATE_INTERFACE_DECL()
	9
	10	#if 0
	11	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
	12	@@ -1120,6 +1120,8 @@
	13	// Inline implementations
	14	// ----------------------------------------------------------------------------------------
	15
	16	+PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
	17	+
	18	ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
	19	{
	20	m_param = param;

Line 0 Link Here

(-)emulators/mame/files/patch-src__emu__netlist__pstate.h (+19 lines)
	1	--- src/emu/netlist/pstate.h.orig
	2	+++ src/emu/netlist/pstate.h
	3	@@ -15,10 +15,13 @@
	4	// state saving ...
	5	// ----------------------------------------------------------------------------------------
	6
	7	-#define PSTATE_INTERFACE(manager, module) \
	8	- template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
	9	+#define PSTATE_INTERFACE_DECL() \
	10	+ template<class C> ATTR_COLD void save(C &state, const pstring &stname);
	11	+
	12	+#define PSTATE_INTERFACE(obj, manager, module) \
	13	+ template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
	14	{ \
	15	- dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname); \
	16	+ manager->save_manager(state, module + "." + stname); \
	17	}
	18
	19	enum netlist_data_type_e {

Lines 1-14 Link Here

(-)emulators/mame/files/patch-src__osd__sdl__input.c (-14 lines)
1	--- src/osd/sdl/input.c.orig
2	+++ src/osd/sdl/input.c
3	@@ -720,7 +720,11 @@
4	mame_printf_verbose("Joystick: Start initialization\n");
5	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
6	{
7	+#if (SDLMAME_SDL2)
8	+ char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
9	+#else
10	char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
11	+#endif
12
13	devmap_register(&joy_map, physical_stick, joy_name);
14	}

Lines 1-18 Link Here

(-)emulators/mame/files/patch-src__osd__sdl__testkeys.c (-18 lines)
1	--- src/osd/sdl/testkeys.c.orig
2	+++ src/osd/sdl/testkeys.c
3	@@ -146,7 +146,6 @@
4	printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
5	lookup_key_name(sdl_lookup, event.key.keysym.scancode),
6	(int) event.key.keysym.scancode,
7	- (int) event.key.keysym.unicode,
8	"");
9	lasttext[0] = 0;
10	#else
11	@@ -165,7 +164,6 @@
12	printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
13	lookup_key_name(sdl_lookup, event.key.keysym.scancode),
14	(int) event.key.keysym.scancode,
15	- (int) event.key.keysym.unicode,
16	lasttext);
17	#else
18	memset(buf, 0, 19);

Lines 11-16 Link Here

(-)emulators/mame/pkg-plist (-1 / +8 lines)
11	%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt	11	%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
12	%%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt	12	%%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
13	%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt	13	%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
		14	%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
14	%%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt	15	%%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
15	%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt	16	%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
16	%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt	17	%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
Lines 31-36 Link Here
31	%%DATADIR%%/hash/abc1600.xml	32	%%DATADIR%%/hash/abc1600.xml
32	%%DATADIR%%/hash/abc80.xml	33	%%DATADIR%%/hash/abc80.xml
33	%%DATADIR%%/hash/abc800.xml	34	%%DATADIR%%/hash/abc800.xml
		35	%%DATADIR%%/hash/abc800_hdd.xml
34	%%DATADIR%%/hash/abc806.xml	36	%%DATADIR%%/hash/abc806.xml
35	%%DATADIR%%/hash/adam_cart.xml	37	%%DATADIR%%/hash/adam_cart.xml
36	%%DATADIR%%/hash/adam_cass.xml	38	%%DATADIR%%/hash/adam_cass.xml
Lines 127-133 Link Here
127	%%DATADIR%%/hash/ibm5140.xml	129	%%DATADIR%%/hash/ibm5140.xml
128	%%DATADIR%%/hash/ibm5150.xml	130	%%DATADIR%%/hash/ibm5150.xml
129	%%DATADIR%%/hash/ibm5150_cass.xml	131	%%DATADIR%%/hash/ibm5150_cass.xml
		132	%%DATADIR%%/hash/ibm5160_flop.xml
130	%%DATADIR%%/hash/ibm5170.xml	133	%%DATADIR%%/hash/ibm5170.xml
		134	%%DATADIR%%/hash/ibm5170_cdrom.xml
131	%%DATADIR%%/hash/ibmpcjr_cart.xml	135	%%DATADIR%%/hash/ibmpcjr_cart.xml
132	%%DATADIR%%/hash/ibmpcjr_flop.xml	136	%%DATADIR%%/hash/ibmpcjr_flop.xml
133	%%DATADIR%%/hash/interact.xml	137	%%DATADIR%%/hash/interact.xml
Lines 171-176 Link Here
171	%%DATADIR%%/hash/msx1_cass.xml	175	%%DATADIR%%/hash/msx1_cass.xml
172	%%DATADIR%%/hash/msx2.hsi	176	%%DATADIR%%/hash/msx2.hsi
173	%%DATADIR%%/hash/msx2_cart.xml	177	%%DATADIR%%/hash/msx2_cart.xml
		178	%%DATADIR%%/hash/myvision.xml
174	%%DATADIR%%/hash/mz2000_cass.xml	179	%%DATADIR%%/hash/mz2000_cass.xml
175	%%DATADIR%%/hash/mz2000_flop.xml	180	%%DATADIR%%/hash/mz2000_flop.xml
176	%%DATADIR%%/hash/mz2500.xml	181	%%DATADIR%%/hash/mz2500.xml
Lines 215-220 Link Here
215	%%DATADIR%%/hash/pentagon_cass.xml	220	%%DATADIR%%/hash/pentagon_cass.xml
216	%%DATADIR%%/hash/pet_cass.xml	221	%%DATADIR%%/hash/pet_cass.xml
217	%%DATADIR%%/hash/pet_flop.xml	222	%%DATADIR%%/hash/pet_flop.xml
		223	%%DATADIR%%/hash/pet_hdd.xml
218	%%DATADIR%%/hash/pet_rom.xml	224	%%DATADIR%%/hash/pet_rom.xml
219	%%DATADIR%%/hash/pico.xml	225	%%DATADIR%%/hash/pico.xml
220	%%DATADIR%%/hash/pippin.xml	226	%%DATADIR%%/hash/pippin.xml
Lines 293-299 Link Here
293	%%DATADIR%%/hash/tvc_cart.xml	299	%%DATADIR%%/hash/tvc_cart.xml
294	%%DATADIR%%/hash/ut88.xml	300	%%DATADIR%%/hash/ut88.xml
295	%%DATADIR%%/hash/uzebox.xml	301	%%DATADIR%%/hash/uzebox.xml
296	%%DATADIR%%/hash/v1050.xml	302	%%DATADIR%%/hash/v1050_flop.xml
		303	%%DATADIR%%/hash/v1050_hdd.xml
297	%%DATADIR%%/hash/vboy.xml	304	%%DATADIR%%/hash/vboy.xml
298	%%DATADIR%%/hash/vc4000.xml	305	%%DATADIR%%/hash/vc4000.xml
299	%%DATADIR%%/hash/vectrex.xml	306	%%DATADIR%%/hash/vectrex.xml