Attachment 138323 Details for Bug 184246 – emulators_mess.diff

[patch] emulators_mess.diff

emulators_mess.diff (text/x-diff), 9.37 KB, created by tkato432 on 2013-12-14 19:28:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-12-14 19:28:24 UTC

Size: 9.37 KB

patch

obsolete

>diff -urN /usr/ports/emulators/mess/Makefile emulators/mess/Makefile
>--- /usr/ports/emulators/mess/Makefile	2013-12-15 03:47:03.000000000 +0900
>+++ emulators/mess/Makefile	2013-12-15 04:00:00.000000000 +0900
>@@ -2,15 +2,12 @@
> # $FreeBSD: head/emulators/mess/Makefile 336466 2013-12-14 18:34:01Z mva $
> 
> PORTNAME=	mess
>-PORTVERSION=	0.150${PATCHSUFFIX}
>-PORTREVISION=	1
>+PORTVERSION=	0.151${PATCHSUFFIX}
> CATEGORIES=	emulators
>-MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
>-		http://mame.mirrors.zippykid.com/releases/ \
>+MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
> 		http://emumovies.com/aarongiles/releases/ \
> 		http://mamedev.org/updates/:patchsets
>-DISTNAME=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>+DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
> 		${UPDATE_PATCHES:C/$/.zip:patchsets/}
> DIST_SUBDIR=	mame
> 
>@@ -23,26 +20,22 @@
> 		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
>+OPTIONS_DEFINE=	BUILTIN_DEBUGGER SDL2 DEBUG DOCS EXAMPLES
> SDL2_DESC=	SDL2 libraries support
> BUILTIN_DEBUGGER_DESC=	Builtin debugger support
> 
> NO_WRKSUBDIR=	yes
> 
>-USE_ZIP=	yes
>-USES=		gmake pkgconfig shebangfix dos2unix
>+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
>-DOS2UNIX_FILES=	src/osd/sdl/input.c \
>-		src/osd/sdl/testkeys.c
> USE_XORG=	xext xi xinerama xrender
> USE_GL=		gl
>-USE_PYTHON_BUILD=yes
>+USE_PYTHON_BUILD=	-2.7
> MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
>+		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
> 		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
> 		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
> MAKEFILE=	makefile
>@@ -60,6 +53,12 @@
> 
> .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"
>@@ -71,43 +70,15 @@
> 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:
>-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
>+	@(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)
>@@ -120,13 +91,13 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
>-		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
>-		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
>-		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
>-		 s| = @gcc| := $$(CC)| ; \
>-		 s| = @g++| := $$(CXX)| ; \
>-		 s| = @python| := @${PYTHON_CMD}| ; \
>+		'/^BUILD_EXPAT /s|^|#| ; \
>+		 /^BUILD_ZLIB /s|^|#| ; \
>+		 /^BUILD_FLAC /s|^|#| ; \
>+		 /^BUILD_JPEGLIB /s|^|#| ; \
>+		 /^CC /s|^|#| ; \
>+		 /^LD /s|^|#| ; \
>+		 /^PYTHON /s|^|#| ; \
> 		 s|-O$$(OPTIMIZE)|| ; \
> 		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
> 		 /LDFLAGS/s|-s|| ; \
>@@ -136,29 +107,26 @@
> 		'/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)| ; \
>-		 /--cflags-only-other gtk+-2.0/s|=.*|= $$(GTK_CCOMFLAGS)| ; \
>-		 /--libs gtk+-2.0/s|=.*|= $$(GTK_LIBS)| ; \
>+		 /-isystem/s|^|#| ; \
> 		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
> 
> do-install:
> 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
>-		${STAGEDIR}/${PREFIX}/bin)
>-	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${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})
>+		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
> .endfor
>-	@${MKDIR} ${STAGEDIR}/${DATADIR}
>-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
>-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
>+	@${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})
>+		${STAGEDIR}${DATADIR})
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
>--- /usr/ports/emulators/mess/distinfo	2013-11-06 22:06:20.000000000 +0900
>+++ emulators/mess/distinfo	2013-12-15 04:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
>-SIZE (mame/mame0150s.zip) = 35999158
>+SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
>+SIZE (mame/mame0151s.zip) = 36052471
>diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c emulators/mess/files/patch-src__osd__sdl__input.c
>--- /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:20.000000000 +0900
>+++ emulators/mess/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,14 +0,0 @@
>---- 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);
>- 	}
>diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c emulators/mess/files/patch-src__osd__sdl__testkeys.c
>--- /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:20.000000000 +0900
>+++ emulators/mess/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,38 +0,0 @@
>---- src/osd/sdl/testkeys.c.orig	2013-10-30 21:16:48.577335486 +0100
>-+++ src/osd/sdl/testkeys.c	2013-10-30 21:27:06.551455870 +0100
>-@@ -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
>- 			}
>-@@ -165,7 +165,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);
>- #else
>- 			memset(buf, 0, 19);
>-@@ -173,7 +173,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
>- 			break;
>diff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
>--- /usr/ports/emulators/mess/pkg-plist	2013-11-06 22:06:20.000000000 +0900
>+++ emulators/mess/pkg-plist	2013-12-15 04:00:00.000000000 +0900
>@@ -13,6 +13,7 @@
> %%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
>@@ -129,7 +130,9 @@
> %%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

Actions: View | Diff

Attachments on bug 184246: 138318 | 138319 | 138320 | 138321 | 138322 | 138323 | 138324 | 138325 | 138326