From 64ff5c34b21aae992bf9445b65d44e20a70a1fb8 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 8 Jul 2022 17:04:47 +0200 Subject: [PATCH 1/2] Add Download for Apple Silicon (ARM) --- _config.yml | 1 + wiki/en/Installation-for-Macintosh.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 33ce83b95..dbbe55298 100644 --- a/_config.yml +++ b/_config.yml @@ -18,6 +18,7 @@ download_file_names: windows: "jamulus_3.8.2_win.exe" windows-jack: "jamulus_3.8.2_win_jack.exe" mac: "jamulus_3.8.2_mac.dmg" + mac-arm: "jamulus_3.9.0_mac_arm64.dmg" mac-legacy: "jamulus_3.8.2_mac_legacy.dmg" android: "jamulus_3.8.2_android.apk" ios: "jamulus_3.9.0_iOSUnsigned.ipa" diff --git a/wiki/en/Installation-for-Macintosh.md b/wiki/en/Installation-for-Macintosh.md index 770114a19..b37d9cbbd 100644 --- a/wiki/en/Installation-for-Macintosh.md +++ b/wiki/en/Installation-for-Macintosh.md @@ -13,7 +13,8 @@ Make sure you've already read the [Getting Started](Getting-Started) page. Upgrading? You may want to [back up your configuration](Software-Manual#backing-up-jamulus) first. -1. [Download Jamulus]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\ +1. [Download Jamulus (Intel)]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\ +[Download Jamulus (Apple Silicon)]({{ site.download_root_link }}{{ site.download_file_names.mac-arm }}){: .button}\\ **macOS Mojave (10.14) or lower:** [Download legacy version]({{ site.download_root_link }}{{ site.download_file_names.mac-legacy }})\\ **Mirror 2:** [SourceForge](https://sourceforge.net/projects/llcon/files/latest/download) 1. **Install Jamulus**: Open the downloaded `.dmg` file, agree to the licence, *drag and drop* each icon you see in the window (Jamulus Client and Server) into your *Applications folder*. After that, you can close this window. From 906806d5174998cb1602d9c5d1f24e8c6db52134 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 8 Jul 2022 17:23:06 +0200 Subject: [PATCH 2/2] Structure macOS download into multiple sections --- wiki/en/Installation-for-Macintosh.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/wiki/en/Installation-for-Macintosh.md b/wiki/en/Installation-for-Macintosh.md index b37d9cbbd..62ab52f2d 100644 --- a/wiki/en/Installation-for-Macintosh.md +++ b/wiki/en/Installation-for-Macintosh.md @@ -13,10 +13,22 @@ Make sure you've already read the [Getting Started](Getting-Started) page. Upgrading? You may want to [back up your configuration](Software-Manual#backing-up-jamulus) first. -1. [Download Jamulus (Intel)]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\ -[Download Jamulus (Apple Silicon)]({{ site.download_root_link }}{{ site.download_file_names.mac-arm }}){: .button}\\ - **macOS Mojave (10.14) or lower:** [Download legacy version]({{ site.download_root_link }}{{ site.download_file_names.mac-legacy }})\\ +We provide three downloads for macOS. Please download the appropriate one: + +**For macOS running on Intel:** + +[Download Jamulus (Intel)]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button} + +For macOS Mojave (10.14 or lower) please [download the legacy version]({{ site.download_root_link }}{{ site.download_file_names.mac-legacy }}) + +**For macOS running on Apple Silicon:** + +[Download Jamulus (Apple Silicon)]({{ site.download_root_link }}{{ site.download_file_names.mac-arm }}){: .button} + **Mirror 2:** [SourceForge](https://sourceforge.net/projects/llcon/files/latest/download) + +After you downloaded the correct file: + 1. **Install Jamulus**: Open the downloaded `.dmg` file, agree to the licence, *drag and drop* each icon you see in the window (Jamulus Client and Server) into your *Applications folder*. After that, you can close this window. 1. **Run Jamulus**. Now you should be able to use Jamulus just like any other application.