Fix audio in libretro Nintendo Switch builds by applying libretro/RetroArch#18459

Author: white-axe

.github/workflows/autobuild.yml

@@ -1949,14 +1949,23 @@ jobs:
         run: |
           mkdir ~/dist
           mv libretro_libnx/libretro_libnx.a ~
+          tag_name=$(curl -s https://api.github.com/repos/libretro/RetroArch/releases/latest -H 'Authorization: Bearer ${{ github.token }}' -H 'X-GitHub-Api-Version: 2022-11-28' | jq -r '.tag_name')
+          if [ "$tag_name" = 'v1.22.2' ]
+          then
+            mv libretro/retroarch-pr18459.patch ~
+          fi
           if [ '${{ matrix.type }}' = 'bootstrap' ]
           then
             mv libretro/switch-bootstrap ~
           fi
           cd ~
-          git clone https://github.com/libretro/RetroArch retroarch --depth 1 -b $(curl -s https://api.github.com/repos/libretro/RetroArch/releases/latest -H 'Authorization: Bearer ${{ github.token }}' -H 'X-GitHub-Api-Version: 2022-11-28' | jq -r '.tag_name')
+          git clone https://github.com/libretro/RetroArch retroarch --depth 1 -b $tag_name
           mv libretro_libnx.a retroarch/
           cd retroarch
+          if [ "$tag_name" = 'v1.22.2' ]
+          then
+            git apply ~/retroarch-pr18459.patch
+          fi
           if [ '${{ matrix.type }}' = 'bootstrap' ]
           then
             git apply ~/switch-bootstrap/switch-bootstrap.patch

libretro/retroarch-pr18459.patch

@@ -0,0 +1,65 @@
+From 02ca3ec7b8cd68b2c0ef30c3f48029a2908043d1 Mon Sep 17 00:00:00 2001
+From: diekleinekuh <[email protected]>
+Date: Sat, 29 Nov 2025 14:34:58 +0100
+Subject: [PATCH] Switch: Configure audio drivers to be in blocking mode
+ initially
+
+---
+ audio/drivers/switch_audio.c                     | 2 +-
+ audio/drivers/switch_libnx_audren_audio.c        | 2 +-
+ audio/drivers/switch_libnx_audren_thread_audio.c | 2 +-
+ audio/drivers/switch_thread_audio.c              | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/audio/drivers/switch_audio.c b/audio/drivers/switch_audio.c
+index 2db183aa82a6..35346d5c3383 100644
+--- a/audio/drivers/switch_audio.c
++++ b/audio/drivers/switch_audio.c
+@@ -324,7 +324,7 @@ static void *switch_audio_init(const char *device,
+    swa->latency        = latency;
+    swa->last_append    = svcGetSystemTick();
+ 
+-   swa->blocking       = block_frames;
++   swa->blocking       = true;
+    swa->is_paused      = true;
+ 
+    RARCH_LOG("[Switch audio] Audio initialized.\n");
+diff --git a/audio/drivers/switch_libnx_audren_audio.c b/audio/drivers/switch_libnx_audren_audio.c
+index 7d9e9a4b34b8..2a712a5a1971 100644
+--- a/audio/drivers/switch_libnx_audren_audio.c
++++ b/audio/drivers/switch_libnx_audren_audio.c
+@@ -81,7 +81,7 @@ static void *libnx_audren_audio_init(
+    real_latency = MAX(5, latency);
+    RARCH_LOG("[Audren] real_latency is %u.\n", real_latency);
+ 
+-   aud->nonblock     = !block_frames;
++   aud->nonblock     = false;
+    aud->buffer_size  = (real_latency * sample_rate / 1000);
+    aud->samples      = (aud->buffer_size / num_channels / sizeof(int16_t));
+    aud->current_size = 0;
+diff --git a/audio/drivers/switch_libnx_audren_thread_audio.c b/audio/drivers/switch_libnx_audren_thread_audio.c
+index f92b32200bc0..969b100518eb 100644
+--- a/audio/drivers/switch_libnx_audren_thread_audio.c
++++ b/audio/drivers/switch_libnx_audren_thread_audio.c
+@@ -162,7 +162,7 @@ static void *libnx_audren_thread_audio_init(const char *device, unsigned rate, u
+ 
+    aud->running     = true;
+    aud->paused      = false;
+-   aud->nonblock    = !block_frames;
++   aud->nonblock    = false;
+    aud->buffer_size = (real_latency * sample_rate / 1000);
+    aud->samples     = (aud->buffer_size / num_channels / sizeof(int16_t));
+ 
+diff --git a/audio/drivers/switch_thread_audio.c b/audio/drivers/switch_thread_audio.c
+index 927a63b63d6a..6e8310e6f396 100644
+--- a/audio/drivers/switch_thread_audio.c
++++ b/audio/drivers/switch_thread_audio.c
+@@ -153,7 +153,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
+       return NULL;
+ 
+    swa->running     = true;
+-   swa->nonblock    = true;
++   swa->nonblock    = false;
+    swa->is_paused   = true;
+    swa->latency     = MAX(latency, 8);
+