<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/d4fd7d6845b89cad026599677d9b9b5f93e7efac">https://github.com/macports/macports-ports/commit/d4fd7d6845b89cad026599677d9b9b5f93e7efac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d4fd7d6845b89cad026599677d9b9b5f93e7efac
</span>Author: Julian Panetta <julian.panetta@gmail.com>
AuthorDate: Thu Nov 26 14:51:33 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> libvpx: fix configuration for arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Disable switch to the iphoneos sdk for arm targets
</span><span style='display:block; white-space:pre;color:#404040;'> * Disable unsupported "runtime-cpu-detect" feature on arm64
</span><span style='display:block; white-space:pre;color:#404040;'> * Add arm64 to `supported_archs`
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/60940
</span>---
multimedia/libvpx/Portfile | 11 +++++++-
.../files/patch-build-make-configure.sh.diff | 31 +++++++++++++++++-----
2 files changed, 35 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/Portfile b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 171aef4ee17..9188373cffe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ git.url https://chromium.googlesource.com/webm/${name}
</span> git.branch v${version}
# support for non-intel archs removed in version 1.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64 i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 arm64
</span>
depends_build-append port:yasm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +72,14 @@ configure.args --enable-vp8 \
</span> --disable-examples \
--disable-unit-tests
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# libvpx does not yet support runtime detection of NEON features on macOS/iOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For arm64 builds (and universal builds targeting arm) we disable this feature,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# meaning NEON support is determined at compile time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For x86* architectures in universal builds, this feature is re-enabled below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${build_arch} eq "arm64" || [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --enable-runtime-cpu-detect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env LD=${configure.cc}
# add in when docs are installed correctly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,6 +121,7 @@ foreach my_arch {i386 x86_64} {
</span> if {[info exists my_targets(${my_arch})]} {
set merger_configure_args(${my_arch}) --force-target=$my_targets(${my_arch})-${os.platform}-gcc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(${my_arch}) --enable-runtime-cpu-detect
</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;color:#808080;'>diff --git a/multimedia/libvpx/files/patch-build-make-configure.sh.diff b/multimedia/libvpx/files/patch-build-make-configure.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 20621edbc0f..72bcd70f794 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/files/patch-build-make-configure.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/files/patch-build-make-configure.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/make/configure.sh.orig 2020-08-01 00:27:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/make/configure.sh 2020-08-01 00:29:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -854,7 +854,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86*-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/make/configure.sh.orig 2020-11-26 14:23:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/make/configure.sh 2020-11-26 14:26:37.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -845,16 +845,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Handle darwin variants. Newer SDKs allow targeting older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # platforms, so use the newest one available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${toolchain} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arm*-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -d "${iphoneos_sdk_dir}" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_cflags "-isysroot ${iphoneos_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_ldflags "-isysroot ${iphoneos_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x86*-darwin*)
</span> - osx_sdk_dir="$(show_darwin_sdk_path macosx)"
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-darwin*)
</span> + osx_sdk_dir="$(configure.sdkroot)"
if [ -d "${osx_sdk_dir}" ]; then
add_cflags "-isysroot ${osx_sdk_dir}"
add_ldflags "-isysroot ${osx_sdk_dir}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1085,7 +1077,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ! enabled external_build; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if false; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XCRUN_FIND="xcrun --sdk iphoneos --find"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="$(${XCRUN_FIND} clang++)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="$(${XCRUN_FIND} clang)"
</span></pre><pre style='margin:0'>
</pre>