Update mame/mess to 0.166

PR:		203509, 203510
Submitted by:	Paul Boehmer <freebsd at never4evil.com>
This commit is contained in:
Guido Falsi 2015-10-24 11:13:16 +00:00
parent 84f22b5968
commit 44f13dd9ba
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=400117
7 changed files with 86 additions and 24 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mame
PORTVERSION= 0.161
PORTVERSION= 0.166
PORTREVISION?= 0
CATEGORIES= emulators
@ -21,33 +21,31 @@ GH_ACCOUNT= mamedev
GH_PROJECT= mame # explicit (master port)
GH_TAGNAME= mame${PORTVERSION:S/.//}
# base clang fails with signal during build (!)
USE_GCC= yes
USES= gmake jpeg pkgconfig python:2,build shebangfix
SHEBANG_FILES= src/emu/cpu/m6502/m6502make.py \
src/emu/cpu/m6809/m6809make.py \
src/emu/cpu/mcs96/mcs96make.py \
src/emu/cpu/tms57002/tmsmake.py \
USES= compiler:c11 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
USE_XORG= xext xi xinerama xrender x11
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
CFLAGS+= -I${LOCALBASE}/include
MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \
LD="${CXX}" PYTHON="${PYTHON_CMD}" SDL_LIBVER="sdl2" \
OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
TARGET="${MTARGET}" FULLNAME="mame" SDL_NETWORK="pcap"
TARGET="${MTARGET}" SUBTARGET="${MSUBTARGET}" FULLNAME="mame" SDL_NETWORK="pcap"
MAKE_ARGS= TARGETOS=freebsd VERBOSE=1 TOOLS=1
MAKEFILE= makefile
GENIE= ${WRKSRC}/3rdparty/genie
PORTDOCS= *
PORTEXAMPLES= ${MTARGET}.ini
PORTEXAMPLES= ${MSUBTARGET}.ini
SUB_FILES= pkg-message target.ini
SUB_LIST= MTARGET=${MTARGET}
SUB_LIST= MTARGET=${MTARGET} MSUBTARGET=${MSUBTARGET}
OPTIONS_DEFINE= DEBUG DOCS EXAMPLES
DEBUG_MAKE_ENV= DEBUG=1
@ -56,9 +54,9 @@ DEBUG_MAKE_ENV= DEBUG=1
.if ${ARCH} == amd64
MAKE_ARGS+= PTR64=1
EMULATOR= ${MTARGET}64
EMULATOR= ${MSUBTARGET}64
.else
EMULATOR= ${MTARGET}
EMULATOR= ${MSUBTARGET}
.endif
PLIST_SUB= EMULATOR=${EMULATOR}
@ -97,15 +95,15 @@ do-install:
@${MKDIR} ${STAGEDIR}${DATADIR} \
${STAGEDIR}${DOCSDIR} \
${STAGEDIR}${EXAMPLESDIR} \
${STAGEDIR}${PREFIX}/libexec/${MTARGET}
${STAGEDIR}${PREFIX}/libexec/${MSUBTARGET}
${INSTALL_PROGRAM} ${WRKSRC}/${EMULATOR} ${STAGEDIR}${PREFIX}/bin
.if ${MTARGET:Mmame}
.if ${MSUBTARGET:Mmame}
(cd ${WRKSRC} && \
${INSTALL_PROGRAM} chdman jedutil ldresample ldverify \
romcmp testkeys unidasm \
${STAGEDIR}${PREFIX}/libexec/mame)
.endif
.if ${MTARGET:Mmess}
.if ${MSUBTARGET:Mmess}
(cd ${WRKSRC} && ${INSTALL_PROGRAM} castool chdman imgtool jedutil \
ldresample ldverify romcmp testkeys unidasm \
${STAGEDIR}${PREFIX}/libexec/mess)
@ -116,6 +114,6 @@ do-install:
${COPYTREE_SHARE} keymaps ${STAGEDIR}${DATADIR})
(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
${INSTALL_DATA} ${WRKDIR}/target.ini \
${STAGEDIR}${EXAMPLESDIR}/${MTARGET}.ini
${STAGEDIR}${EXAMPLESDIR}/${MSUBTARGET}.ini
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (mamedev-mame-0.161-mame0161_GH0.tar.gz) = f7db934676e90d0d7f2b678ccf32e580417c754dd33117ec683560956c2130b9
SIZE (mamedev-mame-0.161-mame0161_GH0.tar.gz) = 86902164
SHA256 (mamedev-mame-0.166-mame0166_GH0.tar.gz) = 702a2019a05afd7f050db6b38c3aaee4cc46ec2214cecaed3420889a685637f4
SIZE (mamedev-mame-0.166-mame0166_GH0.tar.gz) = 87951133

View File

@ -0,0 +1,12 @@
--- 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

View File

@ -0,0 +1,25 @@
--- 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

View File

@ -6,7 +6,9 @@ libexec/mame/ldverify
libexec/mame/romcmp
libexec/mame/testkeys
libexec/mame/unidasm
%%DATADIR%%/artwork/aperture.png
%%DATADIR%%/artwork/adapture-grill.png
%%DATADIR%%/artwork/shadow-mask.png
%%DATADIR%%/artwork/slot-mask.png
%%DATADIR%%/artwork/white.png
%%DATADIR%%/hash/32x.xml
%%DATADIR%%/hash/3do_m2.xml
@ -62,9 +64,12 @@ libexec/mame/unidasm
%%DATADIR%%/hash/b2m.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/bbcbc.xml
%%DATADIR%%/hash/bbcm_cart.xml
%%DATADIR%%/hash/bbcm_cass.xml
%%DATADIR%%/hash/bbcmc_flop.xml
%%DATADIR%%/hash/bk0010.xml
%%DATADIR%%/hash/bml3_flop.xml
%%DATADIR%%/hash/bw12.xml
@ -76,6 +81,7 @@ libexec/mame/unidasm
%%DATADIR%%/hash/c64_cart.xml
%%DATADIR%%/hash/c64_cass.xml
%%DATADIR%%/hash/c64_flop.xml
%%DATADIR%%/hash/c65_flop.xml
%%DATADIR%%/hash/casloopy.xml
%%DATADIR%%/hash/cbm2_cart.xml
%%DATADIR%%/hash/cbm2_flop.xml
@ -125,6 +131,7 @@ libexec/mame/unidasm
%%DATADIR%%/hash/gamecom.xml
%%DATADIR%%/hash/gamegear.xml
%%DATADIR%%/hash/gameking.xml
%%DATADIR%%/hash/gameking3.xml
%%DATADIR%%/hash/gamepock.xml
%%DATADIR%%/hash/gba.xml
%%DATADIR%%/hash/gbcolor.xml
@ -136,12 +143,14 @@ libexec/mame/unidasm
%%DATADIR%%/hash/glcolor.xml
%%DATADIR%%/hash/gmaster.xml
%%DATADIR%%/hash/gp32.xml
%%DATADIR%%/hash/guab.xml
%%DATADIR%%/hash/gx4000.xml
%%DATADIR%%/hash/horizon.xml
%%DATADIR%%/hash/hp9835a_rom.xml
%%DATADIR%%/hash/hp9845a_rom.xml
%%DATADIR%%/hash/hp9845b_rom.xml
%%DATADIR%%/hash/ht68k.xml
%%DATADIR%%/hash/i7000_card.xml
%%DATADIR%%/hash/ibm5140.xml
%%DATADIR%%/hash/ibm5150.xml
%%DATADIR%%/hash/ibm5150_cass.xml
@ -215,6 +224,8 @@ libexec/mame/unidasm
%%DATADIR%%/hash/mz800_cass.xml
%%DATADIR%%/hash/n64.xml
%%DATADIR%%/hash/n64dd.xml
%%DATADIR%%/hash/nascom_flop.xml
%%DATADIR%%/hash/nascom_socket.xml
%%DATADIR%%/hash/neocd.xml
%%DATADIR%%/hash/neogeo.xml
%%DATADIR%%/hash/nes.hsi
@ -268,6 +279,7 @@ libexec/mame/unidasm
%%DATADIR%%/hash/plus4_flop.xml
%%DATADIR%%/hash/pmd85_cass.xml
%%DATADIR%%/hash/pokemini.xml
%%DATADIR%%/hash/pro128_cart.xml
%%DATADIR%%/hash/prof180.xml
%%DATADIR%%/hash/prof80.xml
%%DATADIR%%/hash/psion1.xml
@ -344,6 +356,7 @@ libexec/mame/unidasm
%%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/to7_cart.xml
%%DATADIR%%/hash/trs80m2.xml

View File

@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= mess
MTARGET= mess
MTARGET= mame
MSUBTARGET= mess
COMMENT= Multiple Emulator Super System
MASTERDIR= ${.CURDIR}/../mame

View File

@ -8,7 +8,9 @@ libexec/mess/ldverify
libexec/mess/romcmp
libexec/mess/testkeys
libexec/mess/unidasm
%%DATADIR%%/artwork/aperture.png
%%DATADIR%%/artwork/adapture-grill.png
%%DATADIR%%/artwork/shadow-mask.png
%%DATADIR%%/artwork/slot-mask.png
%%DATADIR%%/artwork/white.png
%%DATADIR%%/hash/32x.xml
%%DATADIR%%/hash/3do_m2.xml
@ -64,9 +66,12 @@ libexec/mess/unidasm
%%DATADIR%%/hash/b2m.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/bbcbc.xml
%%DATADIR%%/hash/bbcm_cart.xml
%%DATADIR%%/hash/bbcm_cass.xml
%%DATADIR%%/hash/bbcmc_flop.xml
%%DATADIR%%/hash/bk0010.xml
%%DATADIR%%/hash/bml3_flop.xml
%%DATADIR%%/hash/bw12.xml
@ -78,6 +83,7 @@ libexec/mess/unidasm
%%DATADIR%%/hash/c64_cart.xml
%%DATADIR%%/hash/c64_cass.xml
%%DATADIR%%/hash/c64_flop.xml
%%DATADIR%%/hash/c65_flop.xml
%%DATADIR%%/hash/casloopy.xml
%%DATADIR%%/hash/cbm2_cart.xml
%%DATADIR%%/hash/cbm2_flop.xml
@ -127,6 +133,7 @@ libexec/mess/unidasm
%%DATADIR%%/hash/gamecom.xml
%%DATADIR%%/hash/gamegear.xml
%%DATADIR%%/hash/gameking.xml
%%DATADIR%%/hash/gameking3.xml
%%DATADIR%%/hash/gamepock.xml
%%DATADIR%%/hash/gba.xml
%%DATADIR%%/hash/gbcolor.xml
@ -138,12 +145,14 @@ libexec/mess/unidasm
%%DATADIR%%/hash/glcolor.xml
%%DATADIR%%/hash/gmaster.xml
%%DATADIR%%/hash/gp32.xml
%%DATADIR%%/hash/guab.xml
%%DATADIR%%/hash/gx4000.xml
%%DATADIR%%/hash/horizon.xml
%%DATADIR%%/hash/hp9835a_rom.xml
%%DATADIR%%/hash/hp9845a_rom.xml
%%DATADIR%%/hash/hp9845b_rom.xml
%%DATADIR%%/hash/ht68k.xml
%%DATADIR%%/hash/i7000_card.xml
%%DATADIR%%/hash/ibm5140.xml
%%DATADIR%%/hash/ibm5150.xml
%%DATADIR%%/hash/ibm5150_cass.xml
@ -217,6 +226,8 @@ libexec/mess/unidasm
%%DATADIR%%/hash/mz800_cass.xml
%%DATADIR%%/hash/n64.xml
%%DATADIR%%/hash/n64dd.xml
%%DATADIR%%/hash/nascom_flop.xml
%%DATADIR%%/hash/nascom_socket.xml
%%DATADIR%%/hash/neocd.xml
%%DATADIR%%/hash/neogeo.xml
%%DATADIR%%/hash/nes.hsi
@ -270,6 +281,7 @@ libexec/mess/unidasm
%%DATADIR%%/hash/plus4_flop.xml
%%DATADIR%%/hash/pmd85_cass.xml
%%DATADIR%%/hash/pokemini.xml
%%DATADIR%%/hash/pro128_cart.xml
%%DATADIR%%/hash/prof180.xml
%%DATADIR%%/hash/prof80.xml
%%DATADIR%%/hash/psion1.xml
@ -346,6 +358,7 @@ libexec/mess/unidasm
%%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/to7_cart.xml
%%DATADIR%%/hash/trs80m2.xml