Attachment #202963 for bug #236621




# $FreeBSD$

PORTNAME?=	mame
PORTVERSION=	0.207
PORTREVISION=	3
CATEGORIES=	emulators

MAINTAINER=	ports@FreeBSD.org

		${WRKSRC}/scripts/genie.lua
	@${GREP} -rl '"png.h"' ${WRKSRC}/src | ${XARGS} ${REINPLACE_CMD} \
		-e 's|"png.h"|"localpng.h"|'
	@${REINPLACE_CMD} -e 's|"util/png.h"|"util/localpng.h"|' \
		${WRKSRC}/src/frontend/mame/ui/icorender.cpp
	@${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h

do-install:

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1533314360	1	TIMESTAMP = 1551734228
2	SHA256 (mamedev-mame-0.200-mame0200_GH0.tar.gz) = a6c43323e120f55b32c072726bdda357aa221a599070989b6e3406ee4e3983fe	2	SHA256 (mamedev-mame-0.207-mame0207_GH0.tar.gz) = 69c29533d2128345c59fbf23fabc3af696322a77a6c1d7a7bd7f5a2ee57adafb
3	SIZE (mamedev-mame-0.200-mame0200_GH0.tar.gz) = 127378126	3	SIZE (mamedev-mame-0.207-mame0207_GH0.tar.gz) = 145962273




--- 3rdparty/asio/include/asio/detail/config.hpp.orig	2019-02-26 14:40:05.000000000 +0100
+++ 3rdparty/asio/include/asio/detail/config.hpp	2019-03-05 20:58:53.857248000 +0100
@@ -713,8 +713,9 @@
 #      define ASIO_HAS_STD_STRING_VIEW 1
 #     endif
 #    endif
-#    if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include(<experimental/string_view>)
+#    if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include(<string_view>)
 #     define ASIO_HAS_STD_STRING_VIEW 1
+#    elif __has_include(<experimental/string_view>)
 #     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
 #    endif // __has_include(<experimental/string_view>)
 #   endif // (__cplusplus >= 201103)




https://github.com/boostorg/asio/commit/b5b17a67f0aa29f5156324d5e8a73dd8669a5a51

--- 3rdparty/asio/include/asio/detail/config.hpp.orig	2018-07-24 19:45:05 UTC
+++ 3rdparty/asio/include/asio/detail/config.hpp
@@ -708,8 +708,9 @@
 # if !defined(ASIO_DISABLE_STD_STRING_VIEW)
 #  if defined(__clang__)
 #   if (__cplusplus >= 201103)
-#    if __has_include(<experimental/string_view>)
+#    if __has_include(<string_view>)
 #     define ASIO_HAS_STD_STRING_VIEW 1
+#    elif __has_include(<experimental/string_view>)
 #     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
 #    endif // __has_include(<experimental/string_view>)
 #   endif // (__cplusplus >= 201103)




--- scripts/toolchain.lua.orig	2018-02-27 15:59:06 UTC
+++ scripts/toolchain.lua
@@ -23,6 +23,7 @@ newoption {
 		{ "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 @@ function toolchain(_buildDir, _subDir)
 			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-02-27 15:59:06 UTC
+++ src/osd/eigccx86.h
@@ -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__)
 
 	// 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)

Lines 1-11 Link Here

(-)files/patch-src__osd__eminline.h (-11 lines)
1	--- src/osd/eminline.h.orig 2018-02-27 15:59:06 UTC
2	+++ src/osd/eminline.h
3	@@ -21,7 +21,7 @@
4
5	#if defined(__GNUC__)
6
7	-#if defined(__i386__) \|\| defined(__x86_64__)
8	+#if defined(__i386__) \|\| defined(__x86_64__) \|\| defined(__amd64__)
9	#include "eigccx86.h"
10	#elif defined(__ppc__) \|\| defined (__PPC__) \|\| defined(__ppc64__) \|\| defined(__PPC64__)
11	#include "eigccppc.h"




--- src/lib/netlist/plib/pparser.cpp.orig	2018-02-27 15:59:06 UTC
+++ src/lib/netlist/plib/pparser.cpp
@@ -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-02-27 15:59:06 UTC
+++ src/lib/netlist/plib/pparser.h
@@ -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(); }
 




%%DATADIR%%/hash/apogee.xml
%%DATADIR%%/hash/apollo_ctape.xml
%%DATADIR%%/hash/apple1.xml
%%DATADIR%%/hash/apple2.xml
%%DATADIR%%/hash/apple2_cass.xml
%%DATADIR%%/hash/apple2_flop_clcracked.xml
%%DATADIR%%/hash/apple2_flop_misc.xml
%%DATADIR%%/hash/apple2_flop_orig.xml
%%DATADIR%%/hash/apple2gs.xml
%%DATADIR%%/hash/apple3.xml
%%DATADIR%%/hash/apricot_flop.xml
%%DATADIR%%/hash/aquarius.xml
%%DATADIR%%/hash/arb.xml
%%DATADIR%%/hash/arcadia.xml
%%DATADIR%%/hash/archimedes.xml
%%DATADIR%%/hash/astrocde.xml

%%DATADIR%%/hash/bbc_flop_arm.xml
%%DATADIR%%/hash/bbc_flop_torch.xml
%%DATADIR%%/hash/bbc_flop_z80.xml
%%DATADIR%%/hash/bbc_rom.xml
%%DATADIR%%/hash/bbca_cass.xml
%%DATADIR%%/hash/bbcb_cass.xml
%%DATADIR%%/hash/bbcb_cass_de.xml

%%DATADIR%%/hash/c128_cart.xml
%%DATADIR%%/hash/c128_flop.xml
%%DATADIR%%/hash/c128_rom.xml
%%DATADIR%%/hash/c2color_cart.xml
%%DATADIR%%/hash/c64_cart.xml
%%DATADIR%%/hash/c64_cass.xml
%%DATADIR%%/hash/c64_flop.xml

%%DATADIR%%/hash/cgenie_flop_rom.xml
%%DATADIR%%/hash/channelf.xml
%%DATADIR%%/hash/chessmstdm.xml
%%DATADIR%%/hash/clickstart_cart.xml
%%DATADIR%%/hash/coco_cart.xml
%%DATADIR%%/hash/coco_flop.xml
%%DATADIR%%/hash/coleco.xml

%%DATADIR%%/hash/e01_flop.xml
%%DATADIR%%/hash/ec1841.xml
%%DATADIR%%/hash/einstein.xml
%%DATADIR%%/hash/ekara_japan.xml
%%DATADIR%%/hash/ekara_japan_a.xml
%%DATADIR%%/hash/ekara_japan_bh.xml
%%DATADIR%%/hash/ekara_japan_d.xml
%%DATADIR%%/hash/ekara_japan_en.xml
%%DATADIR%%/hash/ekara_japan_g.xml
%%DATADIR%%/hash/ekara_japan_gk.xml
%%DATADIR%%/hash/ekara_japan_m.xml
%%DATADIR%%/hash/ekara_japan_p.xml
%%DATADIR%%/hash/ekara_japan_s.xml
%%DATADIR%%/hash/ekara_japan_sp.xml
%%DATADIR%%/hash/ekara_japan_web.xml
%%DATADIR%%/hash/ekara_pal.xml
%%DATADIR%%/hash/ekara_us.xml
%%DATADIR%%/hash/electron_cart.xml
%%DATADIR%%/hash/electron_cass.xml
%%DATADIR%%/hash/electron_flop.xml

%%DATADIR%%/hash/exl100.xml
%%DATADIR%%/hash/famicom_cass.xml
%%DATADIR%%/hash/famicom_flop.xml
%%DATADIR%%/hash/fidel_sc6.xml
%%DATADIR%%/hash/fidel_scc.xml
%%DATADIR%%/hash/fm77av.xml
%%DATADIR%%/hash/fm7_cass.xml

%%DATADIR%%/hash/ibm6580.xml
%%DATADIR%%/hash/ibmpcjr_cart.xml
%%DATADIR%%/hash/ibmpcjr_flop.xml
%%DATADIR%%/hash/icanguit.xml
%%DATADIR%%/hash/intellect02.xml
%%DATADIR%%/hash/interact.xml
%%DATADIR%%/hash/interpro.xml
%%DATADIR%%/hash/intv.hsi

%%DATADIR%%/hash/iq151_cart.xml
%%DATADIR%%/hash/iq151_flop.xml
%%DATADIR%%/hash/jaguar.xml
%%DATADIR%%/hash/jakks_gamekey_dp.xml
%%DATADIR%%/hash/jakks_gamekey_dy.xml
%%DATADIR%%/hash/jakks_gamekey_mv.xml
%%DATADIR%%/hash/jakks_gamekey_nk.xml
%%DATADIR%%/hash/jakks_gamekey_nm.xml
%%DATADIR%%/hash/jakks_gamekey_sw.xml
%%DATADIR%%/hash/jpopira_jp.xml
%%DATADIR%%/hash/juicebox.xml
%%DATADIR%%/hash/jupace_cass.xml
%%DATADIR%%/hash/k28m2.xml

%%DATADIR%%/hash/korvet_flop.xml
%%DATADIR%%/hash/lantutor.xml
%%DATADIR%%/hash/laser2001_cart.xml
%%DATADIR%%/hash/leapfrog_leappad_cart.xml
%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml
%%DATADIR%%/hash/leapster.xml
%%DATADIR%%/hash/lisa.xml
%%DATADIR%%/hash/lisa2.xml

%%DATADIR%%/hash/m5_flop.xml
%%DATADIR%%/hash/mac_flop.xml
%%DATADIR%%/hash/mac_hdd.xml
%%DATADIR%%/hash/mac_hdflop.xml
%%DATADIR%%/hash/mbc200.xml
%%DATADIR%%/hash/mbc55x.xml
%%DATADIR%%/hash/mc10.xml

%%DATADIR%%/hash/mo5_qd.xml
%%DATADIR%%/hash/mo6_cass.xml
%%DATADIR%%/hash/mo6_flop.xml
%%DATADIR%%/hash/monon_color.xml
%%DATADIR%%/hash/mpu1000.xml
%%DATADIR%%/hash/mpz80.xml
%%DATADIR%%/hash/msx.hsi

%%DATADIR%%/hash/n64.xml
%%DATADIR%%/hash/n64dd.xml
%%DATADIR%%/hash/nascom_flop.xml
%%DATADIR%%/hash/nascom_snap.xml
%%DATADIR%%/hash/nascom_socket.xml
%%DATADIR%%/hash/neocd.xml
%%DATADIR%%/hash/neogeo.xml

%%DATADIR%%/hash/pcfx.xml
%%DATADIR%%/hash/pcw.xml
%%DATADIR%%/hash/pcw16.xml
%%DATADIR%%/hash/pcx_flop.xml
%%DATADIR%%/hash/pecom_cass.xml
%%DATADIR%%/hash/pegasus_cart.xml
%%DATADIR%%/hash/pencil2.xml

%%DATADIR%%/hash/sc3000_cart.xml
%%DATADIR%%/hash/sc3000_cass.xml
%%DATADIR%%/hash/scv.xml
%%DATADIR%%/hash/sega_beena_cart.xml
%%DATADIR%%/hash/segacd.xml
%%DATADIR%%/hash/sf7000.xml
%%DATADIR%%/hash/sg1000.xml

%%DATADIR%%/hash/vector06_flop.xml
%%DATADIR%%/hash/vectrex.xml
%%DATADIR%%/hash/vg5k.xml
%%DATADIR%%/hash/vgmplay.xml
%%DATADIR%%/hash/vic10.xml
%%DATADIR%%/hash/vic1001_cart.xml
%%DATADIR%%/hash/vic1001_cass.xml

%%DATADIR%%/hash/vip.xml
%%DATADIR%%/hash/visicom.xml
%%DATADIR%%/hash/vixen.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/vtech_storio_cart.xml
%%DATADIR%%/hash/vz_cass.xml
%%DATADIR%%/hash/wangpc.xml
%%DATADIR%%/hash/waveterm.xml

Return to bug 236621

Lines 2-9 Link Here

(-)Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mame	4	PORTNAME?= mame
5	PORTVERSION= 0.200	5	PORTVERSION= 0.207
6	PORTREVISION= 3
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 94-99 Link Here
94	${WRKSRC}/scripts/genie.lua	93	${WRKSRC}/scripts/genie.lua
95	@${GREP} -rl '"png.h"' ${WRKSRC}/src \| ${XARGS} ${REINPLACE_CMD} \	94	@${GREP} -rl '"png.h"' ${WRKSRC}/src \| ${XARGS} ${REINPLACE_CMD} \
96	-e 's\|"png.h"\|"localpng.h"\|'	95	-e 's\|"png.h"\|"localpng.h"\|'
		96	@${REINPLACE_CMD} -e 's\|"util/png.h"\|"util/localpng.h"\|' \
		97	${WRKSRC}/src/frontend/mame/ui/icorender.cpp
97	@${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h	98	@${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h
98		99
99	do-install:	100	do-install:

Line 0 Link Here

(-)files/patch-3rdparty_asio_include_asio_detail_config.hpp (+13 lines)
	1	--- 3rdparty/asio/include/asio/detail/config.hpp.orig 2019-02-26 14:40:05.000000000 +0100
	2	+++ 3rdparty/asio/include/asio/detail/config.hpp 2019-03-05 20:58:53.857248000 +0100
	3	@@ -713,8 +713,9 @@
	4	# define ASIO_HAS_STD_STRING_VIEW 1
	5	# endif
	6	# endif
	7	-# if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include(<experimental/string_view>)
	8	+# if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include(<string_view>)
	9	# define ASIO_HAS_STD_STRING_VIEW 1
	10	+# elif __has_include(<experimental/string_view>)
	11	# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
	12	# endif // __has_include(<experimental/string_view>)
	13	# endif // (__cplusplus >= 201103)

Lines 1-15 Link Here

(-)files/patch-asio-libc++7 (-15 lines)
1	https://github.com/boostorg/asio/commit/b5b17a67f0aa29f5156324d5e8a73dd8669a5a51
2
3	--- 3rdparty/asio/include/asio/detail/config.hpp.orig 2018-07-24 19:45:05 UTC
4	+++ 3rdparty/asio/include/asio/detail/config.hpp
5	@@ -708,8 +708,9 @@
6	# if !defined(ASIO_DISABLE_STD_STRING_VIEW)
7	# if defined(__clang__)
8	# if (__cplusplus >= 201103)
9	-# if __has_include(<experimental/string_view>)
10	+# if __has_include(<string_view>)
11	# define ASIO_HAS_STD_STRING_VIEW 1
12	+# elif __has_include(<experimental/string_view>)
13	# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
14	# endif // __has_include(<experimental/string_view>)
15	# endif // (__cplusplus >= 201103)

Lines 1-21 Link Here

(-)files/patch-scripts_toolchain.lua (-21 lines)
1	--- scripts/toolchain.lua.orig 2018-02-27 15:59:06 UTC
2	+++ scripts/toolchain.lua
3	@@ -23,6 +23,7 @@ newoption {
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 @@ function toolchain(_buildDir, _subDir)
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-110 Link Here

(-)files/patch-src__osd__eigccx86.h (-110 lines)
1	--- src/osd/eigccx86.h.orig 2018-02-27 15:59:06 UTC
2	+++ src/osd/eigccx86.h
3	@@ -31,7 +31,7 @@
4	multiply and return the full 64 bit result
5	-------------------------------------------------*/
6
7	-#ifndef __x86_64__
8	+#if !defined(__amd64__) && !defined(__x86_64__)
9	#define mul_32x32 _mul_32x32
10	inline int64_t ATTR_CONST ATTR_FORCE_INLINE
11	_mul_32x32(int32_t a, int32_t b)
12	@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b)
13	result
14	-------------------------------------------------*/
15
16	-#ifndef __x86_64__
17	+#if !defined(__amd64__) && !defined(__x86_64__)
18	#define mulu_32x32 _mulu_32x32
19	inline uint64_t ATTR_CONST ATTR_FORCE_INLINE
20	_mulu_32x32(uint32_t a, uint32_t b)
21	@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b)
22	result to 32 bits
23	-------------------------------------------------*/
24
25	-#ifndef __x86_64__
26	+#if !defined(__amd64__) && !defined(__x86_64__)
27	#define mul_32x32_shift _mul_32x32_shift
28	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
29	_mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
30	@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, u
31	result to 32 bits
32	-------------------------------------------------*/
33
34	-#ifndef __x86_64__
35	+#if !defined(__amd64__) && !defined(__x86_64__)
36	#define mulu_32x32_shift _mulu_32x32_shift
37	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
38	_mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
39	@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b
40	divide and return the 32 bit quotient
41	-------------------------------------------------*/
42
43	-#ifndef __x86_64__
44	+#if !defined(__amd64__) && !defined(__x86_64__)
45	#define div_64x32 _div_64x32
46	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
47	_div_64x32(int64_t a, int32_t b)
48	@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b)
49	divide and return the 32 bit quotient
50	-------------------------------------------------*/
51
52	-#ifndef __x86_64__
53	+#if !defined(__amd64__) && !defined(__x86_64__)
54	#define divu_64x32 _divu_64x32
55	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
56	_divu_64x32(uint64_t a, uint32_t b)
57	@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE
58	_div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder)
59	{
60	int32_t quotient;
61	-#ifndef __x86_64__
62	+#if !defined(__amd64__) && !defined(__x86_64__)
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__
71	+#if !defined(__amd64__) && !defined(__x86_64__)
72
73	// Throws arithmetic exception if result doesn't fit in 32 bits
74	__asm__ (
75	@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint3
76	division, and returning the 32 bit quotient
77	-------------------------------------------------*/
78
79	-#ifndef __x86_64__
80	+#if !defined(__amd64__) && !defined(__x86_64__)
81	#define div_32x32_shift _div_32x32_shift
82	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
83	_div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
84	@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, u
85	division, and returning the 32 bit quotient
86	-------------------------------------------------*/
87
88	-#ifndef __x86_64__
89	+#if !defined(__amd64__) && !defined(__x86_64__)
90	#define divu_32x32_shift _divu_32x32_shift
91	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
92	_divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
93	@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b
94	divide and return the 32 bit remainder
95	-------------------------------------------------*/
96
97	-#ifndef __x86_64__
98	+#if !defined(__amd64__) && !defined(__x86_64__)
99	#define mod_64x32 _mod_64x32
100	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
101	_mod_64x32(int64_t a, int32_t b)
102	@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b)
103	divide and return the 32 bit remainder
104	-------------------------------------------------*/
105
106	-#ifndef __x86_64__
107	+#if !defined(__amd64__) && !defined(__x86_64__)
108	#define modu_64x32 _modu_64x32
109	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
110	_modu_64x32(uint64_t a, uint32_t b)

Lines 1-102 Link Here

(-)files/patch-src_lib_netlist_plib_pparser.cpp (-102 lines)
1	--- src/lib/netlist/plib/pparser.cpp.orig 2018-02-27 15:59:06 UTC
2	+++ src/lib/netlist/plib/pparser.cpp
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

(-)files/patch-src_lib_netlist_plib_pparser.h (-13 lines)
1	--- src/lib/netlist/plib/pparser.h.orig 2018-02-27 15:59:06 UTC
2	+++ src/lib/netlist/plib/pparser.h
3	@@ -118,8 +118,8 @@ protected:
4	private:
5	void skipeol();
6
7	- pstring::code_t getc();
8	- void ungetc(pstring::code_t c);
9	+ pstring::code_t mame_getc();
10	+ void mame_ungetc(pstring::code_t c);
11
12	bool eof() { return m_strm.eof(); }
13

Lines 86-97 Link Here

(-)pkg-plist (-2 / +40 lines)
86	%%DATADIR%%/hash/apogee.xml	86	%%DATADIR%%/hash/apogee.xml
87	%%DATADIR%%/hash/apollo_ctape.xml	87	%%DATADIR%%/hash/apollo_ctape.xml
88	%%DATADIR%%/hash/apple1.xml	88	%%DATADIR%%/hash/apple1.xml
89	%%DATADIR%%/hash/apple2.xml
90	%%DATADIR%%/hash/apple2_cass.xml	89	%%DATADIR%%/hash/apple2_cass.xml
		90	%%DATADIR%%/hash/apple2_flop_clcracked.xml
		91	%%DATADIR%%/hash/apple2_flop_misc.xml
		92	%%DATADIR%%/hash/apple2_flop_orig.xml
91	%%DATADIR%%/hash/apple2gs.xml	93	%%DATADIR%%/hash/apple2gs.xml
92	%%DATADIR%%/hash/apple3.xml	94	%%DATADIR%%/hash/apple3.xml
93	%%DATADIR%%/hash/apricot_flop.xml	95	%%DATADIR%%/hash/apricot_flop.xml
94	%%DATADIR%%/hash/aquarius.xml	96	%%DATADIR%%/hash/aquarius.xml
		97	%%DATADIR%%/hash/arb.xml
95	%%DATADIR%%/hash/arcadia.xml	98	%%DATADIR%%/hash/arcadia.xml
96	%%DATADIR%%/hash/archimedes.xml	99	%%DATADIR%%/hash/archimedes.xml
97	%%DATADIR%%/hash/astrocde.xml	100	%%DATADIR%%/hash/astrocde.xml
Lines 108-113 Link Here
108	%%DATADIR%%/hash/bbc_flop_arm.xml	111	%%DATADIR%%/hash/bbc_flop_arm.xml
109	%%DATADIR%%/hash/bbc_flop_torch.xml	112	%%DATADIR%%/hash/bbc_flop_torch.xml
110	%%DATADIR%%/hash/bbc_flop_z80.xml	113	%%DATADIR%%/hash/bbc_flop_z80.xml
		114	%%DATADIR%%/hash/bbc_rom.xml
111	%%DATADIR%%/hash/bbca_cass.xml	115	%%DATADIR%%/hash/bbca_cass.xml
112	%%DATADIR%%/hash/bbcb_cass.xml	116	%%DATADIR%%/hash/bbcb_cass.xml
113	%%DATADIR%%/hash/bbcb_cass_de.xml	117	%%DATADIR%%/hash/bbcb_cass_de.xml
Lines 128-133 Link Here
128	%%DATADIR%%/hash/c128_cart.xml	132	%%DATADIR%%/hash/c128_cart.xml
129	%%DATADIR%%/hash/c128_flop.xml	133	%%DATADIR%%/hash/c128_flop.xml
130	%%DATADIR%%/hash/c128_rom.xml	134	%%DATADIR%%/hash/c128_rom.xml
		135	%%DATADIR%%/hash/c2color_cart.xml
131	%%DATADIR%%/hash/c64_cart.xml	136	%%DATADIR%%/hash/c64_cart.xml
132	%%DATADIR%%/hash/c64_cass.xml	137	%%DATADIR%%/hash/c64_cass.xml
133	%%DATADIR%%/hash/c64_flop.xml	138	%%DATADIR%%/hash/c64_flop.xml
Lines 147-152 Link Here
147	%%DATADIR%%/hash/cgenie_flop_rom.xml	152	%%DATADIR%%/hash/cgenie_flop_rom.xml
148	%%DATADIR%%/hash/channelf.xml	153	%%DATADIR%%/hash/channelf.xml
149	%%DATADIR%%/hash/chessmstdm.xml	154	%%DATADIR%%/hash/chessmstdm.xml
		155	%%DATADIR%%/hash/clickstart_cart.xml
150	%%DATADIR%%/hash/coco_cart.xml	156	%%DATADIR%%/hash/coco_cart.xml
151	%%DATADIR%%/hash/coco_flop.xml	157	%%DATADIR%%/hash/coco_flop.xml
152	%%DATADIR%%/hash/coleco.xml	158	%%DATADIR%%/hash/coleco.xml
Lines 174-179 Link Here
174	%%DATADIR%%/hash/e01_flop.xml	180	%%DATADIR%%/hash/e01_flop.xml
175	%%DATADIR%%/hash/ec1841.xml	181	%%DATADIR%%/hash/ec1841.xml
176	%%DATADIR%%/hash/einstein.xml	182	%%DATADIR%%/hash/einstein.xml
		183	%%DATADIR%%/hash/ekara_japan.xml
		184	%%DATADIR%%/hash/ekara_japan_a.xml
		185	%%DATADIR%%/hash/ekara_japan_bh.xml
		186	%%DATADIR%%/hash/ekara_japan_d.xml
		187	%%DATADIR%%/hash/ekara_japan_en.xml
		188	%%DATADIR%%/hash/ekara_japan_g.xml
		189	%%DATADIR%%/hash/ekara_japan_gk.xml
		190	%%DATADIR%%/hash/ekara_japan_m.xml
		191	%%DATADIR%%/hash/ekara_japan_p.xml
		192	%%DATADIR%%/hash/ekara_japan_s.xml
		193	%%DATADIR%%/hash/ekara_japan_sp.xml
		194	%%DATADIR%%/hash/ekara_japan_web.xml
		195	%%DATADIR%%/hash/ekara_pal.xml
		196	%%DATADIR%%/hash/ekara_us.xml
177	%%DATADIR%%/hash/electron_cart.xml	197	%%DATADIR%%/hash/electron_cart.xml
178	%%DATADIR%%/hash/electron_cass.xml	198	%%DATADIR%%/hash/electron_cass.xml
179	%%DATADIR%%/hash/electron_flop.xml	199	%%DATADIR%%/hash/electron_flop.xml
Lines 186-191 Link Here
186	%%DATADIR%%/hash/exl100.xml	206	%%DATADIR%%/hash/exl100.xml
187	%%DATADIR%%/hash/famicom_cass.xml	207	%%DATADIR%%/hash/famicom_cass.xml
188	%%DATADIR%%/hash/famicom_flop.xml	208	%%DATADIR%%/hash/famicom_flop.xml
		209	%%DATADIR%%/hash/fidel_sc6.xml
189	%%DATADIR%%/hash/fidel_scc.xml	210	%%DATADIR%%/hash/fidel_scc.xml
190	%%DATADIR%%/hash/fm77av.xml	211	%%DATADIR%%/hash/fm77av.xml
191	%%DATADIR%%/hash/fm7_cass.xml	212	%%DATADIR%%/hash/fm7_cass.xml
Lines 234-239 Link Here
234	%%DATADIR%%/hash/ibm6580.xml	255	%%DATADIR%%/hash/ibm6580.xml
235	%%DATADIR%%/hash/ibmpcjr_cart.xml	256	%%DATADIR%%/hash/ibmpcjr_cart.xml
236	%%DATADIR%%/hash/ibmpcjr_flop.xml	257	%%DATADIR%%/hash/ibmpcjr_flop.xml
		258	%%DATADIR%%/hash/icanguit.xml
		259	%%DATADIR%%/hash/intellect02.xml
237	%%DATADIR%%/hash/interact.xml	260	%%DATADIR%%/hash/interact.xml
238	%%DATADIR%%/hash/interpro.xml	261	%%DATADIR%%/hash/interpro.xml
239	%%DATADIR%%/hash/intv.hsi	262	%%DATADIR%%/hash/intv.hsi
Lines 243-248 Link Here
243	%%DATADIR%%/hash/iq151_cart.xml	266	%%DATADIR%%/hash/iq151_cart.xml
244	%%DATADIR%%/hash/iq151_flop.xml	267	%%DATADIR%%/hash/iq151_flop.xml
245	%%DATADIR%%/hash/jaguar.xml	268	%%DATADIR%%/hash/jaguar.xml
		269	%%DATADIR%%/hash/jakks_gamekey_dp.xml
		270	%%DATADIR%%/hash/jakks_gamekey_dy.xml
		271	%%DATADIR%%/hash/jakks_gamekey_mv.xml
		272	%%DATADIR%%/hash/jakks_gamekey_nk.xml
		273	%%DATADIR%%/hash/jakks_gamekey_nm.xml
		274	%%DATADIR%%/hash/jakks_gamekey_sw.xml
		275	%%DATADIR%%/hash/jpopira_jp.xml
246	%%DATADIR%%/hash/juicebox.xml	276	%%DATADIR%%/hash/juicebox.xml
247	%%DATADIR%%/hash/jupace_cass.xml	277	%%DATADIR%%/hash/jupace_cass.xml
248	%%DATADIR%%/hash/k28m2.xml	278	%%DATADIR%%/hash/k28m2.xml
Lines 254-259 Link Here
254	%%DATADIR%%/hash/korvet_flop.xml	284	%%DATADIR%%/hash/korvet_flop.xml
255	%%DATADIR%%/hash/lantutor.xml	285	%%DATADIR%%/hash/lantutor.xml
256	%%DATADIR%%/hash/laser2001_cart.xml	286	%%DATADIR%%/hash/laser2001_cart.xml
		287	%%DATADIR%%/hash/leapfrog_leappad_cart.xml
		288	%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml
257	%%DATADIR%%/hash/leapster.xml	289	%%DATADIR%%/hash/leapster.xml
258	%%DATADIR%%/hash/lisa.xml	290	%%DATADIR%%/hash/lisa.xml
259	%%DATADIR%%/hash/lisa2.xml	291	%%DATADIR%%/hash/lisa2.xml
Lines 265-270 Link Here
265	%%DATADIR%%/hash/m5_flop.xml	297	%%DATADIR%%/hash/m5_flop.xml
266	%%DATADIR%%/hash/mac_flop.xml	298	%%DATADIR%%/hash/mac_flop.xml
267	%%DATADIR%%/hash/mac_hdd.xml	299	%%DATADIR%%/hash/mac_hdd.xml
		300	%%DATADIR%%/hash/mac_hdflop.xml
268	%%DATADIR%%/hash/mbc200.xml	301	%%DATADIR%%/hash/mbc200.xml
269	%%DATADIR%%/hash/mbc55x.xml	302	%%DATADIR%%/hash/mbc55x.xml
270	%%DATADIR%%/hash/mc10.xml	303	%%DATADIR%%/hash/mc10.xml
Lines 289-294 Link Here
289	%%DATADIR%%/hash/mo5_qd.xml	322	%%DATADIR%%/hash/mo5_qd.xml
290	%%DATADIR%%/hash/mo6_cass.xml	323	%%DATADIR%%/hash/mo6_cass.xml
291	%%DATADIR%%/hash/mo6_flop.xml	324	%%DATADIR%%/hash/mo6_flop.xml
		325	%%DATADIR%%/hash/monon_color.xml
292	%%DATADIR%%/hash/mpu1000.xml	326	%%DATADIR%%/hash/mpu1000.xml
293	%%DATADIR%%/hash/mpz80.xml	327	%%DATADIR%%/hash/mpz80.xml
294	%%DATADIR%%/hash/msx.hsi	328	%%DATADIR%%/hash/msx.hsi
Lines 313-318 Link Here
313	%%DATADIR%%/hash/n64.xml	347	%%DATADIR%%/hash/n64.xml
314	%%DATADIR%%/hash/n64dd.xml	348	%%DATADIR%%/hash/n64dd.xml
315	%%DATADIR%%/hash/nascom_flop.xml	349	%%DATADIR%%/hash/nascom_flop.xml
		350	%%DATADIR%%/hash/nascom_snap.xml
316	%%DATADIR%%/hash/nascom_socket.xml	351	%%DATADIR%%/hash/nascom_socket.xml
317	%%DATADIR%%/hash/neocd.xml	352	%%DATADIR%%/hash/neocd.xml
318	%%DATADIR%%/hash/neogeo.xml	353	%%DATADIR%%/hash/neogeo.xml
Lines 358-363 Link Here
358	%%DATADIR%%/hash/pcfx.xml	393	%%DATADIR%%/hash/pcfx.xml
359	%%DATADIR%%/hash/pcw.xml	394	%%DATADIR%%/hash/pcw.xml
360	%%DATADIR%%/hash/pcw16.xml	395	%%DATADIR%%/hash/pcw16.xml
		396	%%DATADIR%%/hash/pcx_flop.xml
361	%%DATADIR%%/hash/pecom_cass.xml	397	%%DATADIR%%/hash/pecom_cass.xml
362	%%DATADIR%%/hash/pegasus_cart.xml	398	%%DATADIR%%/hash/pegasus_cart.xml
363	%%DATADIR%%/hash/pencil2.xml	399	%%DATADIR%%/hash/pencil2.xml
Lines 420-425 Link Here
420	%%DATADIR%%/hash/sc3000_cart.xml	456	%%DATADIR%%/hash/sc3000_cart.xml
421	%%DATADIR%%/hash/sc3000_cass.xml	457	%%DATADIR%%/hash/sc3000_cass.xml
422	%%DATADIR%%/hash/scv.xml	458	%%DATADIR%%/hash/scv.xml
		459	%%DATADIR%%/hash/sega_beena_cart.xml
423	%%DATADIR%%/hash/segacd.xml	460	%%DATADIR%%/hash/segacd.xml
424	%%DATADIR%%/hash/sf7000.xml	461	%%DATADIR%%/hash/sf7000.xml
425	%%DATADIR%%/hash/sg1000.xml	462	%%DATADIR%%/hash/sg1000.xml
Lines 504-509 Link Here
504	%%DATADIR%%/hash/vector06_flop.xml	541	%%DATADIR%%/hash/vector06_flop.xml
505	%%DATADIR%%/hash/vectrex.xml	542	%%DATADIR%%/hash/vectrex.xml
506	%%DATADIR%%/hash/vg5k.xml	543	%%DATADIR%%/hash/vg5k.xml
		544	%%DATADIR%%/hash/vgmplay.xml
507	%%DATADIR%%/hash/vic10.xml	545	%%DATADIR%%/hash/vic10.xml
508	%%DATADIR%%/hash/vic1001_cart.xml	546	%%DATADIR%%/hash/vic1001_cart.xml
509	%%DATADIR%%/hash/vic1001_cass.xml	547	%%DATADIR%%/hash/vic1001_cass.xml
Lines 514-524 Link Here
514	%%DATADIR%%/hash/vip.xml	552	%%DATADIR%%/hash/vip.xml
515	%%DATADIR%%/hash/visicom.xml	553	%%DATADIR%%/hash/visicom.xml
516	%%DATADIR%%/hash/vixen.xml	554	%%DATADIR%%/hash/vixen.xml
517	%%DATADIR%%/hash/vreader.xml
518	%%DATADIR%%/hash/vsmile_cart.xml	555	%%DATADIR%%/hash/vsmile_cart.xml
519	%%DATADIR%%/hash/vsmile_cd.xml	556	%%DATADIR%%/hash/vsmile_cd.xml
520	%%DATADIR%%/hash/vsmileb_cart.xml	557	%%DATADIR%%/hash/vsmileb_cart.xml
521	%%DATADIR%%/hash/vsmilem_cart.xml	558	%%DATADIR%%/hash/vsmilem_cart.xml
		559	%%DATADIR%%/hash/vtech_storio_cart.xml
522	%%DATADIR%%/hash/vz_cass.xml	560	%%DATADIR%%/hash/vz_cass.xml
523	%%DATADIR%%/hash/wangpc.xml	561	%%DATADIR%%/hash/wangpc.xml
524	%%DATADIR%%/hash/waveterm.xml	562	%%DATADIR%%/hash/waveterm.xml