Attachment #191587 for bug #226687




# $FreeBSD$

PORTNAME?=	mame
PORTVERSION=	0.195
PORTREVISION?=	5
CATEGORIES=	emulators

MAINTAINER=	ports@FreeBSD.org

SHEBANG_FILES=	src/devices/cpu/m6502/m6502make.py \
		src/devices/cpu/m6809/m6809make.py \
		src/devices/cpu/mcs96/mcs96make.py \
		src/devices/cpu/tms57002/tmsmake.py
		src/build/*.py
USE_XORG=	x11 xext xi xinerama xrender
USE_GL=		gl
USE_SDL=	sdl2 ttf2
USE_QT5=	gui qmake_build widgets
MTARGET?=	mame
MSUBTARGET?=	mame
CFLAGS+=	-I${LOCALBASE}/include
MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
		TARGET="${MTARGET}" SUBTARGET="${MSUBTARGET}" FULLNAME="mame" SDL_NETWORK="pcap"
MAKE_ARGS=	TARGETOS=freebsd VERBOSE=1 TOOLS=1

PLIST_SUB=	EMULATOR=${EMULATOR}

post-patch:
	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h
	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h
	@${MV} ${GENIE}/build/gmake.freebsd ${GENIE}/build/gmake.bsd
	@${REINPLACE_CMD} -e \
		's|^\(CC \)|#\1| ; \
		 s|^\(CXX \)|#\1| ; \
		 s|^\(CXX:\)|#\1| ; \
		 s|^\(LD \)|#\1| ; \
		 s|^\(PYTHON \)|#\1| ; \
		 s| .(ARCH)|| ; \
		 s|FreeBSD|${OPSYS}|g' \
		 ${WRKSRC}/makefile \
		 ${WRKSRC}/src/devices/cpu/m68000/makefile \
		 ${GENIE}/build/gmake.bsd/genie.make
	@${REINPLACE_CMD} -e 's|gcc|cc|; s|g++|c++|' \
		${GENIE}/src/actions/codelite/codelite_project.lua \
		${GENIE}/src/tools/gcc.lua \
		${GENIE}/src/tools/snc.lua \
		${GENIE}/tests/test_gmake_cpp.lua

		${GENIE}/src/host/scripts.c
	# we can't fix two types of python shebangs, so do these manually
	@${REINPLACE_CMD} -i "" -e "s|/usr/bin/env python|${PYTHON_CMD}|" \
		${WRKSRC}/scripts/build/png*.py
	@${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|' \
		${WRKSRC}/scripts/genie.lua
	@${GREP} -rl '"png.h"' ${WRKSRC}/src | ${XARGS} ${REINPLACE_CMD} \

.if ${MSUBTARGET:Mmame}
	(cd ${WRKSRC} && \
		${INSTALL_PROGRAM} chdman jedutil ldresample ldverify \
		romcmp unidasm \
		${STAGEDIR}${PREFIX}/libexec/mame)
.endif
.if ${MSUBTARGET:Mmess}

.endif
	(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
	(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
	(cd ${WRKSRC}/src/osd/sdl && \
		${COPYTREE_SHARE} keymaps ${STAGEDIR}${DATADIR})
	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
	${INSTALL_DATA} ${WRKDIR}/target.ini \
		${STAGEDIR}${EXAMPLESDIR}/${MSUBTARGET}.ini

Lines 1-2 Link Here

(-)b/emulators/mame/distinfo (-2 / +3 lines)
1	SHA256 (mamedev-mame-0.166-mame0166_GH0.tar.gz) = 702a2019a05afd7f050db6b38c3aaee4cc46ec2214cecaed3420889a685637f4	1	TIMESTAMP = 1520789785
2	SIZE (mamedev-mame-0.166-mame0166_GH0.tar.gz) = 87951133	2	SHA256 (mamedev-mame-0.195-mame0195_GH0.tar.gz) = b18d0e23ecf6b218c43a6770213c850b3c605ead9d29301de34101ed14c28a57
		3	SIZE (mamedev-mame-0.195-mame0195_GH0.tar.gz) = 126375780




Catch up with https://hg.libsdl.org/SDL/rev/d11daa346140

--- 3rdparty/bgfx/include/bgfxplatform.h.orig	2015-09-30 06:29:01 UTC
+++ 3rdparty/bgfx/include/bgfxplatform.h
@@ -186,7 +186,7 @@ namespace bgfx
 
 #endif // BX_PLATFORM_
 
-#if defined(_SDL_syswm_h)
+#if defined(_SDL_syswm_h) || defined(SDL_syswm_h_)
 // If SDL_syswm.h is included before bgfxplatform.h we can enable SDL window
 // interop convenience code.
 




--- 3rdparty/bx/include/bx/float4_t.h.orig	2015-09-30 06:29:01 UTC
+++ 3rdparty/bx/include/bx/float4_t.h
@@ -18,7 +18,8 @@
 #elif BX_COMPILER_CLANG \
 		&& !BX_PLATFORM_EMSCRIPTEN \
 		&& !BX_PLATFORM_IOS \
-		&& BX_CLANG_HAS_EXTENSION(attribute_ext_vector_type)
+		&& BX_CLANG_HAS_EXTENSION(attribute_ext_vector_type) \
+		&& !BX_PLATFORM_FREEBSD
 #	include "float4_langext.h"
 #else
 #	ifndef BX_FLOAT4_WARN_REFERENCE_IMPL




--- 3rdparty/bx/include/bx/platform.h.orig	2018-03-12 03:09:05.625070000 +0900
+++ 3rdparty/bx/include/bx/platform.h	2018-03-12 03:09:47.018847000 +0900
@@ -35,6 +35,7 @@
 #define BX_CRT_MINGW  0
 #define BX_CRT_MSVC   0
 #define BX_CRT_NEWLIB 0
+#define BX_CRT_BSD    0
 
 #ifndef BX_CRT_MUSL
 #	define BX_CRT_MUSL 0
@@ -236,6 +237,9 @@
 #	elif defined(__apple_build_version__) || defined(__ORBIS__) || defined(__EMSCRIPTEN__) || defined(__llvm__)
 #		undef  BX_CRT_LIBCXX
 #		define BX_CRT_LIBCXX 1
+#	elif BX_PLATFORM_BSD
+#		undef  BX_CRT_BSD
+#		define BX_CRT_BSD 1
 #	endif //
 
 #	if !BX_CRT_BIONIC \
@@ -244,7 +248,8 @@
 	&& !BX_CRT_MINGW  \
 	&& !BX_CRT_MSVC   \
 	&& !BX_CRT_MUSL   \
-	&& !BX_CRT_NEWLIB
+	&& !BX_CRT_NEWLIB \
+	&& !BX_CRT_BSD
 #		undef  BX_CRT_NONE
 #		define BX_CRT_NONE 1
 #	endif // BX_CRT_*
@@ -379,6 +384,8 @@
 #	define BX_CRT_NAME "Newlib"
 #elif BX_CRT_MUSL
 #	define BX_CRT_NAME "musl libc"
+#elif BX_CRT_BSD
+#	define BX_CRT_NAME "BSD"
 #elif BX_CRT_NONE
 #	define BX_CRT_NAME "None"
 #else




--- 3rdparty/bx/include/bx/thread.h.orig	2015-09-30 06:29:01 UTC
+++ 3rdparty/bx/include/bx/thread.h
@@ -14,6 +14,10 @@ using namespace Windows::Foundation;
 using namespace Windows::System::Threading;
 #endif
 
+#if BX_PLATFORM_FREEBSD
+#	include <pthread_np.h>
+#endif
+
 #include "sem.h"
 
 #if BX_CONFIG_SUPPORTS_THREADING
@@ -149,8 +153,10 @@ namespace bx
 		{
 #if BX_PLATFORM_OSX || BX_PLATFORM_IOS
 			pthread_setname_np(_name);
-#elif BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
+#elif BX_PLATFORM_LINUX
 			pthread_setname_np(m_handle, _name);
+#elif BX_PLATFORM_FREEBSD
+			pthread_set_name_np(m_handle, _name);
 #elif BX_PLATFORM_WINDOWS && BX_COMPILER_MSVC
 #	pragma pack(push, 8)
 			struct ThreadName

Added Link Here

(-)b/emulators/mame/files/patch-3rdparty_bx_src_mutex.cpp (+10 lines)
1	--- 3rdparty/bx/src/mutex.cpp.orig 2018-02-28 00:59:06.000000000 +0900
2	+++ 3rdparty/bx/src/mutex.cpp 2018-03-12 03:09:57.943353000 +0900
3	@@ -13,6 +13,7 @@
4	\|\| BX_PLATFORM_IOS \
5	\|\| BX_PLATFORM_OSX \
6	\|\| BX_PLATFORM_PS4 \
7	+ \|\| BX_PLATFORM_BSD \
8	\|\| BX_PLATFORM_RPI
9	# include <pthread.h>
10	#elif BX_PLATFORM_WINDOWS \

Added Link Here

(-)b/emulators/mame/files/patch-3rdparty_bx_src_thread.cpp (+10 lines)
1	--- 3rdparty/bx/src/thread.cpp.orig 2018-02-28 00:59:06.000000000 +0900
2	+++ 3rdparty/bx/src/thread.cpp 2018-03-12 03:10:07.329595000 +0900
3	@@ -11,6 +11,7 @@
4	\|\| BX_PLATFORM_IOS \
5	\|\| BX_PLATFORM_OSX \
6	\|\| BX_PLATFORM_PS4 \
7	+ \|\| BX_PLATFORM_BSD \
8	\|\| BX_PLATFORM_RPI
9	# include <pthread.h>
10	# if defined(__FreeBSD__)

Removed Link Here

(-)a/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.h (-11 lines)
1	--- 3rdparty/lzma/C/CpuArch.h.orig 2015-05-24 15:52:12 UTC
2	+++ 3rdparty/lzma/C/CpuArch.h
3	@@ -16,7 +16,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITT
4	If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
5	*/
6
7	-#if defined(_M_X64) \|\| defined(_M_AMD64) \|\| defined(__x86_64__)
8	+#if defined(_M_X64) \|\| defined(_M_AMD64) \|\| defined(__x86_64__) \|\| defined(__amd64__)
9	#define MY_CPU_AMD64
10	#endif
11




--- makefile.orig	2018-02-28 00:59:06.000000000 +0900
+++ makefile	2018-03-12 08:09:17.531106000 +0900
@@ -183,19 +183,19 @@
 endif
 ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD)
 OS := freebsd
-GENIEOS := freebsd
+GENIEOS := bsd
 endif
 ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
 OS := freebsd
-GENIEOS := freebsd
+GENIEOS := bsd
 endif
 ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
 OS := netbsd
-GENIEOS := freebsd
+GENIEOS := bsd
 endif
 ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
 OS := openbsd
-GENIEOS := freebsd
+GENIEOS := bsd
 endif
 ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
 OS := macosx
@@ -1377,6 +1377,23 @@
 	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd config=$(CONFIG)32
 
 #-------------------------------------------------
+# gmake-freebsd-clang
+#-------------------------------------------------
+
+$(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
+	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
+
+.PHONY: freebsd_x64_clang
+freebsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
+	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile
+	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64
+
+.PHONY: freebsd_x86_clang
+freebsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
+	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32 precompile
+	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32
+
+#-------------------------------------------------
 # gmake-netbsd
 #-------------------------------------------------
 




--- scripts/toolchain.lua.orig	2018-03-12 08:39:00.497654000 +0900
+++ scripts/toolchain.lua	2018-03-12 08:41:52.263428000 +0900
@@ -23,6 +23,7 @@
 		{ "android-x64",   "Android - x64"          },
 		{ "asmjs",         "Emscripten/asm.js"      },
 		{ "freebsd",       "FreeBSD"                },
+		{ "freebsd-clang", "FreeBSD (Clang)"        },
 		{ "linux-gcc",     "Linux (GCC compiler)"   },
 		{ "linux-clang",   "Linux (Clang compiler)" },
 		{ "ios-arm",       "iOS - ARM"              },
@@ -168,6 +169,10 @@
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd")
 		end
 
+		if "freebsd-clang" == _OPTIONS["gcc"] then
+			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd-clang")
+		end
+
 		if "netbsd" == _OPTIONS["gcc"] then
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd")
 		end




--- src/osd/eigccx86.h.orig	2018-03-12 02:58:55.205941000 +0900
+++ src/osd/eigccx86.h	2018-03-12 03:02:13.350927000 +0900
@@ -31,7 +31,7 @@
     multiply and return the full 64 bit result
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define mul_32x32 _mul_32x32
 inline int64_t ATTR_CONST ATTR_FORCE_INLINE
 _mul_32x32(int32_t a, int32_t b)
@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b)
     result
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define mulu_32x32 _mulu_32x32
 inline uint64_t ATTR_CONST ATTR_FORCE_INLINE
 _mulu_32x32(uint32_t a, uint32_t b)
@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b)
     result to 32 bits
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define mul_32x32_shift _mul_32x32_shift
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, u
     result to 32 bits
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define mulu_32x32_shift _mulu_32x32_shift
 inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
 _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b
     divide and return the 32 bit quotient
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define div_64x32 _div_64x32
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _div_64x32(int64_t a, int32_t b)
@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b)
     divide and return the 32 bit quotient
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define divu_64x32 _divu_64x32
 inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
 _divu_64x32(uint64_t a, uint32_t b)
@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE
 _div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder)
 {
 	int32_t quotient;
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define div_64x32_rem _div_64x32_rem
 INLINE INT32 ATTR_FORCE_INLINE
 _div_64x32_rem(INT64 dividend, INT32 divisor, INT32 *remainder)
@@ -286,7 +286,7 @@ _div_64x32_rem(INT64 dividend, INT32 div
     and 32 bit remainder
 -------------------------------------------------*/
 
 	// Throws arithmetic exception if result doesn't fit in 32 bits
 	__asm__ (
@@ -287,7 +287,7 @@ inline uint32_t ATTR_FORCE_INLINE
 _divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder)
 {
 	uint32_t quotient;
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 
 	// Throws arithmetic exception if result doesn't fit in 32 bits
 	__asm__ (
@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint3
     division, and returning the 32 bit quotient
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define div_32x32_shift _div_32x32_shift
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, u
     division, and returning the 32 bit quotient
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define divu_32x32_shift _divu_32x32_shift
 inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
 _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b
     divide and return the 32 bit remainder
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define mod_64x32 _mod_64x32
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _mod_64x32(int64_t a, int32_t b)
@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b)
     divide and return the 32 bit remainder
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define modu_64x32 _modu_64x32
 inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
 _modu_64x32(uint64_t a, uint32_t b)
@@ -563,7 +563,7 @@ _compare_exchange32(INT32 volatile *ptr,
     return the previous value at 'ptr'.
 -------------------------------------------------*/
 
-#ifdef __x86_64__
+#if defined(__amd64__) || defined(__x86_64__)
 #define compare_exchange64 _compare_exchange64
 INLINE INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
 _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
@@ -693,7 +693,7 @@ _atomic_decrement32(INT32 volatile *ptr)
 
 #define get_profile_ticks _get_profile_ticks
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 INLINE UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
 {
 	UINT64 result;

Lines 1-8 Link Here

(-)b/emulators/mame/files/patch-src__osd__eminline.h (-4 / +4 lines)
1	--- src/osd/eminline.h.orig 2015-05-24 15:52:19 UTC	1	--- src/osd/eminline.h.orig 2018-03-12 03:02:46.561400000 +0900
2	+++ src/osd/eminline.h	2	+++ src/osd/eminline.h 2018-03-12 03:03:03.988448000 +0900
3	@@ -88,7 +88,7 @@ _osd_exchange64(INT64 volatile *ptr, INT	3	@@ -21,7 +21,7 @@
4		4
5	#endif	5	#if defined(__GNUC__)
6		6
7	-#if defined(__i386__) \|\| defined(__x86_64__)	7	-#if defined(__i386__) \|\| defined(__x86_64__)
8	+#if defined(__i386__) \|\| defined(__x86_64__) \|\| defined(__amd64__)	8	+#if defined(__i386__) \|\| defined(__x86_64__) \|\| defined(__amd64__)

Removed Link Here

(-)a/emulators/mame/files/patch-src_emu_webengine.c (-11 lines)
1	--- src/emu/webengine.c.orig 2015-09-30 06:29:01 UTC
2	+++ src/emu/webengine.c
3	@@ -330,7 +330,7 @@ int web_engine::begin_request_handler(st
4	// That upload_data contains more than we need. It also has the headers.
5	// We'll need to strip it down to just what we want.
6
7	- if ((&data_length > 0) && (sizeof(file_name) > 0))
8	+ if ((data_length > 0) && (sizeof(file_name) > 0))
9	{
10	// MSVC doesn't yet support variable-length arrays, so chop the string the old-fashioned way
11	upload_data[data_length] = '\0';




--- src/lib/netlist/plib/pparser.c.orig	2015-09-30 06:29:01 UTC
+++ src/lib/netlist/plib/pparser.c
@@ -28,22 +28,22 @@ pstring ptokenizer::currentline_str()
 
 void ptokenizer::skipeol()
 {
-	pstring::code_t c = getc();
+	pstring::code_t c = mame_getc();
 	while (c)
 	{
 		if (c == 10)
 		{
-			c = getc();
+			c = mame_getc();
 			if (c != 13)
-				ungetc();
+				mame_ungetc();
 			return;
 		}
-		c = getc();
+		c = mame_getc();
 	}
 }
 
 
-pstring::code_t ptokenizer::getc()
+pstring::code_t ptokenizer::mame_getc()
 {
 	if (m_px >= m_cur_line.len())
 	{
@@ -58,7 +58,7 @@ pstring::code_t ptokenizer::getc()
 	return m_cur_line.code_at(m_px++);
 }
 
-void ptokenizer::ungetc()
+void ptokenizer::mame_ungetc()
 {
 	m_px--;
 }
@@ -166,10 +166,10 @@ ptokenizer::token_t ptokenizer::get_toke
 ptokenizer::token_t ptokenizer::get_token_internal()
 {
 	/* skip ws */
-	pstring::code_t c = getc();
+	pstring::code_t c = mame_getc();
 	while (m_whitespace.find(c)>=0)
 	{
-		c = getc();
+		c = mame_getc();
 		if (eof())
 		{
 			return token_t(ENDOFFILE);
@@ -189,9 +189,9 @@ ptokenizer::token_t ptokenizer::get_toke
 			else if (m_number_chars.find(c)<0)
 				break;
 			tokstr += c;
-			c = getc();
+			c = mame_getc();
 		}
-		ungetc();
+		mame_ungetc();
 		return token_t(ret, tokstr);
 	}
 	else if (m_identifier_chars.find(c)>=0)
@@ -200,9 +200,9 @@ ptokenizer::token_t ptokenizer::get_toke
 		pstring tokstr = "";
 		while (m_identifier_chars.find(c)>=0) {
 			tokstr += c;
-			c = getc();
+			c = mame_getc();
 		}
-		ungetc();
+		mame_ungetc();
 		token_id_t id = token_id_t(m_tokens.indexof(tokstr));
 		if (id.id() >= 0)
 			return token_t(id, tokstr);
@@ -214,11 +214,11 @@ ptokenizer::token_t ptokenizer::get_toke
 	else if (c == m_string)
 	{
 		pstring tokstr = "";
-		c = getc();
+		c = mame_getc();
 		while (c != m_string)
 		{
 			tokstr += c;
-			c = getc();
+			c = mame_getc();
 		}
 		return token_t(STRING, tokstr);
 	}
@@ -235,9 +235,9 @@ ptokenizer::token_t ptokenizer::get_toke
 				if (id.id() >= 0)
 					return token_t(id, tokstr);
 			}
-			c = getc();
+			c = mame_getc();
 		}
-		ungetc();
+		mame_ungetc();
 		token_id_t id = token_id_t(m_tokens.indexof(tokstr));
 		if (id.id() >= 0)
 			return token_t(id, tokstr);




--- src/lib/netlist/plib/pparser.cpp.orig	2018-03-12 03:03:56.509169000 +0900
+++ src/lib/netlist/plib/pparser.cpp	2018-03-12 03:06:00.431002000 +0900
@@ -34,22 +34,22 @@ pstring ptokenizer::currentline_str()
 
 void ptokenizer::skipeol()
 {
-	pstring::code_t c = getc();
+	pstring::code_t c = mame_getc();
 	while (c)
 	{
 		if (c == 10)
 		{
-			c = getc();
+			c = mame_getc();
 			if (c != 13)
-				ungetc(c);
+				mame_ungetc(c);
 			return;
 		}
-		c = getc();
+		c = mame_getc();
 	}
 }
 
 
-pstring::code_t ptokenizer::getc()
+pstring::code_t ptokenizer::mame_getc()
 {
 	if (m_unget != 0)
 	{
@@ -70,7 +70,7 @@ pstring::code_t ptokenizer::getc()
 	return c;
 }
 
-void ptokenizer::ungetc(pstring::code_t c)
+void ptokenizer::mame_ungetc(pstring::code_t c)
 {
 	m_unget = c;
 }
@@ -182,10 +182,10 @@ ptokenizer::token_t ptokenizer::get_toke
 ptokenizer::token_t ptokenizer::get_token_internal()
 {
 	/* skip ws */
-	pstring::code_t c = getc();
+	pstring::code_t c = mame_getc();
 	while (m_whitespace.find(c) != pstring::npos)
 	{
-		c = getc();
+		c = mame_getc();
 		if (eof())
 		{
 			return token_t(ENDOFFILE);
@@ -205,9 +205,9 @@ ptokenizer::token_t ptokenizer::get_toke
 			else if (m_number_chars.find(c) == pstring::npos)
 				break;
 			tokstr += c;
-			c = getc();
+			c = mame_getc();
 		}
-		ungetc(c);
+		mame_ungetc(c);
 		return token_t(ret, tokstr);
 	}
 	else if (m_identifier_chars.find(c) != pstring::npos)
@@ -217,9 +217,9 @@ ptokenizer::token_t ptokenizer::get_toke
 		while (m_identifier_chars.find(c) != pstring::npos)
 		{
 			tokstr += c;
-			c = getc();
+			c = mame_getc();
 		}
-		ungetc(c);
+		mame_ungetc(c);
 		auto id = m_tokens.find(tokstr);
 		if (id != m_tokens.end())
 			return token_t(id->second, tokstr);
@@ -229,11 +229,11 @@ ptokenizer::token_t ptokenizer::get_toke
 	else if (c == m_string)
 	{
 		pstring tokstr = "";
-		c = getc();
+		c = mame_getc();
 		while (c != m_string)
 		{
 			tokstr += c;
-			c = getc();
+			c = mame_getc();
 		}
 		return token_t(STRING, tokstr);
 	}
@@ -251,9 +251,9 @@ ptokenizer::token_t ptokenizer::get_toke
 				if (id != m_tokens.end())
 					return token_t(id->second, tokstr);
 			}
-			c = getc();
+			c = mame_getc();
 		}
-		ungetc(c);
+		mame_ungetc(c);
 		auto id = m_tokens.find(tokstr);
 		if (id != m_tokens.end())
 			return token_t(id->second, tokstr);




--- src/lib/netlist/plib/pparser.h.orig	2018-03-12 03:06:23.053773000 +0900
+++ src/lib/netlist/plib/pparser.h	2018-03-12 03:06:40.281886000 +0900
@@ -118,8 +118,8 @@ protected:
 private:
 	void skipeol();
 
-	pstring::code_t getc();
-	void ungetc(pstring::code_t c);
+	pstring::code_t mame_getc();
+	void mame_ungetc(pstring::code_t c);
 
 	bool eof() { return m_strm.eof(); }
 

Added Link Here

(-)b/emulators/mame/files/patch-src_osd_modules_file_posixptty.cpp (+11 lines)
1	--- src/osd/modules/file/posixptty.cpp.orig 2018-03-12 11:11:09.336893000 +0900
2	+++ src/osd/modules/file/posixptty.cpp 2018-03-12 11:11:23.544568000 +0900
3	@@ -19,7 +19,7 @@
4	#include <unistd.h>
5	#include <stdlib.h>
6
7	-#if defined(__FreeBSD_kernel__) \|\| defined(__DragonFly__)
8	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__)
9	#include <termios.h>
10	#include <libutil.h>
11	#elif defined(__NetBSD__) \|\| defined(__OpenBSD__) \|\| defined(__APPLE__) \|\| defined(__ANDROID__)

Lines 1-6 Link Here

(-)b/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h (-3 / +3 lines)
1	--- src/osd/sdl/sdlprefix.h.orig 2015-04-29 06:18:54 UTC	1	--- src/osd/sdl/sdlprefix.h.orig 2018-03-12 03:07:05.292313000 +0900
2	+++ src/osd/sdl/sdlprefix.h	2	+++ src/osd/sdl/sdlprefix.h 2018-03-12 03:07:30.038877000 +0900
3	@@ -50,6 +50,7 @@	3	@@ -48,6 +48,7 @@
4	#define NO_AFFINITY_NP 1	4	#define NO_AFFINITY_NP 1
5	#elif defined(__DragonFly__)	5	#elif defined(__DragonFly__)
6	#define SDLMAME_DRAGONFLY 1	6	#define SDLMAME_DRAGONFLY 1

Lines 5-12 An example configuration file has been installed in Link Here

(-)b/emulators/mame/files/pkg-message.in (-4 lines)
5	Should you create a "~/.%%MTARGET%%" directory and place it here or	5	Should you create a "~/.%%MTARGET%%" directory and place it here or
6	launch "%%MTARGET%% -createconfig" and place the %%MTARGET%%.ini created instead.	6	launch "%%MTARGET%% -createconfig" and place the %%MTARGET%%.ini created instead.
7		7
8	If you have a non-qwerty keyboard, you should put in your %%MTARGET%%.ini :
9	keymap 1
10	keymap_file %%DATADIR%%/keymaps/km-XX.txt
11
12	==============================================================================	8	==============================================================================




libexec/mame/ldresample
libexec/mame/ldverify
libexec/mame/romcmp
libexec/mame/testkeys
libexec/mame/unidasm
%%DATADIR%%/artwork/LICENSE
%%DATADIR%%/artwork/README.md
%%DATADIR%%/artwork/aperture-grille.png
%%DATADIR%%/artwork/aperture.png
%%DATADIR%%/artwork/aperture1x2rb.png
%%DATADIR%%/artwork/aperture1x3rb.png
%%DATADIR%%/artwork/aperture2x4bg.png
%%DATADIR%%/artwork/aperture2x4rb.png
%%DATADIR%%/artwork/aperture4x6.png
%%DATADIR%%/artwork/bgfx/border_blur/default.lay
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_3_6_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_2x1_bgr.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_4x1_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x2_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_5x4_bgr.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_3_7x6_rgb.png
%%DATADIR%%/artwork/bgfx/chains/hq2x.png
%%DATADIR%%/artwork/bgfx/chains/hq3x.png
%%DATADIR%%/artwork/bgfx/chains/hq4x.png
%%DATADIR%%/artwork/dir.txt
%%DATADIR%%/artwork/monochrome-chessboard.png
%%DATADIR%%/artwork/monochrome-matrix.png
%%DATADIR%%/artwork/scanlines.png
%%DATADIR%%/artwork/shadow-mask.png
%%DATADIR%%/artwork/slot-mask-aligned.png
%%DATADIR%%/artwork/slot-mask.png
%%DATADIR%%/artwork/white.png
%%DATADIR%%/hash/32x.xml
%%DATADIR%%/hash/3do_m2.xml
%%DATADIR%%/hash/LICENSE
%%DATADIR%%/hash/README.md
%%DATADIR%%/hash/a2600.xml
%%DATADIR%%/hash/a2600_cass.xml
%%DATADIR%%/hash/a5200.hsi

%%DATADIR%%/hash/aleste.xml
%%DATADIR%%/hash/alice32.xml
%%DATADIR%%/hash/alice90.xml
%%DATADIR%%/hash/alphatro_cart.xml
%%DATADIR%%/hash/alphatro_flop.xml
%%DATADIR%%/hash/altos5.xml
%%DATADIR%%/hash/amiga_a1000.xml

%%DATADIR%%/hash/apollo_ctape.xml
%%DATADIR%%/hash/apple1.xml
%%DATADIR%%/hash/apple2.xml
%%DATADIR%%/hash/apple2_cass.xml
%%DATADIR%%/hash/apple2gs.xml
%%DATADIR%%/hash/apple3.xml
%%DATADIR%%/hash/apricot_flop.xml
%%DATADIR%%/hash/aquarius.xml
%%DATADIR%%/hash/arcadia.xml
%%DATADIR%%/hash/archimedes.xml
%%DATADIR%%/hash/astrocde.xml
%%DATADIR%%/hash/atom_cass.xml
%%DATADIR%%/hash/atom_flop.xml
%%DATADIR%%/hash/atom_rom.xml
%%DATADIR%%/hash/attache.xml
%%DATADIR%%/hash/b2m.xml
%%DATADIR%%/hash/bbc_flop_32016.xml
%%DATADIR%%/hash/bbc_flop_6502.xml
%%DATADIR%%/hash/bbc_flop_65c102.xml
%%DATADIR%%/hash/bbc_flop_68000.xml
%%DATADIR%%/hash/bbc_flop_80186.xml
%%DATADIR%%/hash/bbc_flop_arm.xml
%%DATADIR%%/hash/bbc_flop_torch.xml
%%DATADIR%%/hash/bbc_flop_z80.xml
%%DATADIR%%/hash/bbca_cass.xml
%%DATADIR%%/hash/bbcb_cass.xml
%%DATADIR%%/hash/bbcb_cass_de.xml
%%DATADIR%%/hash/bbcb_flop.xml
%%DATADIR%%/hash/bbcb_flop_orig.xml
%%DATADIR%%/hash/bbcb_flop_us.xml
%%DATADIR%%/hash/bbcbc.xml
%%DATADIR%%/hash/bbcm_cart.xml
%%DATADIR%%/hash/bbcm_cass.xml
%%DATADIR%%/hash/bbcm_flop.xml
%%DATADIR%%/hash/bbcmc_flop.xml
%%DATADIR%%/hash/bk0010.xml
%%DATADIR%%/hash/bml3_flop.xml
%%DATADIR%%/hash/bw12.xml
%%DATADIR%%/hash/bw14.xml
%%DATADIR%%/hash/bw2.xml
%%DATADIR%%/hash/bx256hp_flop.xml
%%DATADIR%%/hash/c128_cart.xml

%%DATADIR%%/hash/cd32.xml
%%DATADIR%%/hash/cdi.xml
%%DATADIR%%/hash/cdtv.xml
%%DATADIR%%/hash/cgenie_cart.xml
%%DATADIR%%/hash/cgenie_cass.xml
%%DATADIR%%/hash/cgenie_flop_rom.xml
%%DATADIR%%/hash/channelf.xml
%%DATADIR%%/hash/chessmstdm.xml
%%DATADIR%%/hash/coco_cart.xml
%%DATADIR%%/hash/coco_flop.xml
%%DATADIR%%/hash/coleco.xml

%%DATADIR%%/hash/cx3000tc.xml
%%DATADIR%%/hash/dai_cass.xml
%%DATADIR%%/hash/database.xml
%%DATADIR%%/hash/dc.xml
%%DATADIR%%/hash/dgnalpha_flop.xml
%%DATADIR%%/hash/dgnbeta_flop.xml
%%DATADIR%%/hash/dim68k.xml
%%DATADIR%%/hash/dmv.xml
%%DATADIR%%/hash/dps1.xml
%%DATADIR%%/hash/dragon_cart.xml
%%DATADIR%%/hash/dragon_cass.xml
%%DATADIR%%/hash/dragon_flex.xml
%%DATADIR%%/hash/dragon_flop.xml
%%DATADIR%%/hash/dragon_os9.xml
%%DATADIR%%/hash/e01_flop.xml
%%DATADIR%%/hash/ec1841.xml
%%DATADIR%%/hash/einstein.xml
%%DATADIR%%/hash/electron_cart.xml
%%DATADIR%%/hash/electron_cass.xml
%%DATADIR%%/hash/electron_flop.xml
%%DATADIR%%/hash/electron_rom.xml
%%DATADIR%%/hash/ep64_cart.xml
%%DATADIR%%/hash/ep64_cass.xml
%%DATADIR%%/hash/ep64_flop.xml
%%DATADIR%%/hash/epson_cpm.xml
%%DATADIR%%/hash/ews286_flop.xml
%%DATADIR%%/hash/exl100.xml
%%DATADIR%%/hash/famicom_cass.xml
%%DATADIR%%/hash/famicom_flop.xml
%%DATADIR%%/hash/fidel_scc.xml
%%DATADIR%%/hash/fm77av.xml
%%DATADIR%%/hash/fm7_cass.xml
%%DATADIR%%/hash/fm7_disk.xml
%%DATADIR%%/hash/fmtowns_cd.xml
%%DATADIR%%/hash/fmtowns_flop.xml
%%DATADIR%%/hash/g7400.xml
%%DATADIR%%/hash/galaxy.xml
%%DATADIR%%/hash/gamate.xml

%%DATADIR%%/hash/gameking3.xml
%%DATADIR%%/hash/gamepock.xml
%%DATADIR%%/hash/gba.xml
%%DATADIR%%/hash/gba_ereader.xml
%%DATADIR%%/hash/gbcolor.xml
%%DATADIR%%/hash/genius.xml
%%DATADIR%%/hash/gimix.xml

%%DATADIR%%/hash/gp32.xml
%%DATADIR%%/hash/guab.xml
%%DATADIR%%/hash/gx4000.xml
%%DATADIR%%/hash/h21.xml
%%DATADIR%%/hash/horizon.xml
%%DATADIR%%/hash/hp85_rom.xml
%%DATADIR%%/hash/hp9835a_rom.xml
%%DATADIR%%/hash/hp9845a_rom.xml
%%DATADIR%%/hash/hp9845b_rom.xml
%%DATADIR%%/hash/hp_ipc.xml
%%DATADIR%%/hash/ht68k.xml
%%DATADIR%%/hash/hx20_rom.xml
%%DATADIR%%/hash/hyperscan.xml
%%DATADIR%%/hash/i7000_card.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/ibm6580.xml
%%DATADIR%%/hash/ibmpcjr_cart.xml
%%DATADIR%%/hash/ibmpcjr_flop.xml
%%DATADIR%%/hash/interact.xml

%%DATADIR%%/hash/jaguar.xml
%%DATADIR%%/hash/juicebox.xml
%%DATADIR%%/hash/jupace_cass.xml
%%DATADIR%%/hash/k28m2.xml
%%DATADIR%%/hash/kayproii.xml
%%DATADIR%%/hash/kc_cart.xml
%%DATADIR%%/hash/kc_cass.xml
%%DATADIR%%/hash/kc_flop.xml
%%DATADIR%%/hash/kim1_cass.xml
%%DATADIR%%/hash/korvet_flop.xml
%%DATADIR%%/hash/lantutor.xml
%%DATADIR%%/hash/laser2001_cart.xml
%%DATADIR%%/hash/leapster.xml
%%DATADIR%%/hash/lisa.xml
%%DATADIR%%/hash/lisa2.xml

%%DATADIR%%/hash/m20.xml
%%DATADIR%%/hash/m5_cart.xml
%%DATADIR%%/hash/m5_cass.xml
%%DATADIR%%/hash/m5_flop.xml
%%DATADIR%%/hash/mac_flop.xml
%%DATADIR%%/hash/mac_hdd.xml
%%DATADIR%%/hash/mbc200.xml

%%DATADIR%%/hash/mc10.xml
%%DATADIR%%/hash/mc1000_cass.xml
%%DATADIR%%/hash/mc1502_flop.xml
%%DATADIR%%/hash/md2_flop.xml
%%DATADIR%%/hash/megacd.xml
%%DATADIR%%/hash/megacdj.xml
%%DATADIR%%/hash/megadriv.xml

%%DATADIR%%/hash/misterx.xml
%%DATADIR%%/hash/mm1_flop.xml
%%DATADIR%%/hash/mo5_cart.xml
%%DATADIR%%/hash/mo5_cass.xml
%%DATADIR%%/hash/mo5_flop.xml
%%DATADIR%%/hash/mo5_qd.xml
%%DATADIR%%/hash/mo6_cass.xml
%%DATADIR%%/hash/mo6_flop.xml
%%DATADIR%%/hash/mpu1000.xml
%%DATADIR%%/hash/mpz80.xml
%%DATADIR%%/hash/msx.hsi

%%DATADIR%%/hash/msx2_flop.xml
%%DATADIR%%/hash/msx2p_flop.xml
%%DATADIR%%/hash/msxr_flop.xml
%%DATADIR%%/hash/mtx_cart.xml
%%DATADIR%%/hash/mtx_cass.xml
%%DATADIR%%/hash/mtx_rom.xml
%%DATADIR%%/hash/myvision.xml
%%DATADIR%%/hash/mz2000_cass.xml
%%DATADIR%%/hash/mz2000_flop.xml

%%DATADIR%%/hash/ngp.xml
%%DATADIR%%/hash/ngpc.xml
%%DATADIR%%/hash/nimbus.xml
%%DATADIR%%/hash/octopus.xml
%%DATADIR%%/hash/odyssey2.xml
%%DATADIR%%/hash/ondra.xml
%%DATADIR%%/hash/orao.xml

%%DATADIR%%/hash/partner_flop.xml
%%DATADIR%%/hash/pasogo.xml
%%DATADIR%%/hash/pb2000c.xml
%%DATADIR%%/hash/pc1000.xml
%%DATADIR%%/hash/pc1512_flop.xml
%%DATADIR%%/hash/pc1512_hdd.xml
%%DATADIR%%/hash/pc1640_flop.xml
%%DATADIR%%/hash/pc1640_hdd.xml
%%DATADIR%%/hash/pc8201.xml
%%DATADIR%%/hash/pc8801_cass.xml
%%DATADIR%%/hash/pc8801_flop.xml
%%DATADIR%%/hash/pc88va.xml
%%DATADIR%%/hash/pc98.xml
%%DATADIR%%/hash/pc98_cd.xml
%%DATADIR%%/hash/pce.xml
%%DATADIR%%/hash/pce_tourvision.xml
%%DATADIR%%/hash/pcecd.xml
%%DATADIR%%/hash/pcfx.xml
%%DATADIR%%/hash/pcw.xml
%%DATADIR%%/hash/pcw16.xml
%%DATADIR%%/hash/pecom_cass.xml

%%DATADIR%%/hash/pet_cass.xml
%%DATADIR%%/hash/pet_flop.xml
%%DATADIR%%/hash/pet_hdd.xml
%%DATADIR%%/hash/pet_quik.xml
%%DATADIR%%/hash/pet_rom.xml
%%DATADIR%%/hash/phc25_cass.xml
%%DATADIR%%/hash/picno.xml
%%DATADIR%%/hash/pico.xml
%%DATADIR%%/hash/pippin.xml
%%DATADIR%%/hash/pippin_flop.xml

%%DATADIR%%/hash/plus4_cass.xml
%%DATADIR%%/hash/plus4_flop.xml
%%DATADIR%%/hash/pmd85_cass.xml
%%DATADIR%%/hash/pockchalv2.xml
%%DATADIR%%/hash/pockchalw.xml
%%DATADIR%%/hash/pofo.xml
%%DATADIR%%/hash/poisk1_flop.xml
%%DATADIR%%/hash/pokemini.xml
%%DATADIR%%/hash/princ.xml
%%DATADIR%%/hash/pro128_cart.xml
%%DATADIR%%/hash/pro128_cass.xml
%%DATADIR%%/hash/pro128_flop.xml
%%DATADIR%%/hash/pro128s_flop.xml
%%DATADIR%%/hash/prof180.xml
%%DATADIR%%/hash/prof80.xml
%%DATADIR%%/hash/psi98.xml
%%DATADIR%%/hash/psion1.xml
%%DATADIR%%/hash/psion2.xml
%%DATADIR%%/hash/psx.xml

%%DATADIR%%/hash/pv1000.xml
%%DATADIR%%/hash/pv2000.xml
%%DATADIR%%/hash/px4_cart.xml
%%DATADIR%%/hash/px8_cart.xml
%%DATADIR%%/hash/pyl601.xml
%%DATADIR%%/hash/ql_cart.xml
%%DATADIR%%/hash/ql_cass.xml
%%DATADIR%%/hash/ql_flop.xml
%%DATADIR%%/hash/quizwiz.xml
%%DATADIR%%/hash/qx10_flop.xml
%%DATADIR%%/hash/r9751.xml
%%DATADIR%%/hash/radio86_cart.xml
%%DATADIR%%/hash/radio86_cass.xml
%%DATADIR%%/hash/rainbow.xml

%%DATADIR%%/hash/samcoupe_cass.xml
%%DATADIR%%/hash/samcoupe_flop.xml
%%DATADIR%%/hash/sat_cart.xml
%%DATADIR%%/hash/sat_vccart.xml
%%DATADIR%%/hash/saturn.xml
%%DATADIR%%/hash/sawatte.xml
%%DATADIR%%/hash/sc3000_cart.xml

%%DATADIR%%/hash/sf7000.xml
%%DATADIR%%/hash/sg1000.xml
%%DATADIR%%/hash/sgx.xml
%%DATADIR%%/hash/sitcom.xml
%%DATADIR%%/hash/smc777.xml
%%DATADIR%%/hash/smondial2.xml
%%DATADIR%%/hash/sms.xml
%%DATADIR%%/hash/snes.xml
%%DATADIR%%/hash/snes_bspack.xml
%%DATADIR%%/hash/snes_strom.xml
%%DATADIR%%/hash/snes_vkun.xml
%%DATADIR%%/hash/snotec.xml
%%DATADIR%%/hash/snread.xml
%%DATADIR%%/hash/snspell.xml
%%DATADIR%%/hash/socrates.xml

%%DATADIR%%/hash/sorcerer_cass.xml
%%DATADIR%%/hash/sorcerer_flop.xml
%%DATADIR%%/hash/spc1000_cass.xml
%%DATADIR%%/hash/spc1500_cass.xml
%%DATADIR%%/hash/special_cass.xml
%%DATADIR%%/hash/special_flop.xml
%%DATADIR%%/hash/specpls3_flop.xml

%%DATADIR%%/hash/spectrum_cass.xml
%%DATADIR%%/hash/st_cart.xml
%%DATADIR%%/hash/st_flop.xml
%%DATADIR%%/hash/stepone_flop.xml
%%DATADIR%%/hash/studio2.xml
%%DATADIR%%/hash/stv.xml
%%DATADIR%%/hash/super6.xml
%%DATADIR%%/hash/super80_cass.xml
%%DATADIR%%/hash/superpet_flop.xml
%%DATADIR%%/hash/supracan.xml
%%DATADIR%%/hash/sv8000.xml

%%DATADIR%%/hash/svi318_flop.xml
%%DATADIR%%/hash/svision.xml
%%DATADIR%%/hash/svmu.xml
%%DATADIR%%/hash/t1000.xml
%%DATADIR%%/hash/tandy200.xml
%%DATADIR%%/hash/tandy2k.xml
%%DATADIR%%/hash/tandy6k.xml
%%DATADIR%%/hash/tc4.xml
%%DATADIR%%/hash/tdv2324.xml
%%DATADIR%%/hash/tek4052_cart.xml
%%DATADIR%%/hash/tg16.xml
%%DATADIR%%/hash/ti74_cart.xml
%%DATADIR%%/hash/ti95_cart.xml
%%DATADIR%%/hash/ti99_cart.xml
%%DATADIR%%/hash/tiki100.xml
%%DATADIR%%/hash/timex_dock.xml
%%DATADIR%%/hash/tntell.xml
%%DATADIR%%/hash/to770_cart.xml
%%DATADIR%%/hash/to770a_cart.xml
%%DATADIR%%/hash/to7_cart.xml
%%DATADIR%%/hash/to7_cass.xml
%%DATADIR%%/hash/to7_qd.xml
%%DATADIR%%/hash/to8_cass.xml
%%DATADIR%%/hash/to8_qd.xml
%%DATADIR%%/hash/to_flop.xml
%%DATADIR%%/hash/trs80m2.xml
%%DATADIR%%/hash/trsm100.xml
%%DATADIR%%/hash/tutor.xml
%%DATADIR%%/hash/tvc_cart.xml
%%DATADIR%%/hash/tvc_cass.xml
%%DATADIR%%/hash/tvc_flop.xml
%%DATADIR%%/hash/unichamp.xml
%%DATADIR%%/hash/ut88.xml
%%DATADIR%%/hash/uzebox.xml
%%DATADIR%%/hash/v1050_flop.xml

%%DATADIR%%/hash/vboy.xml
%%DATADIR%%/hash/vc4000.xml
%%DATADIR%%/hash/vector06_cart.xml
%%DATADIR%%/hash/vector06_flop.xml
%%DATADIR%%/hash/vectrex.xml
%%DATADIR%%/hash/vg5k.xml
%%DATADIR%%/hash/vic10.xml

%%DATADIR%%/hash/vreader.xml
%%DATADIR%%/hash/vsmile_cart.xml
%%DATADIR%%/hash/vsmile_cd.xml
%%DATADIR%%/hash/vsmileb_cart.xml
%%DATADIR%%/hash/vsmilem_cart.xml
%%DATADIR%%/hash/vz_cass.xml
%%DATADIR%%/hash/wangpc.xml
%%DATADIR%%/hash/waveterm.xml
%%DATADIR%%/hash/wicat.xml
%%DATADIR%%/hash/wmbullet.xml
%%DATADIR%%/hash/wscolor.xml

%%DATADIR%%/hash/xegs.xml
%%DATADIR%%/hash/xerox820.xml
%%DATADIR%%/hash/xerox820ii.xml
%%DATADIR%%/hash/z80ne_cass.xml
%%DATADIR%%/hash/z80ne_flop.xml
%%DATADIR%%/hash/z88_cart.xml
%%DATADIR%%/hash/zorba.xml
%%DATADIR%%/hash/zx80_cass.xml
%%DATADIR%%/hash/zx81_cass.xml

Return to bug 226687

Lines 2-9 Link Here

(-)b/emulators/mame/Makefile (-11 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mame	4	PORTNAME?= mame
5	PORTVERSION= 0.166	5	PORTVERSION= 0.195
6	PORTREVISION?= 5
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 26-42 USES= compiler:c11 gmake jpeg pkgconfig python:2.7,build shebangfix Link Here
26	SHEBANG_FILES= src/devices/cpu/m6502/m6502make.py \	25	SHEBANG_FILES= src/devices/cpu/m6502/m6502make.py \
27	src/devices/cpu/m6809/m6809make.py \	26	src/devices/cpu/m6809/m6809make.py \
28	src/devices/cpu/mcs96/mcs96make.py \	27	src/devices/cpu/mcs96/mcs96make.py \
29	src/devices/cpu/tms57002/tmsmake.py \	28	src/devices/cpu/tms57002/tmsmake.py
30	src/build/*.py
31	USE_XORG= x11 xext xi xinerama xrender	29	USE_XORG= x11 xext xi xinerama xrender
32	USE_GL= gl	30	USE_GL= gl
33	USE_SDL= sdl2 ttf2	31	USE_SDL= sdl2 ttf2
34	USE_QT4= gui moc_build qmake_build	32	USE_QT5= gui qmake_build widgets
35	MTARGET?= mame	33	MTARGET?= mame
36	MSUBTARGET?= mame	34	MSUBTARGET?= mame
37	CFLAGS+= -I${LOCALBASE}/include	35	CFLAGS+= -I${LOCALBASE}/include
38	MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \	36	MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \
39	LD="${CXX}" PYTHON="${PYTHON_CMD}" SDL_LIBVER="sdl2" \	37	LD="${CXX}" PYTHON="${PYTHON_CMD}" \
40	OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \	38	OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
41	TARGET="${MTARGET}" SUBTARGET="${MSUBTARGET}" FULLNAME="mame" SDL_NETWORK="pcap"	39	TARGET="${MTARGET}" SUBTARGET="${MSUBTARGET}" FULLNAME="mame" SDL_NETWORK="pcap"
42	MAKE_ARGS= TARGETOS=freebsd VERBOSE=1 TOOLS=1	40	MAKE_ARGS= TARGETOS=freebsd VERBOSE=1 TOOLS=1
Lines 62-78 EMULATOR= ${MSUBTARGET} Link Here
62	PLIST_SUB= EMULATOR=${EMULATOR}	60	PLIST_SUB= EMULATOR=${EMULATOR}
63		61
64	post-patch:	62	post-patch:
		63	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h
		64	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h
		65	@${MV} ${GENIE}/build/gmake.freebsd ${GENIE}/build/gmake.bsd
65	@${REINPLACE_CMD} -e \	66	@${REINPLACE_CMD} -e \
66	's\|^\(CC \)\|#\1\| ; \	67	's\|^\(CC \)\|#\1\| ; \
67	s\|^\(CXX \)\|#\1\| ; \	68	s\|^\(CXX \)\|#\1\| ; \
		69	s\|^\(CXX:\)\|#\1\| ; \
68	s\|^\(LD \)\|#\1\| ; \	70	s\|^\(LD \)\|#\1\| ; \
69	s\|^\(PYTHON \)\|#\1\| ; \	71	s\|^\(PYTHON \)\|#\1\| ; \
70	s\| .(ARCH)\|\| ; \	72	s\| .(ARCH)\|\| ; \
71	s\|FreeBSD\|${OPSYS}\|g' \	73	s\|FreeBSD\|${OPSYS}\|g' \
72	${WRKSRC}/makefile \	74	${WRKSRC}/makefile \
		75	${WRKSRC}/src/devices/cpu/m68000/makefile \
73	${GENIE}/build/gmake.bsd/genie.make	76	${GENIE}/build/gmake.bsd/genie.make
74	@${REINPLACE_CMD} -e 's\|gcc\|cc\|; s\|g++\|c++\|' \	77	@${REINPLACE_CMD} -e 's\|gcc\|cc\|; s\|g++\|c++\|' \
75	${GENIE}/src/actions/codelite/codelite_project.lua \
76	${GENIE}/src/tools/gcc.lua \	78	${GENIE}/src/tools/gcc.lua \
77	${GENIE}/src/tools/snc.lua \	79	${GENIE}/src/tools/snc.lua \
78	${GENIE}/tests/test_gmake_cpp.lua	80	${GENIE}/tests/test_gmake_cpp.lua
Lines 81-87 post-patch: Link Here
81	${GENIE}/src/host/scripts.c	83	${GENIE}/src/host/scripts.c
82	# we can't fix two types of python shebangs, so do these manually	84	# we can't fix two types of python shebangs, so do these manually
83	@${REINPLACE_CMD} -i "" -e "s\|/usr/bin/env python\|${PYTHON_CMD}\|" \	85	@${REINPLACE_CMD} -i "" -e "s\|/usr/bin/env python\|${PYTHON_CMD}\|" \
84	${WRKSRC}/src/build/png*.py	86	${WRKSRC}/scripts/build/png*.py
85	@${REINPLACE_CMD} -e 's\|"python"\|"${PYTHON_CMD}"\|' \	87	@${REINPLACE_CMD} -e 's\|"python"\|"${PYTHON_CMD}"\|' \
86	${WRKSRC}/scripts/genie.lua	88	${WRKSRC}/scripts/genie.lua
87	@${GREP} -rl '"png.h"' ${WRKSRC}/src \| ${XARGS} ${REINPLACE_CMD} \	89	@${GREP} -rl '"png.h"' ${WRKSRC}/src \| ${XARGS} ${REINPLACE_CMD} \
Lines 97-103 do-install: Link Here
97	.if ${MSUBTARGET:Mmame}	99	.if ${MSUBTARGET:Mmame}
98	(cd ${WRKSRC} && \	100	(cd ${WRKSRC} && \
99	${INSTALL_PROGRAM} chdman jedutil ldresample ldverify \	101	${INSTALL_PROGRAM} chdman jedutil ldresample ldverify \
100	romcmp testkeys unidasm \	102	romcmp unidasm \
101	${STAGEDIR}${PREFIX}/libexec/mame)	103	${STAGEDIR}${PREFIX}/libexec/mame)
102	.endif	104	.endif
103	.if ${MSUBTARGET:Mmess}	105	.if ${MSUBTARGET:Mmess}
Lines 107-114 do-install: Link Here
107	.endif	109	.endif
108	(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})	110	(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
109	(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})	111	(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
110	(cd ${WRKSRC}/src/osd/sdl && \
111	${COPYTREE_SHARE} keymaps ${STAGEDIR}${DATADIR})
112	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})	112	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
113	${INSTALL_DATA} ${WRKDIR}/target.ini \	113	${INSTALL_DATA} ${WRKDIR}/target.ini \
114	${STAGEDIR}${EXAMPLESDIR}/${MSUBTARGET}.ini	114	${STAGEDIR}${EXAMPLESDIR}/${MSUBTARGET}.ini

Removed Link Here

(-)a/emulators/mame/files/patch-3rdparty_bgfx_include_bgfxplatform.h (-13 lines)
1	Catch up with https://hg.libsdl.org/SDL/rev/d11daa346140
2
3	--- 3rdparty/bgfx/include/bgfxplatform.h.orig 2015-09-30 06:29:01 UTC
4	+++ 3rdparty/bgfx/include/bgfxplatform.h
5	@@ -186,7 +186,7 @@ namespace bgfx
6
7	#endif // BX_PLATFORM_
8
9	-#if defined(_SDL_syswm_h)
10	+#if defined(_SDL_syswm_h) \|\| defined(SDL_syswm_h_)
11	// If SDL_syswm.h is included before bgfxplatform.h we can enable SDL window
12	// interop convenience code.
13

Removed Link Here

(-)a/emulators/mame/files/patch-3rdparty_bx_include_bx_float4__t.h (-12 lines)
1	--- 3rdparty/bx/include/bx/float4_t.h.orig 2015-09-30 06:29:01 UTC
2	+++ 3rdparty/bx/include/bx/float4_t.h
3	@@ -18,7 +18,8 @@
4	#elif BX_COMPILER_CLANG \
5	&& !BX_PLATFORM_EMSCRIPTEN \
6	&& !BX_PLATFORM_IOS \
7	- && BX_CLANG_HAS_EXTENSION(attribute_ext_vector_type)
8	+ && BX_CLANG_HAS_EXTENSION(attribute_ext_vector_type) \
9	+ && !BX_PLATFORM_FREEBSD
10	# include "float4_langext.h"
11	#else
12	# ifndef BX_FLOAT4_WARN_REFERENCE_IMPL

Lines 1-11 Link Here

(-)b/emulators/mame/files/patch-3rdparty_bx_include_bx_platform.h (-10 / +38 lines)
1	--- 3rdparty/bx/include/bx/platform.h.orig 2015-04-29 06:18:54 UTC	1	--- 3rdparty/bx/include/bx/platform.h.orig 2018-03-12 03:09:05.625070000 +0900
2	+++ 3rdparty/bx/include/bx/platform.h	2	+++ 3rdparty/bx/include/bx/platform.h 2018-03-12 03:09:47.018847000 +0900
3	@@ -184,7 +184,7 @@	3	@@ -35,6 +35,7 @@
4	#elif defined(__QNX__)	4	#define BX_CRT_MINGW 0
5	# undef BX_PLATFORM_QNX	5	#define BX_CRT_MSVC 0
6	# define BX_PLATFORM_QNX 1	6	#define BX_CRT_NEWLIB 0
7	-#elif defined(__FreeBSD__)	7	+#define BX_CRT_BSD 0
8	+#elif defined(__FreeBSD__) \|\| defined(__DragonFly__)	8
9	# undef BX_PLATFORM_FREEBSD	9	#ifndef BX_CRT_MUSL
10	# define BX_PLATFORM_FREEBSD 1	10	# define BX_CRT_MUSL 0
		11	@@ -236,6 +237,9 @@
		12	# elif defined(__apple_build_version__) \|\| defined(__ORBIS__) \|\| defined(__EMSCRIPTEN__) \|\| defined(__llvm__)
		13	# undef BX_CRT_LIBCXX
		14	# define BX_CRT_LIBCXX 1
		15	+# elif BX_PLATFORM_BSD
		16	+# undef BX_CRT_BSD
		17	+# define BX_CRT_BSD 1
		18	# endif //
		19
		20	# if !BX_CRT_BIONIC \
		21	@@ -244,7 +248,8 @@
		22	&& !BX_CRT_MINGW \
		23	&& !BX_CRT_MSVC \
		24	&& !BX_CRT_MUSL \
		25	- && !BX_CRT_NEWLIB
		26	+ && !BX_CRT_NEWLIB \
		27	+ && !BX_CRT_BSD
		28	# undef BX_CRT_NONE
		29	# define BX_CRT_NONE 1
		30	# endif // BX_CRT_*
		31	@@ -379,6 +384,8 @@
		32	# define BX_CRT_NAME "Newlib"
		33	#elif BX_CRT_MUSL
		34	# define BX_CRT_NAME "musl libc"
		35	+#elif BX_CRT_BSD
		36	+# define BX_CRT_NAME "BSD"
		37	#elif BX_CRT_NONE
		38	# define BX_CRT_NAME "None"
11	#else	39	#else

Removed Link Here

(-)a/emulators/mame/files/patch-3rdparty_bx_include_bx_thread.h (-25 lines)
1	--- 3rdparty/bx/include/bx/thread.h.orig 2015-09-30 06:29:01 UTC
2	+++ 3rdparty/bx/include/bx/thread.h
3	@@ -14,6 +14,10 @@ using namespace Windows::Foundation;
4	using namespace Windows::System::Threading;
5	#endif
6
7	+#if BX_PLATFORM_FREEBSD
8	+# include <pthread_np.h>
9	+#endif
10	+
11	#include "sem.h"
12
13	#if BX_CONFIG_SUPPORTS_THREADING
14	@@ -149,8 +153,10 @@ namespace bx
15	{
16	#if BX_PLATFORM_OSX \|\| BX_PLATFORM_IOS
17	pthread_setname_np(_name);
18	-#elif BX_PLATFORM_LINUX \|\| BX_PLATFORM_FREEBSD
19	+#elif BX_PLATFORM_LINUX
20	pthread_setname_np(m_handle, _name);
21	+#elif BX_PLATFORM_FREEBSD
22	+ pthread_set_name_np(m_handle, _name);
23	#elif BX_PLATFORM_WINDOWS && BX_COMPILER_MSVC
24	# pragma pack(push, 8)
25	struct ThreadName

Added Link Here

(-)b/emulators/mame/files/patch-makefile (+50 lines)
1	--- makefile.orig 2018-02-28 00:59:06.000000000 +0900
2	+++ makefile 2018-03-12 08:09:17.531106000 +0900
3	@@ -183,19 +183,19 @@
4	endif
5	ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD)
6	OS := freebsd
7	-GENIEOS := freebsd
8	+GENIEOS := bsd
9	endif
10	ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
11	OS := freebsd
12	-GENIEOS := freebsd
13	+GENIEOS := bsd
14	endif
15	ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
16	OS := netbsd
17	-GENIEOS := freebsd
18	+GENIEOS := bsd
19	endif
20	ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
21	OS := openbsd
22	-GENIEOS := freebsd
23	+GENIEOS := bsd
24	endif
25	ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
26	OS := macosx
27	@@ -1377,6 +1377,23 @@
28	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd config=$(CONFIG)32
29
30	#-------------------------------------------------
31	+# gmake-freebsd-clang
32	+#-------------------------------------------------
33	+
34	+$(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
35	+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
36	+
37	+.PHONY: freebsd_x64_clang
38	+freebsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
39	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile
40	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64
41	+
42	+.PHONY: freebsd_x86_clang
43	+freebsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
44	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32 precompile
45	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32
46	+
47	+#-------------------------------------------------
48	# gmake-netbsd
49	#-------------------------------------------------
50

Added Link Here

(-)b/emulators/mame/files/patch-scripts_toolchain.lua (+21 lines)
1	--- scripts/toolchain.lua.orig 2018-03-12 08:39:00.497654000 +0900
2	+++ scripts/toolchain.lua 2018-03-12 08:41:52.263428000 +0900
3	@@ -23,6 +23,7 @@
4	{ "android-x64", "Android - x64" },
5	{ "asmjs", "Emscripten/asm.js" },
6	{ "freebsd", "FreeBSD" },
7	+ { "freebsd-clang", "FreeBSD (Clang)" },
8	{ "linux-gcc", "Linux (GCC compiler)" },
9	{ "linux-clang", "Linux (Clang compiler)" },
10	{ "ios-arm", "iOS - ARM" },
11	@@ -168,6 +169,10 @@
12	location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd")
13	end
14
15	+ if "freebsd-clang" == _OPTIONS["gcc"] then
16	+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd-clang")
17	+ end
18	+
19	if "netbsd" == _OPTIONS["gcc"] then
20	location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd")
21	end

Lines 1-128 Link Here

(-)b/emulators/mame/files/patch-src__osd__eigccx86.h (-63 / +45 lines)
1	--- src/osd/eigccx86.h.orig 2015-05-24 15:52:19 UTC	1	--- src/osd/eigccx86.h.orig 2018-03-12 02:58:55.205941000 +0900
2	+++ src/osd/eigccx86.h	2	+++ src/osd/eigccx86.h 2018-03-12 03:02:13.350927000 +0900
3	@@ -42,7 +42,7 @@ union _x86_union	3	@@ -31,7 +31,7 @@
4	multiply and return the full 64 bit result	4	multiply and return the full 64 bit result
5	-------------------------------------------------*/	5	-------------------------------------------------*/
6		6
7	-#ifndef __x86_64__	7	-#ifndef __x86_64__
8	+#if !defined(__amd64__) && !defined(__x86_64__)	8	+#if !defined(__amd64__) && !defined(__x86_64__)
9	#define mul_32x32 _mul_32x32	9	#define mul_32x32 _mul_32x32
10	INLINE INT64 ATTR_CONST ATTR_FORCE_INLINE	10	inline int64_t ATTR_CONST ATTR_FORCE_INLINE
11	_mul_32x32(INT32 a, INT32 b)	11	_mul_32x32(int32_t a, int32_t b)
12	@@ -68,7 +68,7 @@ _mul_32x32(INT32 a, INT32 b)	12	@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b)
13	result	13	result
14	-------------------------------------------------*/	14	-------------------------------------------------*/
15		15
16	-#ifndef __x86_64__	16	-#ifndef __x86_64__
17	+#if !defined(__amd64__) && !defined(__x86_64__)	17	+#if !defined(__amd64__) && !defined(__x86_64__)
18	#define mulu_32x32 _mulu_32x32	18	#define mulu_32x32 _mulu_32x32
19	INLINE UINT64 ATTR_CONST ATTR_FORCE_INLINE	19	inline uint64_t ATTR_CONST ATTR_FORCE_INLINE
20	_mulu_32x32(UINT32 a, UINT32 b)	20	_mulu_32x32(uint32_t a, uint32_t b)
21	@@ -145,7 +145,7 @@ _mulu_32x32_hi(UINT32 a, UINT32 b)	21	@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b)
22	result to 32 bits	22	result to 32 bits
23	-------------------------------------------------*/	23	-------------------------------------------------*/
24		24
25	-#ifndef __x86_64__	25	-#ifndef __x86_64__
26	+#if !defined(__amd64__) && !defined(__x86_64__)	26	+#if !defined(__amd64__) && !defined(__x86_64__)
27	#define mul_32x32_shift _mul_32x32_shift	27	#define mul_32x32_shift _mul_32x32_shift
28	INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE	28	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
29	_mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)	29	_mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
30	@@ -175,7 +175,7 @@ _mul_32x32_shift(INT32 a, INT32 b, UINT8	30	@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, u
31	result to 32 bits	31	result to 32 bits
32	-------------------------------------------------*/	32	-------------------------------------------------*/
33		33
34	-#ifndef __x86_64__	34	-#ifndef __x86_64__
35	+#if !defined(__amd64__) && !defined(__x86_64__)	35	+#if !defined(__amd64__) && !defined(__x86_64__)
36	#define mulu_32x32_shift _mulu_32x32_shift	36	#define mulu_32x32_shift _mulu_32x32_shift
37	INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE	37	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
38	_mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)	38	_mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
39	@@ -203,7 +203,7 @@ _mulu_32x32_shift(UINT32 a, UINT32 b, UI	39	@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b
40	divide and return the 32 bit quotient	40	divide and return the 32 bit quotient
41	-------------------------------------------------*/	41	-------------------------------------------------*/
42		42
43	-#ifndef __x86_64__	43	-#ifndef __x86_64__
44	+#if !defined(__amd64__) && !defined(__x86_64__)	44	+#if !defined(__amd64__) && !defined(__x86_64__)
45	#define div_64x32 _div_64x32	45	#define div_64x32 _div_64x32
46	INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE	46	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
47	_div_64x32(INT64 a, INT32 b)	47	_div_64x32(int64_t a, int32_t b)
48	@@ -230,7 +230,7 @@ _div_64x32(INT64 a, INT32 b)	48	@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b)
49	divide and return the 32 bit quotient	49	divide and return the 32 bit quotient
50	-------------------------------------------------*/	50	-------------------------------------------------*/
51		51
52	-#ifndef __x86_64__	52	-#ifndef __x86_64__
53	+#if !defined(__amd64__) && !defined(__x86_64__)	53	+#if !defined(__amd64__) && !defined(__x86_64__)
54	#define divu_64x32 _divu_64x32	54	#define divu_64x32 _divu_64x32
55	INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE	55	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
56	_divu_64x32(UINT64 a, UINT32 b)	56	_divu_64x32(uint64_t a, uint32_t b)
57	@@ -258,7 +258,7 @@ _divu_64x32(UINT64 a, UINT32 b)	57	@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE
58	32 bit remainder	58	_div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder)
59	-------------------------------------------------*/	59	{
60		60	int32_t quotient;
61	-#ifndef __x86_64__	61	-#ifndef __x86_64__
62	+#if !defined(__amd64__) && !defined(__x86_64__)	62	+#if !defined(__amd64__) && !defined(__x86_64__)
63	#define div_64x32_rem _div_64x32_rem
64	INLINE INT32 ATTR_FORCE_INLINE
65	_div_64x32_rem(INT64 dividend, INT32 divisor, INT32 *remainder)
66	@@ -286,7 +286,7 @@ _div_64x32_rem(INT64 dividend, INT32 div
67	and 32 bit remainder
68	-------------------------------------------------*/
69		63
		64	// Throws arithmetic exception if result doesn't fit in 32 bits
		65	__asm__ (
		66	@@ -287,7 +287,7 @@ inline uint32_t ATTR_FORCE_INLINE
		67	_divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder)
		68	{
		69	uint32_t quotient;
70	-#ifndef __x86_64__	70	-#ifndef __x86_64__
71	+#if !defined(__amd64__) && !defined(__x86_64__)	71	+#if !defined(__amd64__) && !defined(__x86_64__)
72	#define divu_64x32_rem _divu_64x32_rem	72
73	INLINE UINT32 ATTR_FORCE_INLINE	73	// Throws arithmetic exception if result doesn't fit in 32 bits
74	_divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)	74	__asm__ (
75	@@ -337,7 +337,7 @@ _divu_64x32_rem(UINT64 dividend, UINT32	75	@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint3
76	division, and returning the 32 bit quotient	76	division, and returning the 32 bit quotient
77	-------------------------------------------------*/	77	-------------------------------------------------*/
78		78
79	-#ifndef __x86_64__	79	-#ifndef __x86_64__
80	+#if !defined(__amd64__) && !defined(__x86_64__)	80	+#if !defined(__amd64__) && !defined(__x86_64__)
81	#define div_32x32_shift _div_32x32_shift	81	#define div_32x32_shift _div_32x32_shift
82	INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE	82	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
83	_div_32x32_shift(INT32 a, INT32 b, UINT8 shift)	83	_div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
84	@@ -369,7 +369,7 @@ _div_32x32_shift(INT32 a, INT32 b, UINT8	84	@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, u
85	division, and returning the 32 bit quotient	85	division, and returning the 32 bit quotient
86	-------------------------------------------------*/	86	-------------------------------------------------*/
87		87
88	-#ifndef __x86_64__	88	-#ifndef __x86_64__
89	+#if !defined(__amd64__) && !defined(__x86_64__)	89	+#if !defined(__amd64__) && !defined(__x86_64__)
90	#define divu_32x32_shift _divu_32x32_shift	90	#define divu_32x32_shift _divu_32x32_shift
91	INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE	91	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
92	_divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)	92	_divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
93	@@ -400,7 +400,7 @@ _divu_32x32_shift(UINT32 a, UINT32 b, UI	93	@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b
94	divide and return the 32 bit remainder	94	divide and return the 32 bit remainder
95	-------------------------------------------------*/	95	-------------------------------------------------*/
96		96
97	-#ifndef __x86_64__	97	-#ifndef __x86_64__
98	+#if !defined(__amd64__) && !defined(__x86_64__)	98	+#if !defined(__amd64__) && !defined(__x86_64__)
99	#define mod_64x32 _mod_64x32	99	#define mod_64x32 _mod_64x32
100	INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE	100	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
101	_mod_64x32(INT64 a, INT32 b)	101	_mod_64x32(int64_t a, int32_t b)
102	@@ -427,7 +427,7 @@ _mod_64x32(INT64 a, INT32 b)	102	@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b)
103	divide and return the 32 bit remainder	103	divide and return the 32 bit remainder
104	-------------------------------------------------*/	104	-------------------------------------------------*/
105		105
106	-#ifndef __x86_64__	106	-#ifndef __x86_64__
107	+#if !defined(__amd64__) && !defined(__x86_64__)	107	+#if !defined(__amd64__) && !defined(__x86_64__)
108	#define modu_64x32 _modu_64x32	108	#define modu_64x32 _modu_64x32
109	INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE	109	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
110	_modu_64x32(UINT64 a, UINT32 b)	110	_modu_64x32(uint64_t a, uint32_t b)
111	@@ -563,7 +563,7 @@ _compare_exchange32(INT32 volatile *ptr,
112	return the previous value at 'ptr'.
113	-------------------------------------------------*/
114
115	-#ifdef __x86_64__
116	+#if defined(__amd64__) \|\| defined(__x86_64__)
117	#define compare_exchange64 _compare_exchange64
118	INLINE INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
119	_compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
120	@@ -693,7 +693,7 @@ _atomic_decrement32(INT32 volatile *ptr)
121
122	#define get_profile_ticks _get_profile_ticks
123
124	-#ifndef __x86_64__
125	+#if !defined(__amd64__) && !defined(__x86_64__)
126	INLINE UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
127	{
128	UINT64 result;

Removed Link Here

(-)a/emulators/mame/files/patch-src_lib_netlist_plib_pparser.c (-102 lines)
1	--- src/lib/netlist/plib/pparser.c.orig 2015-09-30 06:29:01 UTC
2	+++ src/lib/netlist/plib/pparser.c
3	@@ -28,22 +28,22 @@ pstring ptokenizer::currentline_str()
4
5	void ptokenizer::skipeol()
6	{
7	- pstring::code_t c = getc();
8	+ pstring::code_t c = mame_getc();
9	while (c)
10	{
11	if (c == 10)
12	{
13	- c = getc();
14	+ c = mame_getc();
15	if (c != 13)
16	- ungetc();
17	+ mame_ungetc();
18	return;
19	}
20	- c = getc();
21	+ c = mame_getc();
22	}
23	}
24
25
26	-pstring::code_t ptokenizer::getc()
27	+pstring::code_t ptokenizer::mame_getc()
28	{
29	if (m_px >= m_cur_line.len())
30	{
31	@@ -58,7 +58,7 @@ pstring::code_t ptokenizer::getc()
32	return m_cur_line.code_at(m_px++);
33	}
34
35	-void ptokenizer::ungetc()
36	+void ptokenizer::mame_ungetc()
37	{
38	m_px--;
39	}
40	@@ -166,10 +166,10 @@ ptokenizer::token_t ptokenizer::get_toke
41	ptokenizer::token_t ptokenizer::get_token_internal()
42	{
43	/* skip ws */
44	- pstring::code_t c = getc();
45	+ pstring::code_t c = mame_getc();
46	while (m_whitespace.find(c)>=0)
47	{
48	- c = getc();
49	+ c = mame_getc();
50	if (eof())
51	{
52	return token_t(ENDOFFILE);
53	@@ -189,9 +189,9 @@ ptokenizer::token_t ptokenizer::get_toke
54	else if (m_number_chars.find(c)<0)
55	break;
56	tokstr += c;
57	- c = getc();
58	+ c = mame_getc();
59	}
60	- ungetc();
61	+ mame_ungetc();
62	return token_t(ret, tokstr);
63	}
64	else if (m_identifier_chars.find(c)>=0)
65	@@ -200,9 +200,9 @@ ptokenizer::token_t ptokenizer::get_toke
66	pstring tokstr = "";
67	while (m_identifier_chars.find(c)>=0) {
68	tokstr += c;
69	- c = getc();
70	+ c = mame_getc();
71	}
72	- ungetc();
73	+ mame_ungetc();
74	token_id_t id = token_id_t(m_tokens.indexof(tokstr));
75	if (id.id() >= 0)
76	return token_t(id, tokstr);
77	@@ -214,11 +214,11 @@ ptokenizer::token_t ptokenizer::get_toke
78	else if (c == m_string)
79	{
80	pstring tokstr = "";
81	- c = getc();
82	+ c = mame_getc();
83	while (c != m_string)
84	{
85	tokstr += c;
86	- c = getc();
87	+ c = mame_getc();
88	}
89	return token_t(STRING, tokstr);
90	}
91	@@ -235,9 +235,9 @@ ptokenizer::token_t ptokenizer::get_toke
92	if (id.id() >= 0)
93	return token_t(id, tokstr);
94	}
95	- c = getc();
96	+ c = mame_getc();
97	}
98	- ungetc();
99	+ mame_ungetc();
100	token_id_t id = token_id_t(m_tokens.indexof(tokstr));
101	if (id.id() >= 0)
102	return token_t(id, tokstr);

Added Link Here

(-)b/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp (+102 lines)
1	--- src/lib/netlist/plib/pparser.cpp.orig 2018-03-12 03:03:56.509169000 +0900
2	+++ src/lib/netlist/plib/pparser.cpp 2018-03-12 03:06:00.431002000 +0900
3	@@ -34,22 +34,22 @@ pstring ptokenizer::currentline_str()
4
5	void ptokenizer::skipeol()
6	{
7	- pstring::code_t c = getc();
8	+ pstring::code_t c = mame_getc();
9	while (c)
10	{
11	if (c == 10)
12	{
13	- c = getc();
14	+ c = mame_getc();
15	if (c != 13)
16	- ungetc(c);
17	+ mame_ungetc(c);
18	return;
19	}
20	- c = getc();
21	+ c = mame_getc();
22	}
23	}
24
25
26	-pstring::code_t ptokenizer::getc()
27	+pstring::code_t ptokenizer::mame_getc()
28	{
29	if (m_unget != 0)
30	{
31	@@ -70,7 +70,7 @@ pstring::code_t ptokenizer::getc()
32	return c;
33	}
34
35	-void ptokenizer::ungetc(pstring::code_t c)
36	+void ptokenizer::mame_ungetc(pstring::code_t c)
37	{
38	m_unget = c;
39	}
40	@@ -182,10 +182,10 @@ ptokenizer::token_t ptokenizer::get_toke
41	ptokenizer::token_t ptokenizer::get_token_internal()
42	{
43	/* skip ws */
44	- pstring::code_t c = getc();
45	+ pstring::code_t c = mame_getc();
46	while (m_whitespace.find(c) != pstring::npos)
47	{
48	- c = getc();
49	+ c = mame_getc();
50	if (eof())
51	{
52	return token_t(ENDOFFILE);
53	@@ -205,9 +205,9 @@ ptokenizer::token_t ptokenizer::get_toke
54	else if (m_number_chars.find(c) == pstring::npos)
55	break;
56	tokstr += c;
57	- c = getc();
58	+ c = mame_getc();
59	}
60	- ungetc(c);
61	+ mame_ungetc(c);
62	return token_t(ret, tokstr);
63	}
64	else if (m_identifier_chars.find(c) != pstring::npos)
65	@@ -217,9 +217,9 @@ ptokenizer::token_t ptokenizer::get_toke
66	while (m_identifier_chars.find(c) != pstring::npos)
67	{
68	tokstr += c;
69	- c = getc();
70	+ c = mame_getc();
71	}
72	- ungetc(c);
73	+ mame_ungetc(c);
74	auto id = m_tokens.find(tokstr);
75	if (id != m_tokens.end())
76	return token_t(id->second, tokstr);
77	@@ -229,11 +229,11 @@ ptokenizer::token_t ptokenizer::get_toke
78	else if (c == m_string)
79	{
80	pstring tokstr = "";
81	- c = getc();
82	+ c = mame_getc();
83	while (c != m_string)
84	{
85	tokstr += c;
86	- c = getc();
87	+ c = mame_getc();
88	}
89	return token_t(STRING, tokstr);
90	}
91	@@ -251,9 +251,9 @@ ptokenizer::token_t ptokenizer::get_toke
92	if (id != m_tokens.end())
93	return token_t(id->second, tokstr);
94	}
95	- c = getc();
96	+ c = mame_getc();
97	}
98	- ungetc(c);
99	+ mame_ungetc(c);
100	auto id = m_tokens.find(tokstr);
101	if (id != m_tokens.end())
102	return token_t(id->second, tokstr);

Lines 1-13 Link Here

(-)b/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h (-5 / +5 lines)
1	--- src/lib/netlist/plib/pparser.h.orig 2015-09-30 06:29:01 UTC	1	--- src/lib/netlist/plib/pparser.h.orig 2018-03-12 03:06:23.053773000 +0900
2	+++ src/lib/netlist/plib/pparser.h	2	+++ src/lib/netlist/plib/pparser.h 2018-03-12 03:06:40.281886000 +0900
3	@@ -120,8 +120,8 @@ protected:	3	@@ -118,8 +118,8 @@ protected:
4	private:	4	private:
5	void skipeol();	5	void skipeol();
6		6
7	- pstring::code_t getc();	7	- pstring::code_t getc();
8	- void ungetc();	8	- void ungetc(pstring::code_t c);
9	+ pstring::code_t mame_getc();	9	+ pstring::code_t mame_getc();
10	+ void mame_ungetc();	10	+ void mame_ungetc(pstring::code_t c);
11		11
12	bool eof() { return m_strm.eof(); }	12	bool eof() { return m_strm.eof(); }
13		13