<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5c80541e75458f7e802e7f7836ea8597a1a1438b">https://github.com/macports/macports-ports/commit/5c80541e75458f7e802e7f7836ea8597a1a1438b</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 5c80541e754 MPlayer: Support arm64 architecture.
</span>5c80541e754 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5c80541e75458f7e802e7f7836ea8597a1a1438b
</span>Author: Wilfried Teiken <wteiken@teiken.org>
AuthorDate: Fri Nov 5 22:17:19 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> MPlayer: Support arm64 architecture.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> MPlayer did not compile, this is now fixed:
</span><span style='display:block; white-space:pre;color:#404040;'> - Disabled quicktime format (missing headers, this is also default for
</span><span style='display:block; white-space:pre;color:#404040;'> x86_64).
</span><span style='display:block; white-space:pre;color:#404040;'> - Properly handle arm64 as aarch64, not arm.
</span><span style='display:block; white-space:pre;color:#404040;'> - Create the "ARMV8" CPU feature in configure. This should be a noop
</span><span style='display:block; white-space:pre;color:#404040;'> but avoids a compile error.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This addresses https://trac.macports.org/ticket/62254
</span>---
multimedia/MPlayer/Portfile | 14 ++++-----
.../MPlayer/files/patch-configure-arm64.diff | 36 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/MPlayer/Portfile b/multimedia/MPlayer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6daf19e506..11858a577e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/MPlayer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/MPlayer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name MPlayer
version 1.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span> categories multimedia
license GPL-2+
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +30,13 @@ depends_lib \
</span> port:rtmpdump
master_sites http://www.mplayerhq.hu/MPlayer/releases/ \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.mplayerhq.hu/MPlayer/releases/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftp://ftp.mplayerhq.hu/MPlayer/releases/
</span> use_xz yes
checksums sha1 11db20434a4e1aabb9c52f7712241dae1b3730e3 \
rmd160 b6688b186f41267ca3cec59c67afe34396c51ade \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13278984
</span>
# Do not use the following environment variables, otherwise the build phase
# will fail.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,6 +79,7 @@ configure.args-append \
</span>
patchfiles configure.x11.patch configure.vorbis.patch
patchfiles-append patch-libvo-osx-objc-common-opengl-headers.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure-arm64.diff
</span>
# https://trac.macports.org/ticket/58055
patchfiles-append patch-mplayer-libx264-updated.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,11 +274,7 @@ variant esd \
</span> }
platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-qtx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-qtx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-qtx
</span> }
variant glx requires x11 description {Enable glx output support. Due to a bug in mplayer, this disables corevideo support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/MPlayer/files/patch-configure-arm64.diff b/multimedia/MPlayer/files/patch-configure-arm64.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..524ae283839
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/MPlayer/files/patch-configure-arm64.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-11-05 21:56:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-11-05 22:12:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -642,6 +642,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vfpv3=auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setend=auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ neon=auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++armv8=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ armthumb=auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _iwmmxt=auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _mtrr=auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1716,7 +1717,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alpha) host_arch=alpha ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sun4*|sparc*) host_arch=sparc ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parisc*|hppa*|9000*) host_arch=hppa ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- aarch64*) host_arch=aarch64 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ aarch64*|arm64*) host_arch=aarch64 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm*|zaurus|cats) host_arch=arm ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sh3|sh4|sh4a) host_arch=sh ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s390) host_arch=s390 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3236,7 +3237,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echores "$_iwmmxt"
</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;'>+-cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON ARMV8 IWMMXT MMI VIS MVI'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$_mmx" = yes && cpuexts="MMX $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3264,6 +3265,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$setend" = yes && cpuexts="SETEND $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$neon" = yes && cpuexts="NEON $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++test "$armv8" = yes && cpuexts="ARMV8 $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$_iwmmxt" = yes && cpuexts="IWMMXT $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$_vis" = yes && cpuexts="VIS $cpuexts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$_mvi" = yes && cpuexts="MVI $cpuexts"
</span></pre><pre style='margin:0'>
</pre>