Attachment #137349 for bug #182801




# $FreeBSD: head/emulators/mess/Makefile 331644 2013-10-26 00:52:33Z gerald $

PORTNAME=	mess
PORTVERSION=	0.150${PATCHSUFFIX}
PORTREVISION=	1
CATEGORIES=	emulators
MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
		http://mame.mirrors.zippykid.com/releases/ \

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Multiple Emulator Super System

LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
		libjpeg.so:${PORTSDIR}/graphics/jpeg \
		libexpat.so:${PORTSDIR}/textproc/expat2 \
		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf

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

NO_WRKSUBDIR=	yes

USE_ZIP=	yes
USES=		gmake pkgconfig shebangfix
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
USE_DOS2UNIX=	src/osd/sdl/input.c \
		src/osd/sdl/testkeys.c
USE_XORG=	xext xi xinerama xrender
USE_GL=		gl
USE_SDL=	sdl ttf
USE_PYTHON_BUILD=yes
MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
MAKE_ENV=	NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
MAKEFILE=	makefile

SUB_FILES=	pkg-message

		${PATCHLEVEL} 1 ${PATCHLEVEL}
.endif

NO_STAGE=	yes
.include <bsd.port.options.mk>

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

.if ${PORT_OPTIONS:MDEBUG}
MAKE_ENV+=	DEBUG=1
.endif

		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
		 s| = @gcc| := $$(CC)| ; \
		 s| = @g++| := $$(CXX)| ; \
		 s|-O$$(OPTIMIZE)|| ; \
		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
		 /LDFLAGS/s|-s|| ; \
		 /LIBS/s|-lstdc++|| ; \
		 /LIBS/s|-lpthread|-pthread|' ${WRKSRC}/makefile
	@${REINPLACE_CMD} -e \
		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
	@${REINPLACE_CMD} -e \
		'/LIBS/s|-lpthread|-pthread| ; \
		 /-system/s|/usr/local/|${LOCALBASE}/| ; \
		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \

		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak

do-install:
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
		${STAGEDIR}/${PREFIX}/bin)
	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
.for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
	testkeys unidasm
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
.endfor
	@${MKDIR} ${STAGEDIR}/${DATADIR}
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
		${STAGEDIR}/${DATADIR})
	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
	@${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${FILESDIR}/mess.ini ${EXAMPLESDIR}
.endif
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)emulators/mess/distinfo (-2 / +2 lines)
1	SHA256 (mame/mame0149s.zip) = 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b	1	SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
2	SIZE (mame/mame0149s.zip) = 35160585	2	SIZE (mame/mame0150s.zip) = 35999158




--- src/emu/cpu/m6502/m6502make.py.orig
+++ src/emu/cpu/m6502/m6502make.py
@@ -14,7 +14,7 @@
     opcodes = []
     logging.info("load_opcodes: %s", fname)
     try:
-        f = open(fname, "r")
+        f = open(fname, "rU")
     except Exception, err:
         logging.error("cannot read opcodes file %s [%s]", fname, err)
         sys.exit(1)
@@ -36,7 +36,7 @@
     logging.info("load_disp: %s", fname)
     states = []
     try:
-        f = open(fname, "r")
+        f = open(fname, "rU")
     except Exception, err:
         logging.error("cannot read display file %s [%s]", fname, err)
         sys.exit(1)

Lines 1-11 Link Here

(-)emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py (-11 lines)
1	--- src/emu/cpu/m6809/m6809make.py.orig
2	+++ src/emu/cpu/m6809/m6809make.py
3	@@ -16,7 +16,7 @@
4	if path != "":
5	path = path + '/'
6	try:
7	- f = open(fname, "r")
8	+ f = open(fname, "rU")
9	except Exception, err:
10	print "Cannot read opcodes file %s [%s]" % (fname, err)
11	sys.exit(1)

Lines 1-11 Link Here

(-)emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py (-11 lines)
1	--- src/emu/cpu/mcs96/mcs96make.py.orig
2	+++ src/emu/cpu/mcs96/mcs96make.py
3	@@ -69,7 +69,7 @@
4	self.ea = {}
5	self.macros = {}
6	try:
7	- f = open(fname, "r")
8	+ f = open(fname, "rU")
9	except Exception, err:
10	print "Cannot read opcodes file %s [%s]" % (fname, err)
11	sys.exit(1)

Lines 1-11 Link Here

(-)emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py (-11 lines)
1	--- src/emu/cpu/tms57002/tmsmake.py.orig
2	+++ src/emu/cpu/tms57002/tmsmake.py
3	@@ -328,7 +328,7 @@
4	def LoadLst(filename):
5	instructions = []
6	ins = None
7	- for n, line in enumerate(open(filename)):
8	+ for n, line in enumerate(open(filename, "rU")):
9	line = line.rstrip()
10	if not line and ins:
11	# new lines separate intructions




--- 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,7 @@
 				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,
+					(int) event.key.keysym.mod,
 					"");
 				lasttext[0] = 0;
 #else
@@ -155,7 +155,7 @@
 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
 					(int) event.key.keysym.scancode,
-					(int) event.key.keysym.unicode,
+					(int) event.key.keysym.mod,
 					buf);
 #endif
 			}




%%DATADIR%%/hash/a5200.xml
%%DATADIR%%/hash/a7800.xml
%%DATADIR%%/hash/a800.xml
%%DATADIR%%/hash/a800_flop.xml
%%DATADIR%%/hash/abc1600.xml
%%DATADIR%%/hash/abc80.xml
%%DATADIR%%/hash/abc800.xml

%%DATADIR%%/hash/aim65_cart.xml
%%DATADIR%%/hash/alice32.xml
%%DATADIR%%/hash/alice90.xml
%%DATADIR%%/hash/alphatro_flop.xml
%%DATADIR%%/hash/amiga1000_flop.xml
%%DATADIR%%/hash/amiga1200_flop.xml
%%DATADIR%%/hash/amiga3000_flop.xml

%%DATADIR%%/hash/amigaaga_flop.xml
%%DATADIR%%/hash/amigaecs_flop.xml
%%DATADIR%%/hash/amigaocs_flop.xml
%%DATADIR%%/hash/ampro.xml
%%DATADIR%%/hash/apc.xml
%%DATADIR%%/hash/apfm1000.xml
%%DATADIR%%/hash/apogee.xml

%%DATADIR%%/hash/bbcm_cart.xml
%%DATADIR%%/hash/bbcm_cass.xml
%%DATADIR%%/hash/bk0010.xml
%%DATADIR%%/hash/bml3_flop.xml
%%DATADIR%%/hash/bw12.xml
%%DATADIR%%/hash/bw2.xml
%%DATADIR%%/hash/bx256hp_flop.xml

%%DATADIR%%/hash/coleco.xml
%%DATADIR%%/hash/compis.xml
%%DATADIR%%/hash/comx35_flop.xml
%%DATADIR%%/hash/copera.xml
%%DATADIR%%/hash/cpc_cass.xml
%%DATADIR%%/hash/cpc_flop.xml
%%DATADIR%%/hash/crvision.xml
%%DATADIR%%/hash/dim68k.xml
%%DATADIR%%/hash/dps1.xml
%%DATADIR%%/hash/ec1841.xml
%%DATADIR%%/hash/einstein.xml
%%DATADIR%%/hash/electron_cart.xml
%%DATADIR%%/hash/ep64_cart.xml
%%DATADIR%%/hash/ep64_cass.xml
%%DATADIR%%/hash/ep64_flop.xml
%%DATADIR%%/hash/famicom_cass.xml
%%DATADIR%%/hash/famicom_flop.xml
%%DATADIR%%/hash/fm77av.xml
%%DATADIR%%/hash/fm7_cass.xml

%%DATADIR%%/hash/snes.xml
%%DATADIR%%/hash/snes_bspack.xml
%%DATADIR%%/hash/snes_strom.xml
%%DATADIR%%/hash/snes_vkun.xml
%%DATADIR%%/hash/socrates.xml
%%DATADIR%%/hash/softbox.xml
%%DATADIR%%/hash/softwarelist.dtd

%%DATADIR%%/hash/vic1001_cart.xml
%%DATADIR%%/hash/vic1001_cass.xml
%%DATADIR%%/hash/vic1001_flop.xml
%%DATADIR%%/hash/victor9k_flop.xml
%%DATADIR%%/hash/vidbrain.xml
%%DATADIR%%/hash/vii.xml
%%DATADIR%%/hash/vip.xml
%%DATADIR%%/hash/visicom.xml
%%DATADIR%%/hash/vixen.xml
%%DATADIR%%/hash/vsmile_cart.xml
%%DATADIR%%/hash/vsmile_cd.xml
%%DATADIR%%/hash/wangpc.xml
%%DATADIR%%/hash/wicat.xml
%%DATADIR%%/hash/wmbullet.xml
%%DATADIR%%/hash/wscolor.xml
%%DATADIR%%/hash/wswan.xml

Return to bug 182801

Lines 2-9 Link Here

(-)emulators/mess/Makefile (-31 / +36 lines)
2	# $FreeBSD: head/emulators/mess/Makefile 331644 2013-10-26 00:52:33Z gerald $	2	# $FreeBSD: head/emulators/mess/Makefile 331644 2013-10-26 00:52:33Z gerald $
3		3
4	PORTNAME= mess	4	PORTNAME= mess
5	PORTVERSION= 0.149${PATCHSUFFIX}	5	PORTVERSION= 0.150${PATCHSUFFIX}
6	PORTREVISION= 1
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= SF/mame.mirror/MAME%20${PORTVERSION} \	7	MASTER_SITES= SF/mame.mirror/MAME%20${PORTVERSION} \
9	http://mame.mirrors.zippykid.com/releases/ \	8	http://mame.mirrors.zippykid.com/releases/ \
Lines 17-50 Link Here
17	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
18	COMMENT= Multiple Emulator Super System	17	COMMENT= Multiple Emulator Super System
19		18
20	LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \	19	LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
21	jpeg:${PORTSDIR}/graphics/jpeg \	20	libjpeg.so:${PORTSDIR}/graphics/jpeg \
22	expat:${PORTSDIR}/textproc/expat2 \	21	libexpat.so:${PORTSDIR}/textproc/expat2 \
23	fontconfig:${PORTSDIR}/x11-fonts/fontconfig	22	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
24	RUN_DEPENDS= liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf	23	RUN_DEPENDS= liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
25		24
26	OPTIONS_DEFINE= DEBUG DOCS EXAMPLES	25	OPTIONS_DEFINE= SDL2 DEBUG DOCS EXAMPLES
27	OPTIONS_RADIO= BUILTIN_DEBUGGER	26	OPTIONS_RADIO= BUILTIN_DEBUGGER
28	OPTIONS_RADIO_BUILTIN_DEBUGGER= GTK2 QT4	27	OPTIONS_RADIO_BUILTIN_DEBUGGER= GTK2 QT4
		28	SDL2_DESC= SDL2 libraries support
29	BUILTIN_DEBUGGER_DESC= Builtin debugger support	29	BUILTIN_DEBUGGER_DESC= Builtin debugger support
30		30
31	NO_WRKSUBDIR= yes	31	NO_WRKSUBDIR= yes
32		32
33	USE_ZIP= yes	33	USE_ZIP= yes
34	USES= pkgconfig shebangfix	34	USES= gmake pkgconfig shebangfix
35	SHEBANG_FILES= src/emu/cpu/m6502/m6502make.py \	35	SHEBANG_FILES= src/emu/cpu/m6502/m6502make.py \
36	src/emu/cpu/m6809/m6809make.py \	36	src/emu/cpu/m6809/m6809make.py \
37	src/emu/cpu/mcs96/mcs96make.py \	37	src/emu/cpu/mcs96/mcs96make.py \
38	src/emu/cpu/tms57002/tmsmake.py	38	src/emu/cpu/tms57002/tmsmake.py
39	USE_DOS2UNIX= ${SHEBANG_FILES}	39	USE_DOS2UNIX= src/osd/sdl/input.c \
		40	src/osd/sdl/testkeys.c
40	USE_XORG= xext xi xinerama xrender	41	USE_XORG= xext xi xinerama xrender
41	USE_GL= gl	42	USE_GL= gl
42	USE_SDL= sdl ttf
43	USE_PYTHON_BUILD=yes	43	USE_PYTHON_BUILD=yes
44	USE_GMAKE= yes	44	MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \
45	MAKE_ENV= NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
46	OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \	45	OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
47	TARGET="${PORTNAME}"	46	TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
48	MAKEFILE= makefile	47	MAKEFILE= makefile
49		48
50	SUB_FILES= pkg-message	49	SUB_FILES= pkg-message
Lines 58-66 Link Here
58	${PATCHLEVEL} 1 ${PATCHLEVEL}	57	${PATCHLEVEL} 1 ${PATCHLEVEL}
59	.endif	58	.endif
60		59
61	NO_STAGE= yes
62	.include <bsd.port.options.mk>	60	.include <bsd.port.options.mk>
63		61
		62	.if ${PORT_OPTIONS:MSDL2}
		63	USE_SDL= sdl2 ttf2
		64	MAKE_ENV+= SDL_LIBVER="sdl2"
		65	.else
		66	USE_SDL= sdl ttf
		67	.endif
		68
64	.if ${PORT_OPTIONS:MDEBUG}	69	.if ${PORT_OPTIONS:MDEBUG}
65	MAKE_ENV+= DEBUG=1	70	MAKE_ENV+= DEBUG=1
66	.endif	71	.endif
Lines 120-131 Link Here
120	s\|^BUILD_JPEGLIB\|# BUILD_JPEGLIB\| ; \	125	s\|^BUILD_JPEGLIB\|# BUILD_JPEGLIB\| ; \
121	s\| = @gcc\| := $$(CC)\| ; \	126	s\| = @gcc\| := $$(CC)\| ; \
122	s\| = @g++\| := $$(CXX)\| ; \	127	s\| = @g++\| := $$(CXX)\| ; \
123	s\|^FULLNAME =.*\|FULLNAME = $$(NAME)\| ; \	128	s\|-O$$(OPTIMIZE)\|\| ; \
124	/--warn-common/s\|= -Wl,\|= $$(GCC_LDFLAGS) -Wl,\| ; \	129	/--warn-common/s\|= -Wl,\|= $$(GCC_LDFLAGS) -Wl,\| ; \
125	/LDFLAGS/s\|-s\|\| ; \	130	/LDFLAGS/s\|-s\|\| ; \
126	/LIBS/s\|-lstdc++\|\| ; \	131	/LIBS/s\|-lstdc++\|\| ; \
127	/LIBS/s\|-lpthread\|-pthread\|' ${WRKSRC}/makefile	132	/LIBS/s\|-lpthread\|-pthread\|' ${WRKSRC}/makefile
128	@${REINPLACE_CMD} -e \	133	@${REINPLACE_CMD} -e \
		134	'/realloc/s\|^\|// \|' ${WRKSRC}/src/emu/emualloc.h
		135	@${REINPLACE_CMD} -e \
129	'/LIBS/s\|-lpthread\|-pthread\| ; \	136	'/LIBS/s\|-lpthread\|-pthread\| ; \
130	/-system/s\|/usr/local/\|${LOCALBASE}/\| ; \	137	/-system/s\|/usr/local/\|${LOCALBASE}/\| ; \
131	/--cflags-only-I gtk+-2.0/s\|=.*\|= $$(GTK_INCPATH)\| ; \	138	/--cflags-only-I gtk+-2.0/s\|=.*\|= $$(GTK_INCPATH)\| ; \
Lines 134-157 Link Here
134	/X11R6/s\|^\|#\|' ${WRKSRC}/src/osd/sdl/sdl.mak	141	/X11R6/s\|^\|#\|' ${WRKSRC}/src/osd/sdl/sdl.mak
135		142
136	do-install:	143	do-install:
137	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin	144	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
138	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}	145	${STAGEDIR}/${PREFIX}/bin)
		146	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
139	.for F in castool chdman imgtool jedutil ldresample ldverify romcmp \	147	.for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
140	testkeys unidasm	148	testkeys unidasm
141	${INSTALL_PROGRAM} ${WRKSRC}/${F} ${PREFIX}/libexec/${PORTNAME}	149	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
		150	${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
142	.endfor	151	.endfor
143	@${MKDIR} ${DATADIR}	152	@${MKDIR} ${STAGEDIR}/${DATADIR}
144	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})	153	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
145	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})	154	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
146	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})	155	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
147	.if ${PORT_OPTIONS:MDOCS}	156	${STAGEDIR}/${DATADIR})
148	@${MKDIR} ${DOCSDIR}	157	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
149	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})	158	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
150	.endif	159	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
151	.if ${PORT_OPTIONS:MEXAMPLES}	160	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
152	@${MKDIR} ${EXAMPLESDIR}
153	${INSTALL_DATA} ${FILESDIR}/mess.ini ${EXAMPLESDIR}
154	.endif
155	@${CAT} ${PKGMESSAGE}
156		161
157	.include <bsd.port.post.mk>	162	.include <bsd.port.post.mk>

Lines 1-20 Link Here

(-)emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py (-20 lines)
1	--- src/emu/cpu/m6502/m6502make.py.orig
2	+++ src/emu/cpu/m6502/m6502make.py
3	@@ -14,7 +14,7 @@
4	opcodes = []
5	logging.info("load_opcodes: %s", fname)
6	try:
7	- f = open(fname, "r")
8	+ f = open(fname, "rU")
9	except Exception, err:
10	logging.error("cannot read opcodes file %s [%s]", fname, err)
11	sys.exit(1)
12	@@ -36,7 +36,7 @@
13	logging.info("load_disp: %s", fname)
14	states = []
15	try:
16	- f = open(fname, "r")
17	+ f = open(fname, "rU")
18	except Exception, err:
19	logging.error("cannot read display file %s [%s]", fname, err)
20	sys.exit(1)

Line 0 Link Here

(-)emulators/mess/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	}

Line 0 Link Here

(-)emulators/mess/files/patch-src__osd__sdl__testkeys.c (+20 lines)
	1	--- src/osd/sdl/testkeys.c.orig
	2	+++ src/osd/sdl/testkeys.c
	3	@@ -146,7 +146,7 @@
	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	+ (int) event.key.keysym.mod,
	9	"");
	10	lasttext[0] = 0;
	11	#else
	12	@@ -155,7 +155,7 @@
	13	printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
	14	lookup_key_name(sdl_lookup, event.key.keysym.sym),
	15	(int) event.key.keysym.scancode,
	16	- (int) event.key.keysym.unicode,
	17	+ (int) event.key.keysym.mod,
	18	buf);
	19	#endif
	20	}

Lines 29-34 Link Here

(-)emulators/mess/pkg-plist (+11 lines)
29	%%DATADIR%%/hash/a5200.xml	29	%%DATADIR%%/hash/a5200.xml
30	%%DATADIR%%/hash/a7800.xml	30	%%DATADIR%%/hash/a7800.xml
31	%%DATADIR%%/hash/a800.xml	31	%%DATADIR%%/hash/a800.xml
		32	%%DATADIR%%/hash/a800_flop.xml
32	%%DATADIR%%/hash/abc1600.xml	33	%%DATADIR%%/hash/abc1600.xml
33	%%DATADIR%%/hash/abc80.xml	34	%%DATADIR%%/hash/abc80.xml
34	%%DATADIR%%/hash/abc800.xml	35	%%DATADIR%%/hash/abc800.xml
Lines 41-46 Link Here
41	%%DATADIR%%/hash/aim65_cart.xml	42	%%DATADIR%%/hash/aim65_cart.xml
42	%%DATADIR%%/hash/alice32.xml	43	%%DATADIR%%/hash/alice32.xml
43	%%DATADIR%%/hash/alice90.xml	44	%%DATADIR%%/hash/alice90.xml
		45	%%DATADIR%%/hash/alphatro_flop.xml
44	%%DATADIR%%/hash/amiga1000_flop.xml	46	%%DATADIR%%/hash/amiga1000_flop.xml
45	%%DATADIR%%/hash/amiga1200_flop.xml	47	%%DATADIR%%/hash/amiga1200_flop.xml
46	%%DATADIR%%/hash/amiga3000_flop.xml	48	%%DATADIR%%/hash/amiga3000_flop.xml
Lines 51-56 Link Here
51	%%DATADIR%%/hash/amigaaga_flop.xml	53	%%DATADIR%%/hash/amigaaga_flop.xml
52	%%DATADIR%%/hash/amigaecs_flop.xml	54	%%DATADIR%%/hash/amigaecs_flop.xml
53	%%DATADIR%%/hash/amigaocs_flop.xml	55	%%DATADIR%%/hash/amigaocs_flop.xml
		56	%%DATADIR%%/hash/ampro.xml
54	%%DATADIR%%/hash/apc.xml	57	%%DATADIR%%/hash/apc.xml
55	%%DATADIR%%/hash/apfm1000.xml	58	%%DATADIR%%/hash/apfm1000.xml
56	%%DATADIR%%/hash/apogee.xml	59	%%DATADIR%%/hash/apogee.xml
Lines 69-74 Link Here
69	%%DATADIR%%/hash/bbcm_cart.xml	72	%%DATADIR%%/hash/bbcm_cart.xml
70	%%DATADIR%%/hash/bbcm_cass.xml	73	%%DATADIR%%/hash/bbcm_cass.xml
71	%%DATADIR%%/hash/bk0010.xml	74	%%DATADIR%%/hash/bk0010.xml
		75	%%DATADIR%%/hash/bml3_flop.xml
72	%%DATADIR%%/hash/bw12.xml	76	%%DATADIR%%/hash/bw12.xml
73	%%DATADIR%%/hash/bw2.xml	77	%%DATADIR%%/hash/bw2.xml
74	%%DATADIR%%/hash/bx256hp_flop.xml	78	%%DATADIR%%/hash/bx256hp_flop.xml
Lines 91-106 Link Here
91	%%DATADIR%%/hash/coleco.xml	95	%%DATADIR%%/hash/coleco.xml
92	%%DATADIR%%/hash/compis.xml	96	%%DATADIR%%/hash/compis.xml
93	%%DATADIR%%/hash/comx35_flop.xml	97	%%DATADIR%%/hash/comx35_flop.xml
		98	%%DATADIR%%/hash/copera.xml
94	%%DATADIR%%/hash/cpc_cass.xml	99	%%DATADIR%%/hash/cpc_cass.xml
95	%%DATADIR%%/hash/cpc_flop.xml	100	%%DATADIR%%/hash/cpc_flop.xml
96	%%DATADIR%%/hash/crvision.xml	101	%%DATADIR%%/hash/crvision.xml
97	%%DATADIR%%/hash/dim68k.xml	102	%%DATADIR%%/hash/dim68k.xml
		103	%%DATADIR%%/hash/dps1.xml
98	%%DATADIR%%/hash/ec1841.xml	104	%%DATADIR%%/hash/ec1841.xml
99	%%DATADIR%%/hash/einstein.xml	105	%%DATADIR%%/hash/einstein.xml
100	%%DATADIR%%/hash/electron_cart.xml	106	%%DATADIR%%/hash/electron_cart.xml
101	%%DATADIR%%/hash/ep64_cart.xml	107	%%DATADIR%%/hash/ep64_cart.xml
102	%%DATADIR%%/hash/ep64_cass.xml	108	%%DATADIR%%/hash/ep64_cass.xml
103	%%DATADIR%%/hash/ep64_flop.xml	109	%%DATADIR%%/hash/ep64_flop.xml
		110	%%DATADIR%%/hash/famicom_cass.xml
104	%%DATADIR%%/hash/famicom_flop.xml	111	%%DATADIR%%/hash/famicom_flop.xml
105	%%DATADIR%%/hash/fm77av.xml	112	%%DATADIR%%/hash/fm77av.xml
106	%%DATADIR%%/hash/fm7_cass.xml	113	%%DATADIR%%/hash/fm7_cass.xml
Lines 248-253 Link Here
248	%%DATADIR%%/hash/snes.xml	255	%%DATADIR%%/hash/snes.xml
249	%%DATADIR%%/hash/snes_bspack.xml	256	%%DATADIR%%/hash/snes_bspack.xml
250	%%DATADIR%%/hash/snes_strom.xml	257	%%DATADIR%%/hash/snes_strom.xml
		258	%%DATADIR%%/hash/snes_vkun.xml
251	%%DATADIR%%/hash/socrates.xml	259	%%DATADIR%%/hash/socrates.xml
252	%%DATADIR%%/hash/softbox.xml	260	%%DATADIR%%/hash/softbox.xml
253	%%DATADIR%%/hash/softwarelist.dtd	261	%%DATADIR%%/hash/softwarelist.dtd
Lines 296-308 Link Here
296	%%DATADIR%%/hash/vic1001_cart.xml	304	%%DATADIR%%/hash/vic1001_cart.xml
297	%%DATADIR%%/hash/vic1001_cass.xml	305	%%DATADIR%%/hash/vic1001_cass.xml
298	%%DATADIR%%/hash/vic1001_flop.xml	306	%%DATADIR%%/hash/vic1001_flop.xml
		307	%%DATADIR%%/hash/victor9k_flop.xml
299	%%DATADIR%%/hash/vidbrain.xml	308	%%DATADIR%%/hash/vidbrain.xml
300	%%DATADIR%%/hash/vii.xml	309	%%DATADIR%%/hash/vii.xml
301	%%DATADIR%%/hash/vip.xml	310	%%DATADIR%%/hash/vip.xml
		311	%%DATADIR%%/hash/visicom.xml
302	%%DATADIR%%/hash/vixen.xml	312	%%DATADIR%%/hash/vixen.xml
303	%%DATADIR%%/hash/vsmile_cart.xml	313	%%DATADIR%%/hash/vsmile_cart.xml
304	%%DATADIR%%/hash/vsmile_cd.xml	314	%%DATADIR%%/hash/vsmile_cd.xml
305	%%DATADIR%%/hash/wangpc.xml	315	%%DATADIR%%/hash/wangpc.xml
		316	%%DATADIR%%/hash/wicat.xml
306	%%DATADIR%%/hash/wmbullet.xml	317	%%DATADIR%%/hash/wmbullet.xml
307	%%DATADIR%%/hash/wscolor.xml	318	%%DATADIR%%/hash/wscolor.xml
308	%%DATADIR%%/hash/wswan.xml	319	%%DATADIR%%/hash/wswan.xml