Attachment 163946 Details for Bug 205097 – svn diff

[patch] svn diff

mame-0.168.diff (text/plain), 2.79 KB, created by Paul Boehmer on 2015-12-07 17:34:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Boehmer

Created: 2015-12-07 17:34:54 UTC

Size: 2.79 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 403214)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME?=	mame
>-PORTVERSION=	0.166
>+PORTVERSION=	0.168
> PORTREVISION?=	0
> CATEGORIES=	emulators
> 
>@@ -26,7 +26,7 @@
> 		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
>@@ -84,7 +84,7 @@
> 		${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} \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 403214)
>+++ 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.168-mame0168_GH0.tar.gz) = 3b6db52ddffed867ae171664e327f0b2bade64139d3450dc7166c4f90b6d94e8
>+SIZE (mamedev-mame-0.168-mame0168_GH0.tar.gz) = 88471983
>Index: files/patch-3rdparty_bx_include_bx_thread.h
>===================================================================
>--- files/patch-3rdparty_bx_include_bx_thread.h	(revision 403214)
>+++ files/patch-3rdparty_bx_include_bx_thread.h	(working copy)
>@@ -1,25 +1,26 @@
>---- 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;
>+--- 3rdparty/bx/include/bx/thread.h-orig	2015-11-16 13:43:22.686731000 -0500
>++++ 3rdparty/bx/include/bx/thread.h	2015-11-16 13:44:10.294191000 -0500
>+@@ -14,6 +14,11 @@
>  using namespace Windows::System::Threading;
>  #endif
>  
> +#if BX_PLATFORM_FREEBSD
>-+#	include <pthread_np.h>
>++#       include <pthread_np.h>
> +#endif
> +
>++
>  #include "sem.h"
>  
>  #if BX_CONFIG_SUPPORTS_THREADING
>-@@ -149,8 +153,10 @@ namespace bx
>+@@ -149,8 +154,10 @@
>  		{
>  #if BX_PLATFORM_OSX || BX_PLATFORM_IOS
>  			pthread_setname_np(_name);
>--#elif BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
>-+#elif BX_PLATFORM_LINUX
>+-#elif (BX_PLATFORM_LINUX && defined(__GLIBC__)) || BX_PLATFORM_FREEBSD
>++#elif (BX_PLATFORM_LINUX && defined(__GLIBC__))
>  			pthread_setname_np(m_handle, _name);
> +#elif BX_PLATFORM_FREEBSD
>-+			pthread_set_name_np(m_handle, _name);
>++                        pthread_set_name_np(m_handle, _name);
>  #elif BX_PLATFORM_WINDOWS && BX_COMPILER_MSVC
>  #	pragma pack(push, 8)
>  			struct ThreadName

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 205097: 163946 | 170559 | 170560