Apple Silicon Support

[nikhiljha]

I briefly tried to build a universal .app for MacOS. It almost works, but you have to do some patching for PyQt5 to get it to build, and I'm not sure how to apply those patches with Tox. It has to build from source because wheels are unavailable for aarch64 macs.

I also needed to update the shim to run on intel and apple silicon, see below.

diff --git a/osx/make_app.sh b/osx/make_app.sh
index e39e8ea..68d3537 100644
--- a/osx/make_app.sh
+++ b/osx/make_app.sh
@@ -59,7 +59,10 @@ python='appdir_python'
 bootstrap_dist "$plover_wheel"
 
 # Create launcher.
-run gcc -Wall -O2 'osx/app_resources/plover_launcher.c' -o "$macos_dir/Plover"
+run clang -Wall -O2 'osx/app_resources/plover_launcher.c' -o "$macos_dir/Plover-intel" -target x86_64-apple-macos10.12
+run clang -Wall -O2 'osx/app_resources/plover_launcher.c' -o "$macos_dir/Plover-arm64" -target arm64-apple-macos10.12
+run lipo -create -output "$macos_dir/Plover" "$macos_dir/Plover-intel" "$macos_dir/Plover-arm64"
+run rm "$macos_dir/Plover-intel" "$macos_dir/Plover-arm64"
 
 # Copy icon.
 run cp 'osx/app_resources/plover.icns' "$resources_dir/plover.icns"
@@ -80,10 +83,6 @@ run "$python" -m plover_build_utils.trim "$py_home" "$builddir/dist_blacklist.tx
 # Make distribution source-less.
 run "$python" -m plover_build_utils.source_less "$py_home/lib" "*/pip/_vendor/distlib/*" '*/pip/_vendor/pep517/*'
 
-# Strip 32-bit support
-run mv "$appdir"{,.fat}
-run ditto -v --arch x86_64 "$appdir"{.fat,}
-
 # Check requirements.
 run "$python" -I -m plover_build_utils.check_requirements

[dnaq]

Giving this a bump since a universal binary for both x86_64 and for aarch64 would be really nice to have and would increase performance a lot on apple silicon.

[dolie]

up

[dannykorpan]

up

[tsprlng]

At this point you don't need any fancy patching, just updating some dependencies to versions which have aarch64 wheels is enough.

I've tried with this commit, running python setup.py -q bdist_app and got a Plover.app which seems to work. Don't have the tools installed to try a universal app build though.

Only thing is the check_requirements step at the end of osx/make_app.sh oddly fails, with pkg_resources.UnknownExtra: plover 4.0.0 has no such extra feature 'gui_qt'. This seems to be due to #1704 which was merged after the 4.0.0 release. I've just commented out that line of make_app.sh locally.

My .app build is here in case anyone else wants to try it: https://www.tspurling.co.uk/plover-macos-arm64/