<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dafdf1644c207c48f0ca8eab0d255326fe2057f1">https://github.com/macports/macports-ports/commit/dafdf1644c207c48f0ca8eab0d255326fe2057f1</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 dafdf1644c2 aom: fix build on newer and older systems
</span>dafdf1644c2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dafdf1644c207c48f0ca8eab0d255326fe2057f1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Apr 2 11:51:29 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> aom: fix build on newer and older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Older systems do not seem to fully support AVX2.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/62608
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build system does not have a custom code for macOS arm64 systems.
</span><span style='display:block; white-space:pre;color:#404040;'> This is not a problem so long as this is made explicit.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/62611
</span>---
multimedia/aom/Portfile | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/aom/Portfile b/multimedia/aom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 80d678eff5e..c4192bab32a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/aom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/aom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,11 +45,17 @@ configure.args-append -DBUILD_SHARED_LIBS=ON \
</span> -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyver}
# possible values of AOM_TARGET_CPU: arm64 x86_64 x86 ppc generic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(arm64) -DAOM_TARGET_CPU=arm64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(x86_64) -DAOM_TARGET_CPU=x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(i386) -DAOM_TARGET_CPU=x86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(ppc) -DAOM_TARGET_CPU=ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(ppc64) -DAOM_TARGET_CPU=ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/62611 for CONFIG_RUNTIME_CPU_DETECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(arm64) "-DAOM_TARGET_CPU=arm64 -DCONFIG_RUNTIME_CPU_DETECT=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} > 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(x86_64) -DAOM_TARGET_CPU=x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/62608 for ENABLE_AVX2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(x86_64) "-DAOM_TARGET_CPU=x86_64 -DENABLE_AVX2=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(i386) -DAOM_TARGET_CPU=x86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(ppc) -DAOM_TARGET_CPU=ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(ppc64) -DAOM_TARGET_CPU=ppc
</span> if {![info exists universal_possible]} {
set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +67,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> if {${configure.build_arch} in {i386 x86_64}} {
depends_build-append port:yasm
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append $merger_configure_args(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append {*}$merger_configure_args(${configure.build_arch})
</span> }
livecheck.type regex
</pre><pre style='margin:0'>
</pre>