View | Details | Raw Unified | Return to bug 184246 | Differences between
and this patch

Collapse All | Expand All

(-)emulators/mess/Makefile (-66 / +34 lines)
Lines 2-16 Link Here
2
# $FreeBSD: head/emulators/mess/Makefile 336466 2013-12-14 18:34:01Z mva $
2
# $FreeBSD: head/emulators/mess/Makefile 336466 2013-12-14 18:34:01Z mva $
3
3
4
PORTNAME=	mess
4
PORTNAME=	mess
5
PORTVERSION=	0.150${PATCHSUFFIX}
5
PORTVERSION=	0.151${PATCHSUFFIX}
6
PORTREVISION=	1
7
CATEGORIES=	emulators
6
CATEGORIES=	emulators
8
MASTER_SITES=	SF/mame.mirror/MAME%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=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
10
DISTFILES=	mame${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=	mame
12
DIST_SUBDIR=	mame
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 SDL2 DEBUG DOCS EXAMPLES
27
OPTIONS_RADIO=	BUILTIN_DEBUGGER
28
OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
29
SDL2_DESC=	SDL2 libraries support
24
SDL2_DESC=	SDL2 libraries support
30
BUILTIN_DEBUGGER_DESC=	Builtin debugger support
25
BUILTIN_DEBUGGER_DESC=	Builtin debugger support
31
26
32
NO_WRKSUBDIR=	yes
27
NO_WRKSUBDIR=	yes
33
28
34
USE_ZIP=	yes
29
USES=		gmake pkgconfig shebangfix
35
USES=		gmake pkgconfig shebangfix dos2unix
36
SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
30
SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
37
		src/emu/cpu/m6809/m6809make.py \
31
		src/emu/cpu/m6809/m6809make.py \
38
		src/emu/cpu/mcs96/mcs96make.py \
32
		src/emu/cpu/mcs96/mcs96make.py \
39
		src/emu/cpu/tms57002/tmsmake.py
33
		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
34
USE_XORG=	xext xi xinerama xrender
43
USE_GL=		gl
35
USE_GL=		gl
44
USE_PYTHON_BUILD=yes
36
USE_PYTHON_BUILD=	-2.7
45
MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
37
MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
38
		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
46
		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
39
		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
47
		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
40
		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
48
MAKEFILE=	makefile
41
MAKEFILE=	makefile
Lines 60-65 Link Here
60
53
61
.include <bsd.port.options.mk>
54
.include <bsd.port.options.mk>
62
55
56
.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
57
USE_QT4=	gui moc_build qmake_build
58
.else
59
MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
60
.endif
61
63
.if ${PORT_OPTIONS:MSDL2}
62
.if ${PORT_OPTIONS:MSDL2}
64
USE_SDL=	sdl2 ttf2
63
USE_SDL=	sdl2 ttf2
65
MAKE_ENV+=	SDL_LIBVER="sdl2"
64
MAKE_ENV+=	SDL_LIBVER="sdl2"
Lines 71-113 Link Here
71
MAKE_ENV+=	DEBUG=1
70
MAKE_ENV+=	DEBUG=1
72
.endif
71
.endif
73
72
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>
73
.include <bsd.port.pre.mk>
96
74
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"
75
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
106
BROKEN=		Does not install on ia64, powerpc, or sparc64
76
BROKEN=		Does not install on ia64, powerpc, or sparc64
107
.endif
77
.endif
108
78
109
post-extract:
79
post-extract:
110
	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
80
	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
81
		${EXTRACT_AFTER_ARGS})
111
	@${RM} -f ${WRKDIR}/mame.zip
82
	@${RM} -f ${WRKDIR}/mame.zip
112
# Use post-extract target to get in before dos2unix-isation
83
# Use post-extract target to get in before dos2unix-isation
113
.if defined(UPDATE_PATCHES)
84
.if defined(UPDATE_PATCHES)
Lines 120-132 Link Here
120
91
121
post-patch:
92
post-patch:
122
	@${REINPLACE_CMD} -e \
93
	@${REINPLACE_CMD} -e \
123
		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
94
		'/^BUILD_EXPAT /s|^|#| ; \
124
		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
95
		 /^BUILD_ZLIB /s|^|#| ; \
125
		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
96
		 /^BUILD_FLAC /s|^|#| ; \
126
		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
97
		 /^BUILD_JPEGLIB /s|^|#| ; \
127
		 s| = @gcc| := $$(CC)| ; \
98
		 /^CC /s|^|#| ; \
128
		 s| = @g++| := $$(CXX)| ; \
99
		 /^LD /s|^|#| ; \
129
		 s| = @python| := @${PYTHON_CMD}| ; \
100
		 /^PYTHON /s|^|#| ; \
130
		 s|-O$$(OPTIMIZE)|| ; \
101
		 s|-O$$(OPTIMIZE)|| ; \
131
		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
102
		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
132
		 /LDFLAGS/s|-s|| ; \
103
		 /LDFLAGS/s|-s|| ; \
Lines 136-164 Link Here
136
		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
107
		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
137
	@${REINPLACE_CMD} -e \
108
	@${REINPLACE_CMD} -e \
138
		'/LIBS/s|-lpthread|-pthread| ; \
109
		'/LIBS/s|-lpthread|-pthread| ; \
139
		 /-system/s|/usr/local/|${LOCALBASE}/| ; \
110
		 /-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
111
		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
144
112
145
do-install:
113
do-install:
146
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
114
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
147
		${STAGEDIR}/${PREFIX}/bin)
115
		${STAGEDIR}${PREFIX}/bin)
148
	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
116
	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
149
.for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
117
.for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
150
	testkeys unidasm
118
	testkeys unidasm
151
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
119
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
152
		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
120
		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
153
.endfor
121
.endfor
154
	@${MKDIR} ${STAGEDIR}/${DATADIR}
122
	@${MKDIR} ${STAGEDIR}${DATADIR}
155
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
123
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
156
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
124
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
157
	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
125
	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
158
		${STAGEDIR}/${DATADIR})
126
		${STAGEDIR}${DATADIR})
159
	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
127
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
160
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
128
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
161
	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
129
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
162
	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
130
	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
163
131
164
.include <bsd.port.post.mk>
132
.include <bsd.port.post.mk>
(-)emulators/mess/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
1
SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
2
SIZE (mame/mame0150s.zip) = 35999158
2
SIZE (mame/mame0151s.zip) = 36052471
(-)emulators/mess/files/patch-src__osd__sdl__input.c (-14 lines)
Lines 1-14 Link Here
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
 	}
(-)emulators/mess/files/patch-src__osd__sdl__testkeys.c (-38 lines)
Lines 1-38 Link Here
1
--- src/osd/sdl/testkeys.c.orig	2013-10-30 21:16:48.577335486 +0100
2
+++ src/osd/sdl/testkeys.c	2013-10-30 21:27:06.551455870 +0100
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
 			}
21
@@ -165,7 +165,7 @@
22
 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
23
 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
24
 					(int) event.key.keysym.scancode,
25
-					(int) event.key.keysym.unicode,
26
+					(int) event.key.keysym.mod,
27
 					lasttext);
28
 #else
29
 			memset(buf, 0, 19);
30
@@ -173,7 +173,7 @@
31
 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
32
 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
33
 					(int) event.key.keysym.scancode,
34
-					(int) event.key.keysym.unicode,
35
+					(int) event.key.keysym.mod,
36
 					buf);
37
 #endif
38
 			break;
(-)emulators/mess/pkg-plist (+3 lines)
Lines 13-18 Link Here
13
%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
13
%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
14
%%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
14
%%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
15
%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
15
%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
16
%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
16
%%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
17
%%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
17
%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
18
%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
18
%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
19
%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
Lines 129-135 Link Here
129
%%DATADIR%%/hash/ibm5140.xml
130
%%DATADIR%%/hash/ibm5140.xml
130
%%DATADIR%%/hash/ibm5150.xml
131
%%DATADIR%%/hash/ibm5150.xml
131
%%DATADIR%%/hash/ibm5150_cass.xml
132
%%DATADIR%%/hash/ibm5150_cass.xml
133
%%DATADIR%%/hash/ibm5160_flop.xml
132
%%DATADIR%%/hash/ibm5170.xml
134
%%DATADIR%%/hash/ibm5170.xml
135
%%DATADIR%%/hash/ibm5170_cdrom.xml
133
%%DATADIR%%/hash/ibmpcjr_cart.xml
136
%%DATADIR%%/hash/ibmpcjr_cart.xml
134
%%DATADIR%%/hash/ibmpcjr_flop.xml
137
%%DATADIR%%/hash/ibmpcjr_flop.xml
135
%%DATADIR%%/hash/interact.xml
138
%%DATADIR%%/hash/interact.xml

Return to bug 184246