Attachment 170559 Details for Bug 205097 – svn diff to mame 0.173

[patch] svn diff to mame 0.173

mame0173-2016-05-22.diff (text/plain), 29.41 KB, created by Steven Wilson on 2016-05-23 00:59:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Wilson

Created: 2016-05-23 00:59:59 UTC

Size: 29.41 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 415532)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME?=	mame
>-PORTVERSION=	0.166
>+PORTVERSION=	0.173
> PORTREVISION?=	0
> CATEGORIES=	emulators
> 
>@@ -9,9 +9,12 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT?=	Multi Arcade Machine Emulator
> 
>+LICENSE=	GPLv2+
>+
> LIB_DEPENDS=	libFLAC.so:audio/flac \
> 		libexpat.so:textproc/expat2 \
>-		libfontconfig.so:x11-fonts/fontconfig
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libuv.so:devel/libuv
> RUN_DEPENDS=	liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf
> 
> NOT_FOR_ARCHS=	ia64 powerpc sparc64
>@@ -21,23 +24,25 @@
> GH_PROJECT=	mame 				# explicit (master port)
> GH_TAGNAME=	mame${PORTVERSION:S/.//}
> 
>-USES=		compiler:c11 gmake jpeg pkgconfig python:2,build shebangfix
>+USES=		compiler:c++14-lang gmake jpeg pkgconfig python:2,build shebangfix
> 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
>+		scripts/build/*.py
> USE_XORG=	x11 xext xi xinerama xrender
> USE_GL=		gl
> USE_SDL=	sdl2 ttf2
>-USE_QT4=	gui moc_build qmake_build
> MTARGET?=	mame
> MSUBTARGET?=	mame
>+CC?=		cc
>+CXX?=		c++
> CFLAGS+=	-I${LOCALBASE}/include
> MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
>-		LD="${CXX}" PYTHON="${PYTHON_CMD}" SDL_LIBVER="sdl2" \
>+		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
> 		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
>-		TARGET="${MTARGET}" SUBTARGET="${MSUBTARGET}" FULLNAME="mame" SDL_NETWORK="pcap"
>+		TARGET="${MTARGET}" SUBTARGET="${MSUBTARGET}" FULLNAME="mame" \
>+		SDL_NETWORK="pcap" USE_SYSTEM_LIB_UV=1
> MAKE_ARGS=	TARGETOS=freebsd VERBOSE=1 TOOLS=1
> MAKEFILE=	makefile
> GENIE=		${WRKSRC}/3rdparty/genie
>@@ -47,21 +52,32 @@
> SUB_FILES=	pkg-message target.ini
> SUB_LIST=	MTARGET=${MTARGET} MSUBTARGET=${MSUBTARGET}
> 
>-OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
>+OPTIONS_DEFINE=		DEBUG QTDEBUG DOCS EXAMPLES
> DEBUG_MAKE_ENV=		DEBUG=1
>+QTDEBUG_DESC=		Enable Qt debugger (debug emulated programs)
>+QTDEBUG_USE=		qt5=gui,widgets,buildtools_build,qmake_build
>+QTDEBUG_MAKE_ENV=	QT_HOME="${QT_PREFIX}/lib/qt5"
>+QTDEBUG_MAKE_ENV_OFF=	USE_QTDEBUG=0
>+QTDEBUG_CFLAGS=		-fPIC
> 
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == amd64
> MAKE_ARGS+=	PTR64=1
>-EMULATOR=	${MSUBTARGET}64
>+EMUBASE=	${MSUBTARGET}64
> .else
>-EMULATOR=	${MSUBTARGET}
>+EMUBASE=	${MSUBTARGET}
> .endif
>+.if ${PORT_OPTIONS:MDEBUG}
>+EMULATOR=	${EMUBASE}d
>+.else
>+EMULATOR=	${EMUBASE}
>+.endif
>+
> PLIST_SUB=	EMULATOR=${EMULATOR}
> 
>-.if ${OPSYS} == FreeBSD && ${OSREL:R} == 8
>-BROKEN=		will not build on FreeBSD 8.x
>+.if ${OPSYS} == FreeBSD && ${OSREL:R} == 9
>+BROKEN=		will not build on FreeBSD 9.x
> .endif
> 
> post-patch:
>@@ -68,28 +84,34 @@
> 	@${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 \
>-		 ${GENIE}/build/gmake.bsd/genie.make
>-	@${REINPLACE_CMD} -e 's|gcc|cc|; s|g++|c++|' \
>+		${WRKSRC}/makefile \
>+		${GENIE}/build/gmake.bsd/genie.make
>+	@${REINPLACE_CMD} -e \
>+		's|ARCHITECTURE := _x64_clang|ARCHITECTURE := _x64|g ; \
>+		 s|ARCHITECTURE := _x86_clang|ARCHITECTURE := _x86|g' \
>+		${WRKSRC}/makefile
>+	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \
> 		${GENIE}/src/actions/codelite/codelite_project.lua \
> 		${GENIE}/src/tools/gcc.lua \
> 		${GENIE}/src/tools/snc.lua \
> 		${GENIE}/tests/test_gmake_cpp.lua
>-	@${REINPLACE_CMD} -e 's|= \"gcc|= \"cc|; s|= \"g++|= \"c++|' \
>+	@${REINPLACE_CMD} -e 's|= \"gcc|= \"${CC}|; s|= \"g++|= \"${CXX}|' \
> 		-e "s|'CXX =|'#CXX =|; s|'CC  =|'#CC  =|; s| .(ARCH)| |g" \
> 		${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}/src/build/png*.py
>+		${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} \
> 		-e 's|"png.h"|"localpng.h"|'
> 	@${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h
>+	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR} \
>@@ -100,18 +122,17 @@
> .if ${MSUBTARGET:Mmame}
> 	(cd ${WRKSRC} && \
> 		${INSTALL_PROGRAM} chdman jedutil ldresample ldverify \
>-		romcmp testkeys unidasm \
>+		romcmp unidasm \
> 		${STAGEDIR}${PREFIX}/libexec/mame)
> .endif
> .if ${MSUBTARGET:Mmess}
> 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} castool chdman imgtool jedutil \
>-		ldresample ldverify romcmp testkeys unidasm \
>+		ldresample ldverify romcmp unidasm \
> 		${STAGEDIR}${PREFIX}/libexec/mess)
> .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} keymaps ${STAGEDIR}${DATADIR})
> 	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
> 	${INSTALL_DATA} ${WRKDIR}/target.ini \
> 		${STAGEDIR}${EXAMPLESDIR}/${MSUBTARGET}.ini
>Index: distinfo
>===================================================================
>--- distinfo	(revision 415532)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mamedev-mame-0.166-mame0166_GH0.tar.gz) = 702a2019a05afd7f050db6b38c3aaee4cc46ec2214cecaed3420889a685637f4
>-SIZE (mamedev-mame-0.166-mame0166_GH0.tar.gz) = 87951133
>+SHA256 (mamedev-mame-0.173-mame0173_GH0.tar.gz) = 499172e28eb53f30b3036a036c3834f0a865d5505f7234aebd49145358621654
>+SIZE (mamedev-mame-0.173-mame0173_GH0.tar.gz) = 98395748
>Index: files/patch-3rdparty_bgfx_3rdparty_ocornut-imgui_imgui__draw.cpp
>===================================================================
>--- files/patch-3rdparty_bgfx_3rdparty_ocornut-imgui_imgui__draw.cpp	(nonexistent)
>+++ files/patch-3rdparty_bgfx_3rdparty_ocornut-imgui_imgui__draw.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- 3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp.orig	2016-04-27 06:13:59 UTC
>++++ 3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp
>+@@ -18,7 +18,7 @@
>+ #include "imgui_internal.h"
>+ 
>+ #include <stdio.h>      // vsnprintf, sscanf, printf
>+-#if !defined(alloca) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>++#if !defined(alloca) && !defined(__DragonFly__)
>+ #ifdef _WIN32
>+ #include <malloc.h>     // alloca
>+ #else
>
>Property changes on: files/patch-3rdparty_bgfx_3rdparty_ocornut-imgui_imgui__draw.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-3rdparty_bx_include_bx_float4__t.h
>===================================================================
>--- files/patch-3rdparty_bx_include_bx_float4__t.h	(revision 415532)
>+++ files/patch-3rdparty_bx_include_bx_float4__t.h	(working copy)
>@@ -1,4 +1,4 @@
>---- 3rdparty/bx/include/bx/float4_t.h.orig	2015-09-30 06:29:01 UTC
>+--- 3rdparty/bx/include/bx/float4_t.h.orig	2016-04-27 06:13:59 UTC
> +++ 3rdparty/bx/include/bx/float4_t.h
> @@ -18,7 +18,8 @@
>  #elif BX_COMPILER_CLANG \
>Index: files/patch-3rdparty_bx_include_bx_platform.h
>===================================================================
>--- files/patch-3rdparty_bx_include_bx_platform.h	(revision 415532)
>+++ files/patch-3rdparty_bx_include_bx_platform.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- 3rdparty/bx/include/bx/platform.h.orig	2015-04-29 06:18:54 UTC
>-+++ 3rdparty/bx/include/bx/platform.h
>-@@ -184,7 +184,7 @@
>- #elif defined(__QNX__)
>- #	undef  BX_PLATFORM_QNX
>- #	define BX_PLATFORM_QNX 1
>--#elif defined(__FreeBSD__)
>-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
>- #	undef  BX_PLATFORM_FREEBSD
>- #	define BX_PLATFORM_FREEBSD 1
>- #else
>
>Property changes on: files/patch-3rdparty_bx_include_bx_platform.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-3rdparty_bx_include_bx_thread.h
>===================================================================
>--- files/patch-3rdparty_bx_include_bx_thread.h	(revision 415532)
>+++ files/patch-3rdparty_bx_include_bx_thread.h	(working copy)
>@@ -1,24 +1,20 @@
>---- 3rdparty/bx/include/bx/thread.h.orig	2015-09-30 06:29:01 UTC
>+--- 3rdparty/bx/include/bx/thread.h.orig	2016-04-27 06:13:59 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
>+@@ -11,6 +11,9 @@
>+ #	if defined(__GLIBC__) && !( (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12) ) )
>+ #		include <sys/prctl.h>
>+ #	endif // defined(__GLIBC__) ...
>++#	if BX_PLATFORM_BSD
>++#		include <pthread_np.h>
>++#	endif // BX_PLATFORM_BSD
>+ #elif BX_PLATFORM_WINRT
>+ using namespace Platform;
>+ using namespace Windows::Foundation;
>+@@ -159,7 +162,7 @@ namespace bx
>+ 			prctl(PR_SET_NAME,_name, 0, 0, 0);
>+ #	endif // defined(__GLIBC__) ...
>+ #elif BX_PLATFORM_BSD
>+-			pthread_setname_np(m_handle, _name);
> +			pthread_set_name_np(m_handle, _name);
>  #elif BX_PLATFORM_WINDOWS && BX_COMPILER_MSVC
>  #	pragma pack(push, 8)
>Index: files/patch-3rdparty_lzma_C_CpuArch.h
>===================================================================
>--- files/patch-3rdparty_lzma_C_CpuArch.h	(revision 415532)
>+++ files/patch-3rdparty_lzma_C_CpuArch.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- 3rdparty/lzma/C/CpuArch.h.orig	2015-05-24 15:52:12 UTC
>-+++ 3rdparty/lzma/C/CpuArch.h
>-@@ -16,7 +16,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITT
>- If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
>- */
>- 
>--#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
>-+#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(__amd64__)
>- #define MY_CPU_AMD64
>- #endif
>- 
>
>Property changes on: files/patch-3rdparty_lzma_C_CpuArch.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-scripts_genie.lua
>===================================================================
>--- files/patch-scripts_genie.lua	(nonexistent)
>+++ files/patch-scripts_genie.lua	(working copy)
>@@ -0,0 +1,28 @@
>+--- scripts/genie.lua.orig	2016-04-27 06:13:59 UTC
>++++ scripts/genie.lua
>+@@ -394,7 +394,7 @@ else
>+ 	LIBTYPE = "StaticLib"
>+ end
>+ 
>+-PYTHON = "python"
>++PYTHON = "/usr/local/bin/python2.7"
>+ 
>+ if _OPTIONS["PYTHON_EXECUTABLE"]~=nil then
>+ 	PYTHON = _OPTIONS["PYTHON_EXECUTABLE"]
>+@@ -977,16 +977,6 @@ end
>+ 					"-Wno-tautological-undefined-compare",
>+ 				}
>+ 			end
>+-		else
>+-			if (version < 40900) then
>+-				print("GCC version 4.9 or later needed")
>+-				os.exit(-1)
>+-			end
>+-				buildoptions {
>+-					"-Wno-unused-result", -- needed for fgets,fread on linux
>+-					-- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds)
>+-					"-Wno-array-bounds",
>+-				}
>+ 		end
>+ 	end
>+ 
>
>Property changes on: files/patch-scripts_genie.lua
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src__osd__eigccx86.h
>===================================================================
>--- files/patch-src__osd__eigccx86.h	(revision 415532)
>+++ files/patch-src__osd__eigccx86.h	(working copy)
>@@ -1,6 +1,6 @@
>---- src/osd/eigccx86.h.orig	2015-05-24 15:52:19 UTC
>+--- src/osd/eigccx86.h.orig	2016-04-27 06:13:59 UTC
> +++ src/osd/eigccx86.h
>-@@ -42,7 +42,7 @@ union _x86_union
>+@@ -39,7 +39,7 @@ union _x86_union
>      multiply and return the full 64 bit result
>  -------------------------------------------------*/
>  
>@@ -7,9 +7,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define mul_32x32 _mul_32x32
>- INLINE INT64 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline INT64 ATTR_CONST ATTR_FORCE_INLINE
>  _mul_32x32(INT32 a, INT32 b)
>-@@ -68,7 +68,7 @@ _mul_32x32(INT32 a, INT32 b)
>+@@ -65,7 +65,7 @@ _mul_32x32(INT32 a, INT32 b)
>      result
>  -------------------------------------------------*/
>  
>@@ -16,9 +16,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define mulu_32x32 _mulu_32x32
>- INLINE UINT64 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline UINT64 ATTR_CONST ATTR_FORCE_INLINE
>  _mulu_32x32(UINT32 a, UINT32 b)
>-@@ -145,7 +145,7 @@ _mulu_32x32_hi(UINT32 a, UINT32 b)
>+@@ -142,7 +142,7 @@ _mulu_32x32_hi(UINT32 a, UINT32 b)
>      result to 32 bits
>  -------------------------------------------------*/
>  
>@@ -25,9 +25,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define mul_32x32_shift _mul_32x32_shift
>- INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
>  _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
>-@@ -175,7 +175,7 @@ _mul_32x32_shift(INT32 a, INT32 b, UINT8
>+@@ -172,7 +172,7 @@ _mul_32x32_shift(INT32 a, INT32 b, UINT8
>      result to 32 bits
>  -------------------------------------------------*/
>  
>@@ -34,9 +34,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define mulu_32x32_shift _mulu_32x32_shift
>- INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
>  _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
>-@@ -203,7 +203,7 @@ _mulu_32x32_shift(UINT32 a, UINT32 b, UI
>+@@ -200,7 +200,7 @@ _mulu_32x32_shift(UINT32 a, UINT32 b, UI
>      divide and return the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -43,9 +43,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define div_64x32 _div_64x32
>- INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
>  _div_64x32(INT64 a, INT32 b)
>-@@ -230,7 +230,7 @@ _div_64x32(INT64 a, INT32 b)
>+@@ -227,7 +227,7 @@ _div_64x32(INT64 a, INT32 b)
>      divide and return the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -52,9 +52,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define divu_64x32 _divu_64x32
>- INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
>  _divu_64x32(UINT64 a, UINT32 b)
>-@@ -258,7 +258,7 @@ _divu_64x32(UINT64 a, UINT32 b)
>+@@ -255,7 +255,7 @@ _divu_64x32(UINT64 a, UINT32 b)
>      32 bit remainder
>  -------------------------------------------------*/
>  
>@@ -61,9 +61,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define div_64x32_rem _div_64x32_rem
>- INLINE INT32 ATTR_FORCE_INLINE
>+ static 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
>+@@ -283,7 +283,7 @@ _div_64x32_rem(INT64 dividend, INT32 div
>      and 32 bit remainder
>  -------------------------------------------------*/
>  
>@@ -70,9 +70,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define divu_64x32_rem _divu_64x32_rem
>- INLINE UINT32 ATTR_FORCE_INLINE
>+ static inline UINT32 ATTR_FORCE_INLINE
>  _divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
>-@@ -337,7 +337,7 @@ _divu_64x32_rem(UINT64 dividend, UINT32 
>+@@ -334,7 +334,7 @@ _divu_64x32_rem(UINT64 dividend, UINT32 
>      division, and returning the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -79,9 +79,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define div_32x32_shift _div_32x32_shift
>- INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
>  _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
>-@@ -369,7 +369,7 @@ _div_32x32_shift(INT32 a, INT32 b, UINT8
>+@@ -366,7 +366,7 @@ _div_32x32_shift(INT32 a, INT32 b, UINT8
>      division, and returning the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -88,9 +88,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define divu_32x32_shift _divu_32x32_shift
>- INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
>  _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
>-@@ -400,7 +400,7 @@ _divu_32x32_shift(UINT32 a, UINT32 b, UI
>+@@ -397,7 +397,7 @@ _divu_32x32_shift(UINT32 a, UINT32 b, UI
>      divide and return the 32 bit remainder
>  -------------------------------------------------*/
>  
>@@ -97,9 +97,9 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define mod_64x32 _mod_64x32
>- INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
>  _mod_64x32(INT64 a, INT32 b)
>-@@ -427,7 +427,7 @@ _mod_64x32(INT64 a, INT32 b)
>+@@ -424,7 +424,7 @@ _mod_64x32(INT64 a, INT32 b)
>      divide and return the 32 bit remainder
>  -------------------------------------------------*/
>  
>@@ -106,23 +106,5 @@
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>  #define modu_64x32 _modu_64x32
>- INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
>+ static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
>  _modu_64x32(UINT64 a, UINT32 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;
>Index: files/patch-src__osd__eminline.h
>===================================================================
>--- files/patch-src__osd__eminline.h	(revision 415532)
>+++ files/patch-src__osd__eminline.h	(working copy)
>@@ -1,9 +1,9 @@
>---- src/osd/eminline.h.orig	2015-05-24 15:52:19 UTC
>+--- src/osd/eminline.h.orig	2016-04-27 06:13:59 UTC
> +++ src/osd/eminline.h
>-@@ -88,7 +88,7 @@ _osd_exchange64(INT64 volatile *ptr, INT
>+@@ -19,7 +19,7 @@
>+ /* we come with implementations for GCC x86 and PPC */
>+ #if defined(__GNUC__)
>  
>- #endif
>- 
> -#if defined(__i386__) || defined(__x86_64__)
> +#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
>  #include "eigccx86.h"
>Index: files/patch-src_lib_netlist_plib_pparser.c
>===================================================================
>--- files/patch-src_lib_netlist_plib_pparser.c	(revision 415532)
>+++ files/patch-src_lib_netlist_plib_pparser.c	(nonexistent)
>@@ -1,102 +0,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);
>
>Property changes on: files/patch-src_lib_netlist_plib_pparser.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_lib_netlist_plib_pparser.h
>===================================================================
>--- files/patch-src_lib_netlist_plib_pparser.h	(revision 415532)
>+++ files/patch-src_lib_netlist_plib_pparser.h	(nonexistent)
>@@ -1,13 +0,0 @@
>---- src/lib/netlist/plib/pparser.h.orig	2015-09-30 06:29:01 UTC
>-+++ src/lib/netlist/plib/pparser.h
>-@@ -120,8 +120,8 @@ protected:
>- private:
>- 	void skipeol();
>- 
>--	pstring::code_t getc();
>--	void ungetc();
>-+	pstring::code_t mame_getc();
>-+	void mame_ungetc();
>- 
>- 	bool eof() { return m_strm.eof(); }
>- 
>
>Property changes on: files/patch-src_lib_netlist_plib_pparser.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_osd_sdl_sdlprefix.h
>===================================================================
>--- files/patch-src_osd_sdl_sdlprefix.h	(revision 415532)
>+++ files/patch-src_osd_sdl_sdlprefix.h	(working copy)
>@@ -1,6 +1,6 @@
>---- src/osd/sdl/sdlprefix.h.orig	2015-04-29 06:18:54 UTC
>+--- src/osd/sdl/sdlprefix.h.orig	2016-04-27 06:13:59 UTC
> +++ src/osd/sdl/sdlprefix.h
>-@@ -50,6 +50,7 @@
>+@@ -49,6 +49,7 @@
>  #define NO_AFFINITY_NP 1
>  #elif defined(__DragonFly__)
>  #define SDLMAME_DRAGONFLY 1
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 415532)
>+++ pkg-plist	(working copy)
>@@ -4,14 +4,24 @@
> libexec/mame/ldresample
> libexec/mame/ldverify
> libexec/mame/romcmp
>-libexec/mame/testkeys
> libexec/mame/unidasm
>-%%DATADIR%%/artwork/adapture-grill.png
>+%%DATADIR%%/artwork/LICENSE
>+%%DATADIR%%/artwork/README.md
>+%%DATADIR%%/artwork/aperture-grille.png
>+%%DATADIR%%/artwork/bgfx/border_blur/default.lay
>+%%DATADIR%%/artwork/bgfx/chains/hq2x.png
>+%%DATADIR%%/artwork/bgfx/chains/hq3x.png
>+%%DATADIR%%/artwork/bgfx/chains/hq4x.png
>+%%DATADIR%%/artwork/monochrome-chessboard.png
>+%%DATADIR%%/artwork/monochrome-matrix.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
>@@ -59,20 +69,34 @@
> %%DATADIR%%/hash/arcadia.xml
> %%DATADIR%%/hash/archimedes.xml
> %%DATADIR%%/hash/astrocde.xml
>-%%DATADIR%%/hash/atom.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_de_cass.xml
>-%%DATADIR%%/hash/bbcb_us_flop.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
>@@ -113,6 +137,7 @@
> %%DATADIR%%/hash/ec1841.xml
> %%DATADIR%%/hash/einstein.xml
> %%DATADIR%%/hash/electron_cart.xml
>+%%DATADIR%%/hash/electron_cass.xml
> %%DATADIR%%/hash/ep64_cart.xml
> %%DATADIR%%/hash/ep64_cass.xml
> %%DATADIR%%/hash/ep64_flop.xml
>@@ -120,6 +145,7 @@
> %%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
>@@ -145,6 +171,7 @@
> %%DATADIR%%/hash/gp32.xml
> %%DATADIR%%/hash/guab.xml
> %%DATADIR%%/hash/gx4000.xml
>+%%DATADIR%%/hash/h21.xml
> %%DATADIR%%/hash/horizon.xml
> %%DATADIR%%/hash/hp9835a_rom.xml
> %%DATADIR%%/hash/hp9845a_rom.xml
>@@ -169,6 +196,7 @@
> %%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
>@@ -183,6 +211,7 @@
> %%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
>@@ -190,6 +219,7 @@
> %%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
>@@ -252,6 +282,7 @@
> %%DATADIR%%/hash/partner_flop.xml
> %%DATADIR%%/hash/pasogo.xml
> %%DATADIR%%/hash/pb2000c.xml
>+%%DATADIR%%/hash/pc1000.xml
> %%DATADIR%%/hash/pc1512.xml
> %%DATADIR%%/hash/pc1640.xml
> %%DATADIR%%/hash/pc8201.xml
>@@ -260,6 +291,7 @@
> %%DATADIR%%/hash/pc88va.xml
> %%DATADIR%%/hash/pc98.xml
> %%DATADIR%%/hash/pce.xml
>+%%DATADIR%%/hash/pce_tourvision.xml
> %%DATADIR%%/hash/pcecd.xml
> %%DATADIR%%/hash/pcw.xml
> %%DATADIR%%/hash/pcw16.xml
>@@ -278,8 +310,11 @@
> %%DATADIR%%/hash/plus4_cass.xml
> %%DATADIR%%/hash/plus4_flop.xml
> %%DATADIR%%/hash/pmd85_cass.xml
>+%%DATADIR%%/hash/pockchalv1.xml
>+%%DATADIR%%/hash/pockchalv2.xml
> %%DATADIR%%/hash/pokemini.xml
> %%DATADIR%%/hash/pro128_cart.xml
>+%%DATADIR%%/hash/pro128s_flop.xml
> %%DATADIR%%/hash/prof180.xml
> %%DATADIR%%/hash/prof80.xml
> %%DATADIR%%/hash/psion1.xml
>@@ -294,6 +329,7 @@
> %%DATADIR%%/hash/ql_cass.xml
> %%DATADIR%%/hash/ql_flop.xml
> %%DATADIR%%/hash/qx10_flop.xml
>+%%DATADIR%%/hash/r9751.xml
> %%DATADIR%%/hash/radio86_cart.xml
> %%DATADIR%%/hash/radio86_cass.xml
> %%DATADIR%%/hash/rainbow.xml
>@@ -318,6 +354,7 @@
> %%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
>@@ -365,6 +402,7 @@
> %%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
>@@ -401,9 +439,17 @@
> %%DATADIR%%/hash/xegs.xml
> %%DATADIR%%/hash/xerox820.xml
> %%DATADIR%%/hash/xerox820ii.xml
>-%%DATADIR%%/keymaps/km-be.txt
>-%%DATADIR%%/keymaps/km-ch.txt
>-%%DATADIR%%/keymaps/km-de.txt
>-%%DATADIR%%/keymaps/km-fr-OSX.txt
>-%%DATADIR%%/keymaps/km-fr.txt
>-%%DATADIR%%/keymaps/km_it.txt
>+%%DATADIR%%/keymaps/LICENSE
>+%%DATADIR%%/keymaps/README.md
>+%%DATADIR%%/keymaps/km_be_LINUX.map
>+%%DATADIR%%/keymaps/km_br_LINUX.map
>+%%DATADIR%%/keymaps/km_ch_LINUX.map
>+%%DATADIR%%/keymaps/km_de_LINUX.map
>+%%DATADIR%%/keymaps/km_es_LINUX.map
>+%%DATADIR%%/keymaps/km_fr_LINUX.map
>+%%DATADIR%%/keymaps/km_fr_OSX.map
>+%%DATADIR%%/keymaps/km_gb_LINUX.map
>+%%DATADIR%%/keymaps/km_it_LINUX.map
>+%%DATADIR%%/keymaps/km_pt_LINUX.map
>+%%DATADIR%%/keymaps/km_se_LINUX.map
>+%%DATADIR%%/keymaps/km_se_OSX.map

Actions: View | Diff

Attachments on bug 205097: 163946 | 170559 | 170560