Attachment 245421 Details for Bug 274227 – Update emulators/mame to 0.259

[patch] Update emulators/mame to 0.259

0001-emulators-mame-Update-to-0.259.patch (text/plain), 7.68 KB, created by Alastair Hogge on 2023-10-04 00:44:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2023-10-04 00:44:19 UTC

Size: 7.68 KB

patch

obsolete

>From e68163f4f0e0910457dfff592b76b58b4952b954 Mon Sep 17 00:00:00 2001
>From: Alastair Hogge <agh@riseup.net>
>Date: Wed, 4 Oct 2023 08:27:39 +0800
>Subject: [PATCH] emulators/mame: Update to 0.259
>
>* Update to 0.259 (https://www.mamedev.org/?p=529)
>* Some Makefile maintenance: remove blank lines from targets; opt for verbose build, remove @ from commands
>* Add MAME keymaps
>* Prefer ${PREFIX}/share over ${MANPREFIX}
>* Pull in an upstream commit to patch LLVM builds for 0.259 on FreeBSD
>
> PR:		274227
>---
> emulators/mame/Makefile                       | 41 +++++++++----------
> emulators/mame/distinfo                       |  6 +--
> .../files/patch-src_devices_cpu_sh_sh7021.cpp | 10 +++++
> .../files/patch-src_devices_cpu_sh_sh7032.cpp | 10 +++++
> emulators/mame/pkg-plist                      | 32 ++++++++++-----
> 5 files changed, 64 insertions(+), 35 deletions(-)
> create mode 100644 emulators/mame/files/patch-src_devices_cpu_sh_sh7021.cpp
> create mode 100644 emulators/mame/files/patch-src_devices_cpu_sh_sh7032.cpp
>
>diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
>index a222ede70a16..ce5a72b14a25 100644
>--- a/emulators/mame/Makefile
>+++ b/emulators/mame/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	mame
>-DISTVERSION=	0.258
>-PORTREVISION=	1
>+DISTVERSION=	0.259
> CATEGORIES=	emulators games
> 
> MAINTAINER=	agh@riseup.net
>@@ -46,7 +45,7 @@ USE_XORG=	x11 xext xi xinerama xrender
> 
> MAKEFILE=	makefile
> MAKE_ARGS=	TARGETOS=freebsd \
>-		VERBOSE="1"
>+		VERBOSE=1
> MAKE_ENV=	LDOPTS="${LDFLAGS}" \
> 		NO_USE_PORTAUDIO=1 \
> 		NO_USE_PULSEAUDIO=1 \
>@@ -130,50 +129,51 @@ MAKE_ARGS+=	PTR64=1
> .endif
> 
> post-extract:
>-	@${MV} ${WRKSRC}/src/lib/util/png.h \
>+	${MV} ${WRKSRC}/src/lib/util/png.h \
> 		${WRKSRC}/src/lib/util/localpng.h
> 
> post-patch:
> # Prefer some system headers over bundled.
>-	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h
>-	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h
>+	${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h
>+	${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h
> # Accommodate GENie conception of BSD.
>-	@${MV} ${_GENIE}/build/gmake.freebsd \
>+	${MV} ${_GENIE}/build/gmake.freebsd \
> 		${_GENIE}/build/gmake.bsd
> # Patch build to use bundled PNG.
>-	@${GREP} -rl '"png.h"' ${WRKSRC}/src | \
>+	${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"|' \
>+	${REINPLACE_CMD} -e 's|"util/png.h"|"util/localpng.h"|' \
> 		${WRKSRC}/src/frontend/mame/ui/icorender.cpp
> 
> do-build-DOCS-on:
> 	(cd ${WRKSRC}/docs && \
> 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} html SPHINXBUILD=sphinx-build-${PYTHON_VER})
>-	@${RM} ${WRKSRC}/docs/build/html/.buildinfo
>+	${RM} ${WRKSRC}/docs/build/html/.buildinfo
> 
> post-build:
> 	(cd ${WRKSRC}/docs && \
> 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} man SPHINXBUILD=sphinx-build-${PYTHON_VER})
>-
>-	@${FIND} ${WRKSRC}/language -type f -name "*.po" -delete
>+	${FIND} ${WRKSRC}/language -type f -name "*.po" -delete
> 
> do-install:
> .for DATA in artwork bgfx ctrlr ini hash plugins samples
> 	(cd ${WRKSRC} && \
> 		${COPYTREE_SHARE} ${DATA} ${STAGEDIR}${DATADIR})
> .endfor
>-
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_MAN} ${WRKSRC}/docs/build/man/MAME.1 \
>-		${STAGEDIR}${MANPREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/docs/man/mame.6 \
>-		${STAGEDIR}${MANPREFIX}/man/man6
>-
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
> .for INI in mame plugin ui
> 	${INSTALL_DATA} ${WRKDIR}/${INI}.ini \
> 		${STAGEDIR}${ETCDIR}/${INI}.ini.sample
> .endfor
>+	${MKDIR} ${STAGEDIR}${DATADIR}/keymaps
>+.for KEYMAP in be br ch de es fr gb it pt se
>+	${INSTALL_DATA} ${WRKSRC}/keymaps/km_${KEYMAP}_LINUX.map \
>+		${STAGEDIR}${DATADIR}/keymaps/km_${KEYMAP}.map
>+.endfor
>+	${INSTALL_MAN} ${WRKSRC}/docs/build/man/MAME.1 \
>+		${STAGEDIR}${PREFIX}/share/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/docs/man/mame.6 \
>+		${STAGEDIR}${PREFIX}/share/man/man6
> 
> do-install-DEBUG-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/mamed \
>@@ -198,11 +198,10 @@ do-install-TOOLS-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PROGRAM} \
> 		${STAGEDIR}${PREFIX}/bin
> .endfor
>-
> .for MANUAL in castool chdman floptool imgtool jedutil ldplayer ldresample \
> 	ldverify romcmp
> 	${INSTALL_MAN} ${WRKSRC}/docs/man/${MANUAL}.1 \
>-		${STAGEDIR}${MANPREFIX}/man/man1
>+		${STAGEDIR}${PREFIX}/share/man/man1
> .endfor
> 
> .include <bsd.port.mk>
>diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
>index 9f98135a04a6..c6c3ad610364 100644
>--- a/emulators/mame/distinfo
>+++ b/emulators/mame/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1693371766
>-SHA256 (mamedev-mame-0.258-mame0258_GH0.tar.gz) = aca1365f3e1a1c8fe1638206f1c6176da08cbe686586c55355068179c023096b
>-SIZE (mamedev-mame-0.258-mame0258_GH0.tar.gz) = 204909911
>+TIMESTAMP = 1696318535
>+SHA256 (mamedev-mame-0.259-mame0259_GH0.tar.gz) = 46baf431079a3373ffe8d984b3ba5d62ad5b1d5e356d1f60cf60f6ad03d4cec6
>+SIZE (mamedev-mame-0.259-mame0259_GH0.tar.gz) = 205063121
>diff --git a/emulators/mame/files/patch-src_devices_cpu_sh_sh7021.cpp b/emulators/mame/files/patch-src_devices_cpu_sh_sh7021.cpp
>new file mode 100644
>index 000000000000..a360fbd44a37
>--- /dev/null
>+++ b/emulators/mame/files/patch-src_devices_cpu_sh_sh7021.cpp
>@@ -0,0 +1,10 @@
>+--- src/devices/cpu/sh/sh7021.cpp.orig	2023-10-03 07:41:10 UTC
>++++ src/devices/cpu/sh/sh7021.cpp
>+@@ -1,6 +1,7 @@
>+ // license:BSD-3-Clause
>+ // copyright-holders:Angelo Salese
>+ 
>++#include "emu.h"
>+ #include "sh7021.h"
>+ 
>+ DEFINE_DEVICE_TYPE(SH2A_SH7021, sh2a_sh7021_device, "sh2a_sh7021", "Hitachi SH-2A (SH7021)")
>diff --git a/emulators/mame/files/patch-src_devices_cpu_sh_sh7032.cpp b/emulators/mame/files/patch-src_devices_cpu_sh_sh7032.cpp
>new file mode 100644
>index 000000000000..af443e70c42e
>--- /dev/null
>+++ b/emulators/mame/files/patch-src_devices_cpu_sh_sh7032.cpp
>@@ -0,0 +1,10 @@
>+--- src/devices/cpu/sh/sh7032.cpp.orig	2023-10-03 07:41:18 UTC
>++++ src/devices/cpu/sh/sh7032.cpp
>+@@ -1,6 +1,7 @@
>+ // license:BSD-3-Clause
>+ // copyright-holders:Angelo Salese
>+ 
>++#include "emu.h"
>+ #include "sh7032.h"
>+ 
>+ DEFINE_DEVICE_TYPE(SH1_SH7032,  sh1_sh7032_device,  "sh1_sh7032",  "Hitachi SH-1 (SH7032)")
>diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
>index d3be851b785f..6094d5f43388 100644
>--- a/emulators/mame/pkg-plist
>+++ b/emulators/mame/pkg-plist
>@@ -15,17 +15,17 @@ bin/mame
> %%TOOLS%%bin/srcclean
> %%TOOLS%%bin/testkeys
> %%TOOLS%%bin/unidasm
>-man/man1/MAME.1.gz
>-%%TOOLS%%man/man1/castool.1.gz
>-%%TOOLS%%man/man1/chdman.1.gz
>-%%TOOLS%%man/man1/floptool.1.gz
>-%%TOOLS%%man/man1/imgtool.1.gz
>-%%TOOLS%%man/man1/jedutil.1.gz
>-%%TOOLS%%man/man1/ldplayer.1.gz
>-%%TOOLS%%man/man1/ldresample.1.gz
>-%%TOOLS%%man/man1/ldverify.1.gz
>-%%TOOLS%%man/man1/romcmp.1.gz
>-man/man6/mame.6.gz
>+share/man/man1/MAME.1.gz
>+%%TOOLS%%share/man/man1/castool.1.gz
>+%%TOOLS%%share/man/man1/chdman.1.gz
>+%%TOOLS%%share/man/man1/floptool.1.gz
>+%%TOOLS%%share/man/man1/imgtool.1.gz
>+%%TOOLS%%share/man/man1/jedutil.1.gz
>+%%TOOLS%%share/man/man1/ldplayer.1.gz
>+%%TOOLS%%share/man/man1/ldresample.1.gz
>+%%TOOLS%%share/man/man1/ldverify.1.gz
>+%%TOOLS%%share/man/man1/romcmp.1.gz
>+share/man/man6/mame.6.gz
> %%DATADIR%%/artwork/LICENSE
> %%DATADIR%%/artwork/README.md
> %%DATADIR%%/artwork/aperture-grille.png
>@@ -2081,6 +2081,16 @@ man/man6/mame.6.gz
> %%DATADIR%%/ini/presets/raster.ini
> %%DATADIR%%/ini/presets/vector-mono.ini
> %%DATADIR%%/ini/presets/vector.ini
>+%%DATADIR%%/keymaps/km_be.map
>+%%DATADIR%%/keymaps/km_br.map
>+%%DATADIR%%/keymaps/km_ch.map
>+%%DATADIR%%/keymaps/km_de.map
>+%%DATADIR%%/keymaps/km_es.map
>+%%DATADIR%%/keymaps/km_fr.map
>+%%DATADIR%%/keymaps/km_gb.map
>+%%DATADIR%%/keymaps/km_it.map
>+%%DATADIR%%/keymaps/km_pt.map
>+%%DATADIR%%/keymaps/km_se.map
> %%NLS%%%%DATADIR%%/language/Afrikaans/strings.mo
> %%NLS%%%%DATADIR%%/language/Albanian/strings.mo
> %%NLS%%%%DATADIR%%/language/Arabic/strings.mo
>-- 
>2.42.0
>

Flags:

agh: maintainer-approval+

Actions: View | Diff

Attachments on bug 274227: 245394 | 245421