<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0fdc6eb3bfcfd03fb8fe8f5292a123db5bdb4135">https://github.com/macports/macports-ports/commit/0fdc6eb3bfcfd03fb8fe8f5292a123db5bdb4135</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 0fdc6eb3bfc x264: fix building on apple silicon
</span>0fdc6eb3bfc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0fdc6eb3bfcfd03fb8fe8f5292a123db5bdb4135
</span>Author: Kridsada Thanabulpong <sirn@ogsite.net>
AuthorDate: Sat Dec 5 03:36:42 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> x264: fix building on apple silicon
</span>---
multimedia/x264/Portfile | 3 +-
.../x264/files/patch-x264-apple-silicon.diff | 93 ++++++++++++++++++++++
2 files changed, 95 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x264/Portfile b/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eed88087cb3..80f9fb37b48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,8 @@ depends_build port:nasm
</span>
# as of 20190313 the PPC assembly uses VSX, which is Power7+ only. We could disable asm, but
# instead we can use the previous ppc assembly, which does compile and provides the same functions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-x264-older-ppc-code.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-x264-older-ppc-code.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-x264-apple-silicon.diff
</span>
configure.args --enable-pic \
--enable-shared \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x264/files/patch-x264-apple-silicon.diff b/multimedia/x264/files/patch-x264-apple-silicon.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..27b7b43d80d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x264/files/patch-x264-apple-silicon.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://code.videolan.org/videolan/x264/-/commit/eb95c2965299ba5b8598e2388d71b02e23c9fba7.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From eb95c2965299ba5b8598e2388d71b02e23c9fba7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Damiano Galassi <damiog@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 23 Jul 2020 17:23:09 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] update config.* and configure: add Apple Silicon support.
</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;'>+ config.guess | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.sub | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure | 24 ++++++++++++------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 17 insertions(+), 14 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/config.guess b/config.guess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2fb9f880..ab192f67 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.guess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.guess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1238,6 +1238,9 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *:Rhapsody:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm64:Darwin:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo arm64-apple-darwin${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *:Darwin:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $UNAME_PROCESSOR in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/config.sub b/config.sub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8df55110..72e9265b 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.sub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.sub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -255,7 +255,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some are omitted here because they have special meanings below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1750a | 580 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | a29k \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | aarch64 | aarch64_be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | aarch64 | aarch64_be | arm64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | am33_2.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -369,7 +369,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Recognize the basic CPU types with company name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 580-* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | a29k-* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | aarch64-* | aarch64_be-* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | aarch64-* | aarch64_be-* | arm64*-* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 266fcffa..10aa2fd4 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -821,6 +821,18 @@ case $host_cpu in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS="${AS-${CC}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_EXT=".c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ aarch64|arm64*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARCH="AARCH64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stack_alignment=16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$SYS" = MACOSX ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS="${AS-${CC}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS="${AS-${CC}}"
</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;'>+ arm*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCH="ARM"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$SYS" = MACOSX ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -839,18 +851,6 @@ case $host_cpu in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS="${AS-${CC}}"
</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;'>+- aarch64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH="AARCH64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stack_alignment=16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ "$SYS" = MACOSX ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS="${AS-${CC}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS="${AS-${CC}}"
</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;'>+ s390|s390x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCH="S390"
</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;'>+GitLab
</span></pre><pre style='margin:0'>
</pre>