<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/176bd70c810d1a3aa326be9e4bec1d630a56611c">https://github.com/macports/macports-ports/commit/176bd70c810d1a3aa326be9e4bec1d630a56611c</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 176bd70c810 aom: revert creation of variant for CPU detection
</span>176bd70c810 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 176bd70c810d1a3aa326be9e4bec1d630a56611c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 3 02:20:56 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> aom: revert creation of variant for CPU detection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Revert change made in
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/6a1f839833a71be9b6c69d7e6ddca7a039d46673
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> aom does *runtime* CPU detection, so a native variant is unnecessary.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See discussion in
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/6a1f839833a71be9b6c69d7e6ddca7a039d46673#commitcomment-49053438
</span>---
multimedia/aom/Portfile | 46 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 24 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 080d342bd55..b6adbeb84bd 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;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name aom
version 3.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories multimedia
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,44 +38,42 @@ depends_build-append port:git \
</span> port:perl5 \
port:python${python_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# possible values of AOM_TARGET_CPU: arm64 x86_64 x86 ppc generic
</span> configure.args-append -DBUILD_SHARED_LIBS=ON \
-DENABLE_EXAMPLES=OFF \
-DDENABLE_TESTS=OFF \
-DENABLE_DOCS=OFF \
-DGIT_EXECUTABLE=${prefix}/bin/git \
-DPERL_EXECUTABLE=${prefix}/bin/perl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyver} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAOM_TARGET_CPU=generic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyver}
</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:#ffe0e0;'>-variant native description {enable auto selection of cpu flags like avx/avx2/neon} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DAOM_TARGET_CPU=generic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# a `native` variant is not needed since aom does runtime CPU detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/macports/macports-ports/commit/6a1f839833a71be9b6c69d7e6ddca7a039d46673#commitcomment-49053438
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ensure all AVX2 functions are defined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/62608
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 800}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ensure all AVX2 functions are defined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/62608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 800}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/62611 for CONFIG_RUNTIME_CPU_DETECT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(arm64) "-DAOM_TARGET_CPU=arm64 -DCONFIG_RUNTIME_CPU_DETECT=OFF"
</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;'>+# possible values of AOM_TARGET_CPU: arm64 x86_64 x86 ppc generic
</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;'>+set merger_configure_args(x86_64) -DAOM_TARGET_CPU=x86_64
</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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {"x86_64" in ${configure.universal_archs} || "i386" in ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:yasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} in {i386 x86_64}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:yasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><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;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"x86_64" in ${configure.universal_archs} || "i386" in ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:yasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} in {i386 x86_64}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:yasm
</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>