From nobody Wed Oct 04 20:03:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S15GL081Bz4w4ms; Wed, 4 Oct 2023 20:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S15GK5zLvz4GsZ; Wed, 4 Oct 2023 20:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/veaVEw2lSVOiiXwdgSgvwlHLaOLb+CE+Tlt9n7COI=; b=AyzQeWMqcaOYImu/OJu4OJmZSf7YG89r/UPexuYLiKUBjYE5iLZqtbJpa2xAgM2uT6aBeM gb2gbzkAK571sdXUlxBQFguAVTF/aaRtPCuNsgyhA1fLkiWSn+hKzZ3CILwrNjNAw+cuXa mxuZScVcqoSlHds80Cpu1a67+tY5ocHNYSPirOURfZsaRgY1Y9Qm0A8LcCGTEFnEIoINtx zJz/T8tqeVO1osmOYaxTihR9xa3l6YdkMsJ5wpwgE+kHCP3jQK/VAI27+WzQ4+MC5cUhp0 YH64tuSeOP5gYNyn82C7w5XGWVgGk1CEVp2XArK3s9B/iLdMQzlSKw8RJkD2kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696449785; a=rsa-sha256; cv=none; b=mZCdjKzJeUxsjnPlO+zI94+TOMnVJDZT7PqTw1slYr7mpxSrs9ego6Ccx5CVdt+Cj/hULF 9n2LhryYxjOsD1BYrn/dLq1mZa0tNx9QY6YPfgl2WlmUhbCm1UbXxW584sVgEkyRlfVCVV Gi3LFiOUsHLZ/zA5UAUCF0vaND8lp9Sh9Xiy7AwswwXT7eBoEpX4Jq6Px5gXVuvxTaCx/A Ae4fwYtB2kd0fnQsY9Kh+qJxfksszQ1DAHdqpz8DufS57Vls6t0kY7oEphXyQDPeaFAT+q QNHufiqQosBZLplaEeBdYhSOA+aNFMsLglHN6Egr6m5YYFsu/OvLCaSDbq2tqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/veaVEw2lSVOiiXwdgSgvwlHLaOLb+CE+Tlt9n7COI=; b=BImq/Jd7YKzNbtU25dmUuUhEuIs5r0wyrRqgcMsBfRCJWDwvZ/19gtqVj9Vy+HNoE5eIrN kC0QcSnp0dMnih4ZfAa3+nqgCvHGuC4w1HK9sVcoCtvacFf6bCqKw4dZltbo4trUuJ0vZ9 gDBGzfSZIdm2V9xNLlFH9u7NKMyd43DBHE5sc5CEwYzcHtkA9AnUbuvBWqp0wCNGEeYfiz kMBiYLKPRHNX3Ixp8yOmeJ8ExDeiyONNM5p+GK918Q+HPOU8iaLelmfvesC/NAtv7xyojj oKaczc6lT5zIzZuzB+c8simf8TYP3hZpjTSsIyO/YPRAGXxK98lms+BwsD0fTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S15GK52xWzrgb; Wed, 4 Oct 2023 20:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394K35Lw056545; Wed, 4 Oct 2023 20:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394K35s5056542; Wed, 4 Oct 2023 20:03:05 GMT (envelope-from git) Date: Wed, 4 Oct 2023 20:03:05 GMT Message-Id: <202310042003.394K35s5056542@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 494e182d5914 - main - emulators/mame: Update to 0.259 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 494e182d5914ebad0db3fac9928c547a8db0a182 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=494e182d5914ebad0db3fac9928c547a8db0a182 commit 494e182d5914ebad0db3fac9928c547a8db0a182 Author: Alastair Hogge AuthorDate: 2023-10-04 00:27:39 +0000 Commit: Robert Clausecker CommitDate: 2023-10-04 20:01:38 +0000 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 Changelog: https://www.mamedev.org/?p=529 PR: 274227 MFH: 2023Q4 --- emulators/mame/Makefile | 41 +++++++++++----------- emulators/mame/distinfo | 6 ++-- .../mame/files/patch-src_devices_cpu_sh_sh7021.cpp | 10 ++++++ .../mame/files/patch-src_devices_cpu_sh_sh7032.cpp | 10 ++++++ emulators/mame/pkg-plist | 32 +++++++++++------ 5 files changed, 64 insertions(+), 35 deletions(-) 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 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