diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 60bf7c773f79..5e5f66cba3dd 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,8 +1,7 @@ # Created by: alepulver PORTNAME?= mame -PORTVERSION= 0.226 -PORTREVISION= 1 +PORTVERSION= 0.243 CATEGORIES= emulators MAINTAINER= manu@FreeBSD.org @@ -21,7 +20,7 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ RUN_DEPENDS= liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf USES= compiler:c++14-lang gl gmake jpeg localbase pkgconfig \ - python:3.7,build qt:5 sdl shebangfix xorg + python:3.7,build qt:5 sdl shebangfix sqlite:3 xorg USE_GITHUB= yes GH_ACCOUNT= mamedev @@ -32,17 +31,20 @@ USE_QT= buildtools core gui qmake_build widgets USE_SDL= sdl2 ttf2 USE_XORG= x11 xext xi xinerama xrender -SHEBANG_FILES= src/devices/cpu/m6502/m6502make.py \ +SHEBANG_FILES= src/devices/cpu/h8/h8make.py \ + src/devices/cpu/m6502/m6502make.py \ + src/devices/cpu/m68000/m68kmake.py \ src/devices/cpu/m6809/m6809make.py \ src/devices/cpu/mcs96/mcs96make.py \ src/devices/cpu/tms57002/tmsmake.py MAKEFILE= makefile -MAKE_ARGS= TARGETOS=freebsd VERBOSE=1 TOOLS=1 USE_SYSTEM_LIB_PUGIXML=1 -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 USE_SYSTEM_LIB_PUGIXML=1 \ + USE_SYSTEM_LIB_SQLITE3=1 +MAKE_ENV= FULLNAME="mame" GCC_LDFLAGS="${LDFLAGS}" LD="${CXX}" \ + NOWERROR=1 OPT_FLAGS="${CXXFLAGS}" PYTHON="${PYTHON_CMD}" \ + PYTHON_EXECUTABLE="${PYTHON_CMD}" SDL_NETWORK="pcap" \ + SUBTARGET="${MSUBTARGET}" TARGET="${MTARGET}" USE_NETWORK=1 MAKE_JOBS_UNSAFE= yes SUB_FILES= pkg-message target.ini @@ -63,10 +65,8 @@ MTARGET?= mame .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*} MAKE_ARGS+= PTR64=1 -EMULATOR= ${MSUBTARGET}64 -.else -EMULATOR= ${MSUBTARGET} .endif +EMULATOR= ${MSUBTARGET} PLIST_SUB+= EMULATOR=${EMULATOR} post-patch: @@ -92,8 +92,10 @@ post-patch: ${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/build/*.py + @${REINPLACE_CMD} -i "" -e "s|/usr/bin/python|${PYTHON_CMD}|" \ + ${WRKSRC}/scripts/build/*.py + @${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_CMD}"|' \ ${WRKSRC}/scripts/genie.lua @${GREP} -rl '"png.h"' ${WRKSRC}/src | ${XARGS} ${REINPLACE_CMD} \ -e 's|"png.h"|"localpng.h"|' diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index 24c58db83691..dbeb371c1630 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608936229 -SHA256 (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 7c4c9ec232ba988e65fd29665c9b8e40b5ac3aa9f561eeb107cebbf08ba94baf -SIZE (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 196379874 +TIMESTAMP = 1651290926 +SHA256 (mamedev-mame-0.243-mame0243_GH0.tar.gz) = 8cddb7d6cee5d736d1ce7ef2022e2d09b5c61bea02b5df7e369010a47a5d2133 +SIZE (mamedev-mame-0.243-mame0243_GH0.tar.gz) = 185402979 diff --git a/emulators/mame/files/patch-src_osd_eminline.h b/emulators/mame/files/patch-src_osd_eminline.h index ca0f71526adf..db643c2cb67a 100644 --- a/emulators/mame/files/patch-src_osd_eminline.h +++ b/emulators/mame/files/patch-src_osd_eminline.h @@ -1,4 +1,4 @@ ---- src/osd/eminline.h.orig 2018-02-27 15:59:06 UTC +--- src/osd/eminline.h.orig 2022-04-29 05:37:26 UTC +++ src/osd/eminline.h @@ -21,7 +21,7 @@ diff --git a/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h b/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h index 1dce6ab01d76..aef78617bc07 100644 --- a/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h +++ b/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h @@ -1,7 +1,10 @@ ---- src/osd/sdl/sdlprefix.h.orig 2018-02-27 15:59:06 UTC +--- src/osd/sdl/sdlprefix.h.orig 2022-04-29 05:37:26 UTC +++ src/osd/sdl/sdlprefix.h -@@ -48,6 +48,7 @@ - #define NO_AFFINITY_NP 1 +@@ -45,9 +45,9 @@ + + #elif defined(__FreeBSD__) + #define SDLMAME_FREEBSD 1 +-#define NO_AFFINITY_NP 1 #elif defined(__DragonFly__) #define SDLMAME_DRAGONFLY 1 +#define NO_AFFINITY_NP 1 diff --git a/emulators/mame/files/pkg-message.in b/emulators/mame/files/pkg-message.in index 3d2ee477ee42..3893efdb33bb 100644 --- a/emulators/mame/files/pkg-message.in +++ b/emulators/mame/files/pkg-message.in @@ -2,9 +2,12 @@ { type: install message: <