From 7e27feda2f6300a12a83048dad4a5dd1f6c45347 Mon Sep 17 00:00:00 2001
From: Lean Mendoza <leandro@decentraland.org>
Date: Fri, 9 Feb 2024 15:19:13 -0300
Subject: [PATCH] chore: move macos build to arm64 (#228)

* test

* disable cache

* test

* test all builds

* fix conditions
---
 .github/workflows/ci.yml               | 3 ++-
 godot/export_presets.cfg               | 4 ++--
 rust/decentraland-godot-lib/Cargo.toml | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca6a0b80..b8d430a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -161,7 +161,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     strategy:
       matrix:
-        os: [self-hosted-windows, ubuntu-latest, macos-latest]
+        os: [self-hosted-windows, ubuntu-latest, macos-14-xlarge]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -172,6 +172,7 @@ jobs:
           override: true
 
       - name: Set up cargo cache
+        if: runner.os != 'macos'
         uses: actions/cache@v3
         with:
           path: |
diff --git a/godot/export_presets.cfg b/godot/export_presets.cfg
index 937ae86a..13662110 100644
--- a/godot/export_presets.cfg
+++ b/godot/export_presets.cfg
@@ -88,7 +88,7 @@ codesign/entitlements/allow_jit_code_execution=true
 codesign/entitlements/allow_unsigned_executable_memory=true
 codesign/entitlements/allow_dyld_environment_variables=true
 codesign/entitlements/disable_library_validation=true
-codesign/entitlements/audio_input=false
+codesign/entitlements/audio_input=true
 codesign/entitlements/camera=false
 codesign/entitlements/location=false
 codesign/entitlements/address_book=false
@@ -109,7 +109,7 @@ codesign/entitlements/app_sandbox/files_user_selected=0
 codesign/entitlements/app_sandbox/helper_executables=[]
 codesign/custom_options=PackedStringArray()
 notarization/notarization=0
-privacy/microphone_usage_description=""
+privacy/microphone_usage_description="The microphone is used in the voice-chat, it only records while you're pushing the microphone button."
 privacy/microphone_usage_description_localized={}
 privacy/camera_usage_description=""
 privacy/camera_usage_description_localized={}
diff --git a/rust/decentraland-godot-lib/Cargo.toml b/rust/decentraland-godot-lib/Cargo.toml
index 5b8aae7c..b49a6b48 100644
--- a/rust/decentraland-godot-lib/Cargo.toml
+++ b/rust/decentraland-godot-lib/Cargo.toml
@@ -27,7 +27,7 @@ ethers = { version = "2.0", features = ["rustls"] }
 async-trait = "0.1.68"
 
 cpal = { version = "0.15.2", optional = true }
-ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch="audioline-and-mobile-fix", optional = true }
+ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch="audioline-and-mobile-fix-6.1", optional = true }
 
 thiserror = "1.0"
 anyhow = "1.0.70"
@@ -65,7 +65,7 @@ multipart = { version = "0.18.0", default-features = false, features = ["client"
 ethers-providers = { version = "2.0", features = ["ws","rustls"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch = "audioline-and-mobile-fix", features = ["fix_usize_size_t"], optional = true }
+ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch = "audioline-and-mobile-fix-6.1", features = ["fix_usize_size_t"], optional = true }
 jni = { version = "0.21.1", features = ["invocation"] }
 paranoid-android = "0.2.1"