<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2c8ae5455008a641418699f7ebbaae082f792329">https://github.com/macports/macports-ports/commit/2c8ae5455008a641418699f7ebbaae082f792329</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2c8ae545500 mame: update notes to include link to our tutorial; minor portfile cleanup; update launcher to specify pluginspath, artpath, hashpath, ctrlrpath
</span>2c8ae545500 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2c8ae5455008a641418699f7ebbaae082f792329
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Jan 18 16:43:30 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> mame: update notes to include link to our tutorial; minor portfile cleanup; update launcher to specify pluginspath, artpath, hashpath, ctrlrpath
</span>---
emulators/mame/Portfile | 51 ++++++++++++----------
.../mame/files/mame-script-template-launcher.sh | 8 ++++
2 files changed, 37 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/mame/Portfile b/emulators/mame/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 516a4e24016..077a1f23825 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/mame/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/mame/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ if {${g_mame_latest}} {
</span> set g_mame_release \
"0227"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
checksums \
rmd160 862df6a449329fe5b16e6d46a030fe157c3a8eb3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,19 +74,18 @@ if {${g_mame_latest}} {
</span> set g_mame_release \
"0226"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch 'language-portuguese_brazil' applies to release 0.226; fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # errors during translation build phase.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mame 0.226: Fix errors during translation build phase.
</span> # Merged into Mame releases from 0.227 onward. Tracked by issue:
# https://github.com/mamedev/mame/issues/7510
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch 'src-posixfile-build-error' applies to release 0.226; fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compilation errors for MacOS 10.8 and Xcode 5.x.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mame-patch-0226-language-portuguese_brazil.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mame 0.226: Fix compilation errors for MacOS 10.8 and Xcode 5.x.
</span> # Merged into Mame releases from 0.227 onward. Tracked by issue:
# https://github.com/mamedev/mame/issues/7536
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mame-patch-0226-language-portuguese_brazil.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span> mame-patch-0226-src-posixfile-build-error.diff
checksums \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -732,16 +731,19 @@ post-build {
</span> ui_debug "Phase post-build: mame_release_doc_dir: ${mame_release_doc_dir}"
# Rename Tools-related man pages, to include defined prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set man_page_rename_list \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [glob -nocomplain -type f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -directory ${mame_release_doc_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *.1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Phase post-build: man_page_rename_list: ${man_page_rename_list}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach tgt ${man_page_rename_list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fn [file tail ${tgt}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fn_new "${g_mame_tools_prefix}${fn}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Phase post-build: renaming man page: ${fn} -> ${fn_new}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${tgt} "${mame_release_doc_dir}/${fn_new}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset tools]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set man_page_rename_list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [glob -nocomplain -type f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -directory ${mame_release_doc_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *.1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Phase post-build: man_page_rename_list: ${man_page_rename_list}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach tgt ${man_page_rename_list} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fn [file tail ${tgt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fn_new "${g_mame_tools_prefix}${fn}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Phase post-build: renaming man page: ${fn} -> ${fn_new}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${tgt} "${mame_release_doc_dir}/${fn_new}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset man_page_rename_list
</span> }
# Copy generated Mame man page, joining pre-generated files for Tools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -760,9 +762,8 @@ post-build {
</span> delete ${tgt}
}
unset tgt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset man_page_rename_list
</span> unset man_page_delete_list
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> unset mame_release_doc_dir
unset mame_release_dir
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -861,6 +862,7 @@ post-destroot {
</span> ln -s "${prefix}/libexec/mame/${fn}" \
"${destroot}${prefix}/bin/${fn}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset mame_tools_list
</span> }
set man_page_files \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -878,8 +880,8 @@ post-destroot {
</span> "${mp_man_dest_dir}/${fn}"
}
unset f
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> unset man_page_files
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> unset mame_launch_link
unset mame_launch_script
unset mame_share_dir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -900,6 +902,11 @@ notes {
</span> Examples:
mame -video accel
mame -video opengl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If you're new to Mame, our tutorial will quickly walk you through the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process of setting up a new game:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://trac.macports.org/wiki/howto/Mame
</span> }
if {[variant_isset tools]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/mame/files/mame-script-template-launcher.sh b/emulators/mame/files/mame-script-template-launcher.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index db4cac21104..a9e7b3138e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/mame/files/mame-script-template-launcher.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/mame/files/mame-script-template-launcher.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +12,19 @@ script_dir=$(dirname "${script_file}")
</span> cmd="${script_dir}/@@MACPORTS_MAME_EXECUTABLE@@"
bgfx_path="${script_dir}/bgfx"
languagepath="${script_dir}/language"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pluginspath="${script_dir}/plugins"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+artpath="${script_dir}/artwork"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+hashpath="${script_dir}/hash"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ctrlrpath="${script_dir}/ctrlr"
</span>
cmdline=()
cmdline+=( "${cmd}" )
cmdline+=( -bgfx_path "${bgfx_path}" )
cmdline+=( -languagepath "${languagepath}" )
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cmdline+=( -pluginspath "${pluginspath}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmdline+=( -artpath "${artpath}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmdline+=( -hashpath "${hashpath}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmdline+=( -ctrlrpath "${ctrlrpath}" )
</span>
# Note that Mame handles duplicate arguments, using the last one found.
# Net-Net, there's no need to check whether the user specified the same
</pre><pre style='margin:0'>
</pre>