<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/74041b92199d1f6cfe2948d5fb39139c59b26f8b">https://github.com/macports/macports-ports/commit/74041b92199d1f6cfe2948d5fb39139c59b26f8b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74041b92199d1f6cfe2948d5fb39139c59b26f8b
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Jun 22 18:47:55 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg6: cleanup universal support
</span>---
multimedia/ffmpeg6/Portfile | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg6/Portfile b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 352766b6500..770c3b76318 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,20 +327,29 @@ configure.universal_args-delete \
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
set merger_host($arch) ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args($arch) --arch=${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env($arch) "ASFLAGS=-arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args($arch) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --arch=${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env($arch) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ASFLAGS=-arch ${arch}"
</span> }
if {[string match "*86*" ${configure.universal_archs}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:nasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nasm
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(i386) --enable-x86asm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) --enable-x86asm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-x86asm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-x86asm
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --arch=${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append ASFLAGS=[get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --arch=${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASFLAGS=[get_canonical_archflags]
</span> if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:nasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-x86asm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-x86asm
</span> }
}
</pre><pre style='margin:0'>
</pre>