From 103b31b2fcb358b16c5dcc9cc0d77ad345a51608 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 20:48:23 +0000
Subject: [PATCH 01/26] Update cpal requirement from 0.15 to 0.16

---
updated-dependencies:
- dependency-name: cpal
  dependency-version: 0.16.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 crates/bevy_audio/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 586d3045b791d..791de07e3c8ed 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -23,7 +23,7 @@ rodio = { version = "0.20", default-features = false }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-cpal = { version = "0.15", optional = true }
+cpal = { version = "0.16", optional = true }
 
 [target.'cfg(target_vendor = "apple")'.dependencies]
 # NOTE: Explicitly depend on this patch version to fix:

From 098d43646f9556f272cbe0320c1b7aec0cf146b6 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 11:46:16 +0200
Subject: [PATCH 02/26] Bumps rodio to 0.21 This version depends on cpal 0.16

---
 crates/bevy_audio/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 791de07e3c8ed..76d79624da1cc 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -19,7 +19,7 @@ bevy_transform = { path = "../bevy_transform", version = "0.18.0-dev" }
 
 # other
 # TODO: Remove `coreaudio-sys` dep below when updating `cpal`.
-rodio = { version = "0.20", default-features = false }
+rodio = { version = "0.21", default-features = false }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
@@ -32,7 +32,7 @@ coreaudio-sys = { version = "0.2.17", default-features = false }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 # TODO: Assuming all wasm builds are for the browser. Require `no_std` support to break assumption.
-rodio = { version = "0.20", default-features = false, features = [
+rodio = { version = "0.21", default-features = false, features = [
   "wasm-bindgen",
 ] }
 bevy_app = { path = "../bevy_app", version = "0.18.0-dev", default-features = false, features = [

From 4ee875b4c85b2dfb62333b096163991fbb58e73a Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 11:47:04 +0200
Subject: [PATCH 03/26] Removes coreaudio-sys patch requirement

---
 crates/bevy_audio/Cargo.toml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 76d79624da1cc..c6789dbac9ba2 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -18,18 +18,12 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev" }
 bevy_transform = { path = "../bevy_transform", version = "0.18.0-dev" }
 
 # other
-# TODO: Remove `coreaudio-sys` dep below when updating `cpal`.
 rodio = { version = "0.21", default-features = false }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
 cpal = { version = "0.16", optional = true }
 
-[target.'cfg(target_vendor = "apple")'.dependencies]
-# NOTE: Explicitly depend on this patch version to fix:
-# https://github.com/bevyengine/bevy/issues/18893
-coreaudio-sys = { version = "0.2.17", default-features = false }
-
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 # TODO: Assuming all wasm builds are for the browser. Require `no_std` support to break assumption.
 rodio = { version = "0.21", default-features = false, features = [

From 9a43d2079aa0cbf8cadf2d5c7fb8a9d25f52c4f2 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 11:59:21 +0200
Subject: [PATCH 04/26] Updates Android docs

---
 docs-template/EXAMPLE_README.md.tpl     | 2 ++
 examples/README.md                      | 2 ++
 examples/mobile/android_basic/readme.md | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/docs-template/EXAMPLE_README.md.tpl b/docs-template/EXAMPLE_README.md.tpl
index e1300061978b9..356c27a536efb 100644
--- a/docs-template/EXAMPLE_README.md.tpl
+++ b/docs-template/EXAMPLE_README.md.tpl
@@ -160,6 +160,8 @@ In its examples, Bevy targets the minimum Android API that Play Store  <!-- mark
 [requires](https://developer.android.com/distribute/best-practices/develop/target-sdk) to upload and update apps. <!-- markdown-link-check-enable -->
 Users of older phones may want to use an older API when testing. By default, Bevy uses [`GameActivity`](https://developer.android.com/games/agdk/game-activity), which only works for Android API level 31 and higher, so if you want to use older API, you need to switch to `NativeActivity`.
 
+Keep in mind that if you are using `bevy_audio` the minimum supported Android API version is 26 (Android 8/Oreo).
+
 To use `NativeActivity`, you need to edit it in `cargo.toml` manually like this:
 
 ```toml
diff --git a/examples/README.md b/examples/README.md
index 324fac7163be3..118e2648b1b1c 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -721,6 +721,8 @@ In its examples, Bevy targets the minimum Android API that Play Store  <!-- mark
 [requires](https://developer.android.com/distribute/best-practices/develop/target-sdk) to upload and update apps. <!-- markdown-link-check-enable -->
 Users of older phones may want to use an older API when testing. By default, Bevy uses [`GameActivity`](https://developer.android.com/games/agdk/game-activity), which only works for Android API level 31 and higher, so if you want to use older API, you need to switch to `NativeActivity`.
 
+Keep in mind that if you are using `bevy_audio` the minimum supported Android API version is 26 (Android 8/Oreo).
+
 To use `NativeActivity`, you need to edit it in `cargo.toml` manually like this:
 
 ```toml
diff --git a/examples/mobile/android_basic/readme.md b/examples/mobile/android_basic/readme.md
index 6db652fff6a95..ab812b17b40c9 100644
--- a/examples/mobile/android_basic/readme.md
+++ b/examples/mobile/android_basic/readme.md
@@ -47,6 +47,8 @@ Bevy by default targets Android API level 33 in its examples which is the <!-- m
 [Play Store's minimum API to upload or update apps](https://developer.android.com/distribute/best-practices/develop/target-sdk). <!-- markdown-link-check-enable -->
 Users of older phones may want to use an older API when testing.
 
+Keep in mind that if you are using `bevy_audio` the minimum supported Android API version is 26 (Android 8/Oreo).
+
 To use a different API, the following fields must be updated in `Cargo.toml`:
 
 ```toml

From 201bcb21bd6d55ff454cf0ca2d391327df426733 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 12:01:38 +0200
Subject: [PATCH 05/26] Updates doc comment pointing to older version

---
 examples/movement/physics_in_fixed_timestep.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/movement/physics_in_fixed_timestep.rs b/examples/movement/physics_in_fixed_timestep.rs
index eee2914356484..5c33a067e4240 100644
--- a/examples/movement/physics_in_fixed_timestep.rs
+++ b/examples/movement/physics_in_fixed_timestep.rs
@@ -160,7 +160,7 @@ struct Velocity(Vec3);
 ///
 /// If you want to make sure that this component is always initialized
 /// with the same value as the `Transform`'s translation, you can
-/// use a [component lifecycle hook](https://docs.rs/bevy/0.14.0/bevy/ecs/component/struct.ComponentHooks.html)
+/// use a [component lifecycle hook](https://docs.rs/bevy/latest/bevy/ecs/component/struct.ComponentHooks.html)
 #[derive(Debug, Component, Clone, Copy, PartialEq, Default, Deref, DerefMut)]
 struct PhysicalTranslation(Vec3);
 

From 84dce6821c648ea951b7dd6f3b186e007a1cc9df Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 12:02:26 +0200
Subject: [PATCH 06/26] Bumps referenced bevy version in examples doc template

---
 docs-template/EXAMPLE_README.md.tpl | 2 +-
 examples/README.md                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs-template/EXAMPLE_README.md.tpl b/docs-template/EXAMPLE_README.md.tpl
index 356c27a536efb..b3b62964f7b0e 100644
--- a/docs-template/EXAMPLE_README.md.tpl
+++ b/docs-template/EXAMPLE_README.md.tpl
@@ -165,7 +165,7 @@ Keep in mind that if you are using `bevy_audio` the minimum supported Android AP
 To use `NativeActivity`, you need to edit it in `cargo.toml` manually like this:
 
 ```toml
-bevy = { version = "0.14", default-features = false, features = ["android-native-activity", ...] }
+bevy = { version = "0.16", default-features = false, features = ["android-native-activity", ...] }
 ```
 
 Then build it as the [Build & Run](#build--run) section stated above.
diff --git a/examples/README.md b/examples/README.md
index 118e2648b1b1c..d0e6890a5d236 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -726,7 +726,7 @@ Keep in mind that if you are using `bevy_audio` the minimum supported Android AP
 To use `NativeActivity`, you need to edit it in `cargo.toml` manually like this:
 
 ```toml
-bevy = { version = "0.14", default-features = false, features = ["android-native-activity", ...] }
+bevy = { version = "0.16", default-features = false, features = ["android-native-activity", ...] }
 ```
 
 Then build it as the [Build & Run](#build--run) section stated above.

From ea265e240afdf06a565673126ea8a618599fc33f Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 12:06:22 +0200
Subject: [PATCH 07/26] Replaces aarch64-apple-ios-sim target with
 arm64-apple-ios-simulator

---
 .github/workflows/update-caches.yml   | 2 +-
 .github/workflows/validation-jobs.yml | 8 ++++----
 docs-template/EXAMPLE_README.md.tpl   | 4 ++--
 examples/README.md                    | 4 ++--
 examples/mobile/build_rust_deps.sh    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml
index 0a1d137271b96..add43e0579379 100644
--- a/.github/workflows/update-caches.yml
+++ b/.github/workflows/update-caches.yml
@@ -83,7 +83,7 @@ jobs:
             target: aarch64-linux-android
           - os: macos-14
             toolchain: stable
-            target: aarch64-apple-ios-sim
+            target: arm64-apple-ios-simulator
 
     steps:
       # prepare the date - used to rebuild the cache daily to update the cache for rust nightly, even if no change on Bevy dependencies
diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml
index 7d3d75d9df11f..7c38c457e3c51 100644
--- a/.github/workflows/validation-jobs.yml
+++ b/.github/workflows/validation-jobs.yml
@@ -36,11 +36,11 @@ jobs:
       - uses: actions/cache/restore@v4
         with:
           # key won't match, will rely on restore-keys
-          key: ${{ runner.os }}-stable-aarch64-apple-ios-sim-${{ hashFiles('**/Cargo.toml') }}-
+          key: ${{ runner.os }}-stable-arm64-apple-ios-simulator-${{ hashFiles('**/Cargo.toml') }}-
           # See .github/workflows/validation-jobs.yml for how keys are generated
           restore-keys: |
-            ${{ runner.os }}-stable-aarch64-apple-ios-sim-${{ hashFiles('**/Cargo.toml') }}-
-            ${{ runner.os }}-stable-aarch64-apple-ios-sim-
+            ${{ runner.os }}-stable-arm64-apple-ios-simulator-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ runner.os }}-stable-arm64-apple-ios-simulator-
           path: |
             ~/.cargo/bin/
             ~/.cargo/registry/index/
@@ -49,7 +49,7 @@ jobs:
             target/
 
       - name: Add iOS targets
-        run: rustup target add aarch64-apple-ios-sim
+        run: rustup target add arm64-apple-ios-simulator
 
       - name: Build and install iOS app in iOS Simulator.
         run: cd examples/mobile && make install
diff --git a/docs-template/EXAMPLE_README.md.tpl b/docs-template/EXAMPLE_README.md.tpl
index b3b62964f7b0e..e818a4d6701a5 100644
--- a/docs-template/EXAMPLE_README.md.tpl
+++ b/docs-template/EXAMPLE_README.md.tpl
@@ -186,10 +186,10 @@ You need to install the correct rust targets:
 
 - `aarch64-apple-ios`: iOS devices
 - `x86_64-apple-ios`: iOS simulator on x86 processors
-- `aarch64-apple-ios-sim`: iOS simulator on Apple processors
+- `arm64-apple-ios-simulator`: iOS simulator on Apple processors
 
 ```sh
-rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
+rustup target add aarch64-apple-ios x86_64-apple-ios arm64-apple-ios-simulator
 ```
 
 #### Build & Run
diff --git a/examples/README.md b/examples/README.md
index d0e6890a5d236..f70a2ffb6a3ec 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -747,10 +747,10 @@ You need to install the correct rust targets:
 
 - `aarch64-apple-ios`: iOS devices
 - `x86_64-apple-ios`: iOS simulator on x86 processors
-- `aarch64-apple-ios-sim`: iOS simulator on Apple processors
+- `arm64-apple-ios-simulator`: iOS simulator on Apple processors
 
 ```sh
-rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
+rustup target add aarch64-apple-ios x86_64-apple-ios arm64-apple-ios-simulator
 ```
 
 #### Build & Run
diff --git a/examples/mobile/build_rust_deps.sh b/examples/mobile/build_rust_deps.sh
index 79eeddb28de85..53d5761ac3c04 100755
--- a/examples/mobile/build_rust_deps.sh
+++ b/examples/mobile/build_rust_deps.sh
@@ -54,7 +54,7 @@ for arch in $ARCHS; do
         TARGET=aarch64-apple-ios
       else
         # M1 iOS simulator
-        TARGET=aarch64-apple-ios-sim
+        TARGET=arm64-apple-ios-simulator
       fi
   esac
 

From 0bdb9f9b777990ea5552101f39fa60d564cc4d76 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 13:13:42 +0200
Subject: [PATCH 08/26] Reworks audio feature flags

---
 Cargo.toml                      | 23 +++++++++++++----------
 crates/bevy_audio/Cargo.toml    | 29 +++++++++++++++++++----------
 crates/bevy_internal/Cargo.toml |  1 +
 docs/cargo_features.md          | 21 +++++++++++----------
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ce3b87468e628..fff231d0ba87f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -488,34 +488,37 @@ zstd_rust = ["bevy_internal/zstd_rust"]
 # For KTX2 Zstandard decompression using [zstd](https://crates.io/crates/zstd). This is a faster backend, but uses unsafe C bindings. For the safe option, stick to the default backend with "zstd_rust".
 zstd_c = ["bevy_internal/zstd_c"]
 
-# FLAC audio format support
+# FLAC audio format support (through `claxon`)
 flac = ["bevy_internal/flac"]
 
-# MP3 audio format support
+# MP3 audio format support (through `minimp3`)
 mp3 = ["bevy_internal/mp3"]
 
-# OGG/VORBIS audio format support
+# OGG/VORBIS audio format support (through `lewton`)
 vorbis = ["bevy_internal/vorbis"]
 
-# WAV audio format support
+# WAV audio format support (through `hound`)
 wav = ["bevy_internal/wav"]
 
-# AAC audio format support (through symphonia)
+# AAC audio format support (through `symphonia`)
 symphonia-aac = ["bevy_internal/symphonia-aac"]
 
-# AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through symphonia)
+# AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through `symphonia`)
 symphonia-all = ["bevy_internal/symphonia-all"]
 
-# FLAC audio format support (through symphonia)
+# FLAC audio format support (through `symphonia`)
 symphonia-flac = ["bevy_internal/symphonia-flac"]
 
-# MP4 audio format support (through symphonia)
+# MP4 audio format support (through `symphonia`)
 symphonia-isomp4 = ["bevy_internal/symphonia-isomp4"]
 
-# OGG/VORBIS audio format support (through symphonia)
+# MP3 audio format support (through `symphonia`)
+symphonia-mp3 = ["bevy_internal/symphonia-mp3"]
+
+# OGG/VORBIS audio format support (through `symphonia`)
 symphonia-vorbis = ["bevy_internal/symphonia-vorbis"]
 
-# WAV audio format support (through symphonia)
+# WAV audio format support (through `symphonia`)
 symphonia-wav = ["bevy_internal/symphonia-wav"]
 
 # Enable serialization support through serde
diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index c6789dbac9ba2..5d8211c1d6522 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -18,7 +18,7 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev" }
 bevy_transform = { path = "../bevy_transform", version = "0.18.0-dev" }
 
 # other
-rodio = { version = "0.21", default-features = false }
+rodio = { version = "0.21", default-features = false, features = ["playback"] }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
@@ -28,6 +28,7 @@ cpal = { version = "0.16", optional = true }
 # TODO: Assuming all wasm builds are for the browser. Require `no_std` support to break assumption.
 rodio = { version = "0.21", default-features = false, features = [
   "wasm-bindgen",
+  "playback",
 ] }
 bevy_app = { path = "../bevy_app", version = "0.18.0-dev", default-features = false, features = [
   "web",
@@ -37,16 +38,24 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", default-featu
 ] }
 
 [features]
-mp3 = ["rodio/mp3"]
-flac = ["rodio/flac"]
-wav = ["rodio/wav"]
-vorbis = ["rodio/vorbis"]
+default = ["mp3", "flac", "wav", "vorbis"]
+mp3 = ["rodio/minimp3"]
+flac = ["rodio/claxon"]
+wav = ["rodio/hound"]
+vorbis = ["rodio/lewton"]
 symphonia-aac = ["rodio/symphonia-aac"]
-symphonia-all = ["rodio/symphonia-all"]
-symphonia-flac = ["rodio/symphonia-flac"]
-symphonia-isomp4 = ["rodio/symphonia-isomp4"]
-symphonia-vorbis = ["rodio/symphonia-vorbis"]
-symphonia-wav = ["rodio/symphonia-wav"]
+symphonia-all = [
+  "rodio/flac",
+  "rodio/mp3",
+  "rodio/mp4",
+  "rodio/vorbis",
+  "rodio/wav",
+]
+symphonia-flac = ["rodio/flac"]
+symphonia-isomp4 = ["rodio/mp4"]
+symphonia-mp3 = ["rodio/mp3"]
+symphonia-vorbis = ["rodio/vorbis"]
+symphonia-wav = ["rodio/wav"]
 # Enable using a shared stdlib for cxx on Android.
 android_shared_stdcxx = ["cpal/oboe-shared-stdcxx"]
 
diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index c894e3664405f..9211f78273d8d 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -96,6 +96,7 @@ symphonia-aac = ["bevy_audio/symphonia-aac"]
 symphonia-all = ["bevy_audio/symphonia-all"]
 symphonia-flac = ["bevy_audio/symphonia-flac"]
 symphonia-isomp4 = ["bevy_audio/symphonia-isomp4"]
+symphonia-mp3 = ["bevy_audio/symphonia-mp3"]
 symphonia-vorbis = ["bevy_audio/symphonia-vorbis"]
 symphonia-wav = ["bevy_audio/symphonia-wav"]
 
diff --git a/docs/cargo_features.md b/docs/cargo_features.md
index 5f7e33960539d..de150f92be676 100644
--- a/docs/cargo_features.md
+++ b/docs/cargo_features.md
@@ -122,7 +122,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |exr|EXR image format support|
 |ff|Farbfeld image format support|
 |file_watcher|Enables watching the filesystem for Bevy Asset hot-reloading|
-|flac|FLAC audio format support|
+|flac|FLAC audio format support (through `claxon`)|
 |force_disable_dlss|Forcibly disable DLSS so that cargo build --all-features works without the DLSS SDK being installed. Not meant for users.|
 |free_camera|Enables the free cam from bevy_camera_controller|
 |ghost_nodes|Experimental support for nodes that are ignored for UI layouting|
@@ -142,7 +142,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |meshlet_processor|Enables processing meshes into meshlet meshes for bevy_pbr|
 |morph|Enables support for morph target weights in bevy_mesh|
 |morph_animation|Enables bevy_mesh and bevy_animation morph weight support|
-|mp3|MP3 audio format support|
+|mp3|MP3 audio format support (through `minimp3`)|
 |multi_threaded|Enables multithreaded parallelism in the engine. Disabling it forces all engine tasks to run on a single thread.|
 |pan_camera|Enables the pan camera from bevy_camera_controller|
 |pbr_anisotropy_texture|Enable support for anisotropy texture in the `StandardMaterial`, at the risk of blowing past the global, per-shader texture limit on older/lower-end GPUs|
@@ -168,12 +168,13 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |sprite_picking|Provides an implementation for picking sprites|
 |statically-linked-dxc|Statically linked DXC shader compiler for DirectX 12|
 |std|Allows access to the `std` crate.|
-|symphonia-aac|AAC audio format support (through symphonia)|
-|symphonia-all|AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through symphonia)|
-|symphonia-flac|FLAC audio format support (through symphonia)|
-|symphonia-isomp4|MP4 audio format support (through symphonia)|
-|symphonia-vorbis|OGG/VORBIS audio format support (through symphonia)|
-|symphonia-wav|WAV audio format support (through symphonia)|
+|symphonia-aac|AAC audio format support (through `symphonia`)|
+|symphonia-all|AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through `symphonia`)|
+|symphonia-flac|FLAC audio format support (through `symphonia`)|
+|symphonia-isomp4|MP4 audio format support (through `symphonia`)|
+|symphonia-mp3|MP3 audio format support (through `symphonia`)|
+|symphonia-vorbis|OGG/VORBIS audio format support (through `symphonia`)|
+|symphonia-wav|WAV audio format support (through `symphonia`)|
 |sysinfo_plugin|Enables system information diagnostic plugin|
 |tga|TGA image format support|
 |tiff|TIFF image format support|
@@ -184,8 +185,8 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |trace_tracy_memory|Tracing support, with memory profiling, exposing a port for Tracy|
 |track_location|Enables source location tracking for change detection and spawning/despawning, which can assist with debugging|
 |ui_picking|Provides an implementation for picking UI|
-|vorbis|OGG/VORBIS audio format support|
-|wav|WAV audio format support|
+|vorbis|OGG/VORBIS audio format support (through `lewton`)|
+|wav|WAV audio format support (through `hound`)|
 |wayland|Wayland display server support|
 |web|Enables use of browser APIs. Note this is currently only applicable on `wasm32` architectures.|
 |web_asset_cache|Enable caching downloaded assets on the filesystem. NOTE: this cache currently never invalidates entries!|

From 07be88749e365d6a705efe8e9270ccc52c97f992 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Mon, 28 Jul 2025 15:12:00 +0200
Subject: [PATCH 09/26] Migrates code for rodio 0.21 compatibility

---
 crates/bevy_audio/Cargo.toml          |  1 -
 crates/bevy_audio/src/audio_output.rs | 61 +++++++--------------------
 crates/bevy_audio/src/audio_source.rs | 47 +++++++++++++--------
 crates/bevy_audio/src/lib.rs          |  2 +-
 crates/bevy_audio/src/pitch.rs        |  1 -
 crates/bevy_audio/src/sinks.rs        |  2 +-
 examples/audio/decodable.rs           |  4 +-
 7 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 5d8211c1d6522..63d538d2a4406 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -38,7 +38,6 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", default-featu
 ] }
 
 [features]
-default = ["mp3", "flac", "wav", "vorbis"]
 mp3 = ["rodio/minimp3"]
 flac = ["rodio/claxon"]
 wav = ["rodio/hound"]
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index d02d326501298..15236b6678ff7 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -6,42 +6,25 @@ use bevy_asset::{Asset, Assets};
 use bevy_ecs::{prelude::*, system::SystemParam};
 use bevy_math::Vec3;
 use bevy_transform::prelude::GlobalTransform;
-use rodio::{OutputStream, OutputStreamHandle, Sink, Source, SpatialSink};
+use rodio::{OutputStream, OutputStreamBuilder, Sink, Source, SpatialSink};
 use tracing::warn;
 
 use crate::{AudioSink, AudioSinkPlayback};
 
 /// Used internally to play audio on the current "audio device"
-///
-/// ## Note
-///
-/// Initializing this resource will leak [`OutputStream`]
-/// using [`std::mem::forget`].
-/// This is done to avoid storing this in the struct (and making this `!Send`)
-/// while preventing it from dropping (to avoid halting of audio).
-///
-/// This is fine when initializing this once (as is default when adding this plugin),
-/// since the memory cost will be the same.
-/// However, repeatedly inserting this resource into the app will **leak more memory**.
 #[derive(Resource)]
 pub(crate) struct AudioOutput {
-    stream_handle: Option<OutputStreamHandle>,
+    stream: Option<OutputStream>,
 }
 
 impl Default for AudioOutput {
     fn default() -> Self {
-        if let Ok((stream, stream_handle)) = OutputStream::try_default() {
-            // We leak `OutputStream` to prevent the audio from stopping.
-            core::mem::forget(stream);
-            Self {
-                stream_handle: Some(stream_handle),
-            }
-        } else {
-            warn!("No audio device found.");
-            Self {
-                stream_handle: None,
-            }
-        }
+        let stream = OutputStreamBuilder::open_default_stream()
+            .inspect_err(|_err| {
+                warn!("No audio device found.");
+            })
+            .ok();
+        Self { stream }
     }
 }
 
@@ -111,12 +94,13 @@ pub(crate) fn play_queued_audio_system<Source: Asset + Decodable>(
     default_spatial_scale: Res<DefaultSpatialScale>,
     mut commands: Commands,
 ) where
-    f32: rodio::cpal::FromSample<Source::DecoderItem>,
+    f32: rodio::cpal::FromSample<rodio::Sample>,
 {
-    let Some(stream_handle) = audio_output.stream_handle.as_ref() else {
+    let Some(stream) = audio_output.stream.as_ref() else {
         // audio output unavailable; cannot play sound
         return;
     };
+    let mixer = stream.mixer();
 
     for (entity, source_handle, settings, maybe_emitter_transform) in &query_nonplaying {
         let Some(audio_source) = audio_sources.get(&source_handle.0) else {
@@ -144,18 +128,12 @@ pub(crate) fn play_queued_audio_system<Source: Asset + Decodable>(
                 Vec3::ZERO.into()
             };
 
-            let sink = match SpatialSink::try_new(
-                stream_handle,
+            let sink = SpatialSink::connect_new(
+                mixer,
                 emitter_translation,
                 (left_ear * scale).into(),
                 (right_ear * scale).into(),
-            ) {
-                Ok(sink) => sink,
-                Err(err) => {
-                    warn!("Error creating spatial sink: {err:?}");
-                    continue;
-                }
-            };
+            );
 
             let decoder = audio_source.decoder();
 
@@ -226,14 +204,7 @@ pub(crate) fn play_queued_audio_system<Source: Asset + Decodable>(
                     .insert((sink, PlaybackRemoveMarker)),
             };
         } else {
-            let sink = match Sink::try_new(stream_handle) {
-                Ok(sink) => sink,
-                Err(err) => {
-                    warn!("Error creating sink: {err:?}");
-                    continue;
-                }
-            };
-
+            let sink = Sink::connect_new(mixer);
             let decoder = audio_source.decoder();
 
             match settings.mode {
@@ -359,7 +330,7 @@ pub(crate) fn cleanup_finished_audio<T: Decodable + Asset>(
 
 /// Run Condition to only play audio if the audio output is available
 pub(crate) fn audio_output_available(audio_output: Res<AudioOutput>) -> bool {
-    audio_output.stream_handle.is_some()
+    audio_output.stream.is_some()
 }
 
 /// Updates spatial audio sinks when emitter positions change.
diff --git a/crates/bevy_audio/src/audio_source.rs b/crates/bevy_audio/src/audio_source.rs
index 9cf3ca988b0b1..e161f1d61b7b6 100644
--- a/crates/bevy_audio/src/audio_source.rs
+++ b/crates/bevy_audio/src/audio_source.rs
@@ -31,9 +31,10 @@ impl AsRef<[u8]> for AudioSource {
 /// This asset loader supports different audio formats based on the enable Bevy features.
 /// The feature `bevy/vorbis` enables loading from `.ogg` files and is enabled by default.
 /// Other file endings can be loaded from with additional features:
-/// `.mp3` with `bevy/mp3`
-/// `.flac` with `bevy/flac`
-/// `.wav` with `bevy/wav`
+/// `.mp3` with `bevy/mp3` or `bevy/symphonia-mp3`
+/// `.flac` with `bevy/flac` or `bevy/symphonia-flac`
+/// `.wav` with `bevy/wav` or `bevy/symphonia-wav`
+/// The `bevy/symphonia-all` feature will enable all file endings.
 #[derive(Default)]
 pub struct AudioLoader;
 
@@ -57,17 +58,33 @@ impl AssetLoader for AudioLoader {
 
     fn extensions(&self) -> &[&str] {
         &[
-            #[cfg(feature = "mp3")]
+            #[cfg(any(feature = "mp3", feature = "symphonia-mp3", feature = "symphonia-all"))]
             "mp3",
-            #[cfg(feature = "flac")]
+            #[cfg(any(
+                feature = "flac",
+                feature = "symphonia-flac",
+                feature = "symphonia-all"
+            ))]
             "flac",
-            #[cfg(feature = "wav")]
+            #[cfg(any(feature = "wav", feature = "symphonia-wav", feature = "symphonia-all"))]
             "wav",
-            #[cfg(feature = "vorbis")]
+            #[cfg(any(
+                feature = "vorbis",
+                feature = "symphonia-vorbis",
+                feature = "symphonia-all"
+            ))]
             "oga",
-            #[cfg(feature = "vorbis")]
+            #[cfg(any(
+                feature = "vorbis",
+                feature = "symphonia-vorbis",
+                feature = "symphonia-all"
+            ))]
             "ogg",
-            #[cfg(feature = "vorbis")]
+            #[cfg(any(
+                feature = "vorbis",
+                feature = "symphonia-vorbis",
+                feature = "symphonia-all"
+            ))]
             "spx",
         ]
     }
@@ -80,22 +97,16 @@ impl AssetLoader for AudioLoader {
 /// This trait is implemented for [`AudioSource`].
 /// Check the example [`decodable`](https://github.com/bevyengine/bevy/blob/latest/examples/audio/decodable.rs) for how to implement this trait on a custom type.
 pub trait Decodable: Send + Sync + 'static {
-    /// The type of the audio samples.
-    /// Usually a [`u16`], [`i16`] or [`f32`], as those implement [`rodio::Sample`].
-    /// Other types can implement the [`rodio::Sample`] trait as well.
-    type DecoderItem: rodio::Sample + Send + Sync;
-
     /// The type of the iterator of the audio samples,
-    /// which iterates over samples of type [`Self::DecoderItem`].
+    /// which iterates over samples of type [`rodio::Sample`].
     /// Must be a [`rodio::Source`] so that it can provide information on the audio it is iterating over.
-    type Decoder: rodio::Source + Send + Iterator<Item = Self::DecoderItem>;
+    type Decoder: rodio::Source + Send + Iterator<Item = rodio::Sample>;
 
     /// Build and return a [`Self::Decoder`] of the implementing type
     fn decoder(&self) -> Self::Decoder;
 }
 
 impl Decodable for AudioSource {
-    type DecoderItem = <rodio::Decoder<Cursor<AudioSource>> as Iterator>::Item;
     type Decoder = rodio::Decoder<Cursor<AudioSource>>;
 
     fn decoder(&self) -> Self::Decoder {
@@ -115,5 +126,5 @@ pub trait AddAudioSource {
     fn add_audio_source<T>(&mut self) -> &mut Self
     where
         T: Decodable + Asset,
-        f32: rodio::cpal::FromSample<T::DecoderItem>;
+        f32: rodio::cpal::FromSample<rodio::Sample>;
 }
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index 3fd7aed5ee524..f8803acaa5a32 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -108,7 +108,7 @@ impl AddAudioSource for App {
     fn add_audio_source<T>(&mut self) -> &mut Self
     where
         T: Decodable + Asset,
-        f32: rodio::cpal::FromSample<T::DecoderItem>,
+        f32: rodio::cpal::FromSample<Sample>,
     {
         self.init_asset::<T>().add_systems(
             PostUpdate,
diff --git a/crates/bevy_audio/src/pitch.rs b/crates/bevy_audio/src/pitch.rs
index d85b9b31cf071..2869ed9c5d333 100644
--- a/crates/bevy_audio/src/pitch.rs
+++ b/crates/bevy_audio/src/pitch.rs
@@ -26,7 +26,6 @@ impl Pitch {
 }
 
 impl Decodable for Pitch {
-    type DecoderItem = <SineWave as Iterator>::Item;
     type Decoder = TakeDuration<SineWave>;
 
     fn decoder(&self) -> Self::Decoder {
diff --git a/crates/bevy_audio/src/sinks.rs b/crates/bevy_audio/src/sinks.rs
index 1e020d1fd8d71..4e94731bb3c9a 100644
--- a/crates/bevy_audio/src/sinks.rs
+++ b/crates/bevy_audio/src/sinks.rs
@@ -412,7 +412,7 @@ mod tests {
 
     #[test]
     fn test_audio_sink() {
-        let (sink, _queue_rx) = Sink::new_idle();
+        let (sink, _queue_rx) = Sink::new();
         let audio_sink = AudioSink::new(sink);
         test_audio_sink_playback(audio_sink);
     }
diff --git a/examples/audio/decodable.rs b/examples/audio/decodable.rs
index c738668219479..c76a9a648a819 100644
--- a/examples/audio/decodable.rs
+++ b/examples/audio/decodable.rs
@@ -54,7 +54,7 @@ impl Iterator for SineDecoder {
 // `Source` is what allows the audio source to be played by bevy.
 // This trait provides information on the audio.
 impl Source for SineDecoder {
-    fn current_frame_len(&self) -> Option<usize> {
+    fn current_span_len(&self) -> Option<usize> {
         None
     }
 
@@ -73,8 +73,6 @@ impl Source for SineDecoder {
 
 // Finally `Decodable` can be implemented for our `SineAudio`.
 impl Decodable for SineAudio {
-    type DecoderItem = <SineDecoder as Iterator>::Item;
-
     type Decoder = SineDecoder;
 
     fn decoder(&self) -> Self::Decoder {

From 38f49f8134e37c298258d4479df8e4dd5894cd23 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:16:25 +0200
Subject: [PATCH 10/26] Reworks features to make symphonia the default

---
 Cargo.toml                   | 24 ++++++++++++------------
 crates/bevy_audio/Cargo.toml | 22 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fff231d0ba87f..0eeba2178878f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -489,37 +489,37 @@ zstd_rust = ["bevy_internal/zstd_rust"]
 zstd_c = ["bevy_internal/zstd_c"]
 
 # FLAC audio format support (through `claxon`)
-flac = ["bevy_internal/flac"]
+fallback-flac = ["bevy_internal/flac"]
 
 # MP3 audio format support (through `minimp3`)
-mp3 = ["bevy_internal/mp3"]
+fallback-mp3 = ["bevy_internal/mp3"]
 
 # OGG/VORBIS audio format support (through `lewton`)
-vorbis = ["bevy_internal/vorbis"]
+fallback-vorbis = ["bevy_internal/vorbis"]
 
 # WAV audio format support (through `hound`)
-wav = ["bevy_internal/wav"]
+fallback-wav = ["bevy_internal/wav"]
 
 # AAC audio format support (through `symphonia`)
-symphonia-aac = ["bevy_internal/symphonia-aac"]
+aac = ["bevy_internal/aac"]
 
 # AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through `symphonia`)
-symphonia-all = ["bevy_internal/symphonia-all"]
+audio-all = ["bevy_internal/audio-all"]
 
 # FLAC audio format support (through `symphonia`)
-symphonia-flac = ["bevy_internal/symphonia-flac"]
+flac = ["bevy_internal/flac"]
 
-# MP4 audio format support (through `symphonia`)
-symphonia-isomp4 = ["bevy_internal/symphonia-isomp4"]
+# MP4 audio format support (through `symphonia`). It also enables AAC support.
+mp4 = ["bevy_internal/mp4"]
 
 # MP3 audio format support (through `symphonia`)
-symphonia-mp3 = ["bevy_internal/symphonia-mp3"]
+mp3 = ["bevy_internal/mp3"]
 
 # OGG/VORBIS audio format support (through `symphonia`)
-symphonia-vorbis = ["bevy_internal/symphonia-vorbis"]
+vorbis = ["bevy_internal/vorbis"]
 
 # WAV audio format support (through `symphonia`)
-symphonia-wav = ["bevy_internal/symphonia-wav"]
+wav = ["bevy_internal/wav"]
 
 # Enable serialization support through serde
 serialize = ["bevy_internal/serialize"]
diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 63d538d2a4406..27ce2005b7177 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -38,23 +38,23 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", default-featu
 ] }
 
 [features]
-mp3 = ["rodio/minimp3"]
-flac = ["rodio/claxon"]
-wav = ["rodio/hound"]
-vorbis = ["rodio/lewton"]
-symphonia-aac = ["rodio/symphonia-aac"]
-symphonia-all = [
+fallback-mp3 = ["rodio/minimp3"]
+fallback-flac = ["rodio/claxon"]
+fallback-wav = ["rodio/hound"]
+fallback-vorbis = ["rodio/lewton"]
+mp3 = ["rodio/mp3"]
+mp4 = ["rodio/mp4"]
+flac = ["rodio/flac"]
+wav = ["rodio/wav"]
+vorbis = ["rodio/vorbis"]
+aac = ["rodio/symphonia-aac"]
+audio-all = [
   "rodio/flac",
   "rodio/mp3",
   "rodio/mp4",
   "rodio/vorbis",
   "rodio/wav",
 ]
-symphonia-flac = ["rodio/flac"]
-symphonia-isomp4 = ["rodio/mp4"]
-symphonia-mp3 = ["rodio/mp3"]
-symphonia-vorbis = ["rodio/vorbis"]
-symphonia-wav = ["rodio/wav"]
 # Enable using a shared stdlib for cxx on Android.
 android_shared_stdcxx = ["cpal/oboe-shared-stdcxx"]
 

From 1749fa48df2aee431af4a7ff728b1a4957e86f22 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:23:53 +0200
Subject: [PATCH 11/26] Fixes internal feature flags

---
 crates/bevy_internal/Cargo.toml | 14 +++++++-------
 docs/cargo_features.md          | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index 9211f78273d8d..b6737164b8ef6 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -90,15 +90,15 @@ force_disable_dlss = [
 # Audio format support (vorbis is enabled by default)
 flac = ["bevy_audio/flac"]
 mp3 = ["bevy_audio/mp3"]
+mp4 = ["bevy_audio/mp4"]
 vorbis = ["bevy_audio/vorbis"]
 wav = ["bevy_audio/wav"]
-symphonia-aac = ["bevy_audio/symphonia-aac"]
-symphonia-all = ["bevy_audio/symphonia-all"]
-symphonia-flac = ["bevy_audio/symphonia-flac"]
-symphonia-isomp4 = ["bevy_audio/symphonia-isomp4"]
-symphonia-mp3 = ["bevy_audio/symphonia-mp3"]
-symphonia-vorbis = ["bevy_audio/symphonia-vorbis"]
-symphonia-wav = ["bevy_audio/symphonia-wav"]
+aac = ["bevy_audio/aac"]
+audio-all = ["bevy_audio/audio-all"]
+fallback-flac = ["bevy_audio/fallback-flac"]
+fallback-mp3 = ["bevy_audio/fallback-mp3"]
+fallback-vorbis = ["bevy_audio/fallback-vorbis"]
+fallback-wav = ["bevy_audio/fallback-wav"]
 
 # Shader formats
 shader_format_glsl = [
diff --git a/docs/cargo_features.md b/docs/cargo_features.md
index de150f92be676..df0d67e321f89 100644
--- a/docs/cargo_features.md
+++ b/docs/cargo_features.md
@@ -57,6 +57,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 
 |Feature|Description|
 |-|-|
+|aac|AAC audio format support (through `symphonia`)|
 |accesskit_unix|Enable AccessKit on Unix backends (currently only works with experimental screen readers and forks.)|
 |android-game-activity|Android GameActivity support. Default, choose between this and `android-native-activity`.|
 |android-native-activity|Android NativeActivity support. Legacy, should be avoided for most new Android games.|
@@ -64,6 +65,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |asset_processor|Enables the built-in asset processor for processed assets.|
 |async-io|Use async-io's implementation of block_on instead of futures-lite's implementation. This is preferred if your application uses async-io.|
 |async_executor|Uses `async-executor` as a task execution backend.|
+|audio-all|AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through `symphonia`)|
 |basis-universal|Basis Universal compressed texture support|
 |bevy_animation|Provides animation functionality|
 |bevy_anti_alias|Provides various anti aliasing solutions|
@@ -120,9 +122,13 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |experimental_bevy_ui_widgets|Experimental headless widget collection for Bevy UI.|
 |experimental_pbr_pcss|Enable support for PCSS, at the risk of blowing past the global, per-shader sampler limit on older/lower-end GPUs|
 |exr|EXR image format support|
+|fallback-flac|FLAC audio format support (through `claxon`)|
+|fallback-mp3|MP3 audio format support (through `minimp3`)|
+|fallback-vorbis|OGG/VORBIS audio format support (through `lewton`)|
+|fallback-wav|WAV audio format support (through `hound`)|
 |ff|Farbfeld image format support|
 |file_watcher|Enables watching the filesystem for Bevy Asset hot-reloading|
-|flac|FLAC audio format support (through `claxon`)|
+|flac|FLAC audio format support (through `symphonia`)|
 |force_disable_dlss|Forcibly disable DLSS so that cargo build --all-features works without the DLSS SDK being installed. Not meant for users.|
 |free_camera|Enables the free cam from bevy_camera_controller|
 |ghost_nodes|Experimental support for nodes that are ignored for UI layouting|
@@ -142,7 +148,8 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |meshlet_processor|Enables processing meshes into meshlet meshes for bevy_pbr|
 |morph|Enables support for morph target weights in bevy_mesh|
 |morph_animation|Enables bevy_mesh and bevy_animation morph weight support|
-|mp3|MP3 audio format support (through `minimp3`)|
+|mp3|MP3 audio format support (through `symphonia`)|
+|mp4|MP4 audio format support (through `symphonia`). It also enables AAC support.|
 |multi_threaded|Enables multithreaded parallelism in the engine. Disabling it forces all engine tasks to run on a single thread.|
 |pan_camera|Enables the pan camera from bevy_camera_controller|
 |pbr_anisotropy_texture|Enable support for anisotropy texture in the `StandardMaterial`, at the risk of blowing past the global, per-shader texture limit on older/lower-end GPUs|
@@ -168,13 +175,6 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |sprite_picking|Provides an implementation for picking sprites|
 |statically-linked-dxc|Statically linked DXC shader compiler for DirectX 12|
 |std|Allows access to the `std` crate.|
-|symphonia-aac|AAC audio format support (through `symphonia`)|
-|symphonia-all|AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through `symphonia`)|
-|symphonia-flac|FLAC audio format support (through `symphonia`)|
-|symphonia-isomp4|MP4 audio format support (through `symphonia`)|
-|symphonia-mp3|MP3 audio format support (through `symphonia`)|
-|symphonia-vorbis|OGG/VORBIS audio format support (through `symphonia`)|
-|symphonia-wav|WAV audio format support (through `symphonia`)|
 |sysinfo_plugin|Enables system information diagnostic plugin|
 |tga|TGA image format support|
 |tiff|TIFF image format support|
@@ -185,8 +185,8 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |trace_tracy_memory|Tracing support, with memory profiling, exposing a port for Tracy|
 |track_location|Enables source location tracking for change detection and spawning/despawning, which can assist with debugging|
 |ui_picking|Provides an implementation for picking UI|
-|vorbis|OGG/VORBIS audio format support (through `lewton`)|
-|wav|WAV audio format support (through `hound`)|
+|vorbis|OGG/VORBIS audio format support (through `symphonia`)|
+|wav|WAV audio format support (through `symphonia`)|
 |wayland|Wayland display server support|
 |web|Enables use of browser APIs. Note this is currently only applicable on `wasm32` architectures.|
 |web_asset_cache|Enable caching downloaded assets on the filesystem. NOTE: this cache currently never invalidates entries!|

From 20cabfc5df1dad6921b91e9baf0aab5276ffdc31 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:25:37 +0200
Subject: [PATCH 12/26] Fixes feature gated extensions

---
 crates/bevy_audio/src/audio_source.rs | 28 ++++++---------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/crates/bevy_audio/src/audio_source.rs b/crates/bevy_audio/src/audio_source.rs
index e161f1d61b7b6..953aebc673f55 100644
--- a/crates/bevy_audio/src/audio_source.rs
+++ b/crates/bevy_audio/src/audio_source.rs
@@ -58,33 +58,17 @@ impl AssetLoader for AudioLoader {
 
     fn extensions(&self) -> &[&str] {
         &[
-            #[cfg(any(feature = "mp3", feature = "symphonia-mp3", feature = "symphonia-all"))]
+            #[cfg(any(feature = "mp3", feature = "fallback-mp3", feature = "audio-all"))]
             "mp3",
-            #[cfg(any(
-                feature = "flac",
-                feature = "symphonia-flac",
-                feature = "symphonia-all"
-            ))]
+            #[cfg(any(feature = "flac", feature = "fallback-flac", feature = "audio-all"))]
             "flac",
-            #[cfg(any(feature = "wav", feature = "symphonia-wav", feature = "symphonia-all"))]
+            #[cfg(any(feature = "wav", feature = "fallback-wav", feature = "audio-all"))]
             "wav",
-            #[cfg(any(
-                feature = "vorbis",
-                feature = "symphonia-vorbis",
-                feature = "symphonia-all"
-            ))]
+            #[cfg(any(feature = "vorbis", feature = "fallback-vorbis", feature = "audio-all"))]
             "oga",
-            #[cfg(any(
-                feature = "vorbis",
-                feature = "symphonia-vorbis",
-                feature = "symphonia-all"
-            ))]
+            #[cfg(any(feature = "vorbis", feature = "fallback-vorbis", feature = "audio-all"))]
             "ogg",
-            #[cfg(any(
-                feature = "vorbis",
-                feature = "symphonia-vorbis",
-                feature = "symphonia-all"
-            ))]
+            #[cfg(any(feature = "vorbis", feature = "fallback-vorbis", feature = "audio-all"))]
             "spx",
         ]
     }

From 5d44c1c9408e500361c419609af8408d5bbc1f2e Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:26:34 +0200
Subject: [PATCH 13/26] Updates AudioLoader docs

---
 crates/bevy_audio/src/audio_source.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_audio/src/audio_source.rs b/crates/bevy_audio/src/audio_source.rs
index 953aebc673f55..b59d9bf7674e2 100644
--- a/crates/bevy_audio/src/audio_source.rs
+++ b/crates/bevy_audio/src/audio_source.rs
@@ -30,11 +30,11 @@ impl AsRef<[u8]> for AudioSource {
 ///
 /// This asset loader supports different audio formats based on the enable Bevy features.
 /// The feature `bevy/vorbis` enables loading from `.ogg` files and is enabled by default.
-/// Other file endings can be loaded from with additional features:
-/// `.mp3` with `bevy/mp3` or `bevy/symphonia-mp3`
-/// `.flac` with `bevy/flac` or `bevy/symphonia-flac`
-/// `.wav` with `bevy/wav` or `bevy/symphonia-wav`
-/// The `bevy/symphonia-all` feature will enable all file endings.
+/// Other file extensions can be loaded from with additional features:
+/// `.mp3` with `bevy/mp3` or `bevy/fallback-mp3`
+/// `.flac` with `bevy/flac` or `bevy/fallback-flac`
+/// `.wav` with `bevy/wav` or `bevy/fallback-wav`
+/// The `bevy/audio-all` feature will enable all file extensions.
 #[derive(Default)]
 pub struct AudioLoader;
 

From 94cec6906a6eb30fd5cdfc9553ba4802e6898738 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:51:43 +0200
Subject: [PATCH 14/26] Temporarily makes lewton the default ogg backend

---
 crates/bevy_audio/Cargo.toml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 27ce2005b7177..beade62585308 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -41,12 +41,14 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", default-featu
 fallback-mp3 = ["rodio/minimp3"]
 fallback-flac = ["rodio/claxon"]
 fallback-wav = ["rodio/hound"]
-fallback-vorbis = ["rodio/lewton"]
+# TODO: Swap fallback-vorbis and vorbis features
+# once https://github.com/RustAudio/rodio/issues/775 is resolved
+fallback-vorbis = ["rodio/vorbis"]
 mp3 = ["rodio/mp3"]
 mp4 = ["rodio/mp4"]
 flac = ["rodio/flac"]
 wav = ["rodio/wav"]
-vorbis = ["rodio/vorbis"]
+vorbis = ["rodio/lewton"]
 aac = ["rodio/symphonia-aac"]
 audio-all = [
   "rodio/flac",

From 99ba88ca1ab35a0298ffa5b6f02b8231e7e6ebf8 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:42:13 +0200
Subject: [PATCH 15/26] Fixes disable-audio.patch

---
 tools/example-showcase/disable-audio.patch | 45 ++++++++++++----------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/tools/example-showcase/disable-audio.patch b/tools/example-showcase/disable-audio.patch
index fa495d9f9c226..8d2fb465bb366 100644
--- a/tools/example-showcase/disable-audio.patch
+++ b/tools/example-showcase/disable-audio.patch
@@ -1,32 +1,35 @@
 diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
-index 3e8082e23..624769443 100644
+index 15236b667..57f116bde 100644
 --- a/crates/bevy_audio/src/audio_output.rs
 +++ b/crates/bevy_audio/src/audio_output.rs
-@@ -7,7 +7,7 @@ use bevy_ecs::{prelude::*, system::SystemParam};
+@@ -6,28 +6,17 @@ use bevy_asset::{Asset, Assets};
+ use bevy_ecs::{prelude::*, system::SystemParam};
  use bevy_math::Vec3;
  use bevy_transform::prelude::GlobalTransform;
--use rodio::{OutputStream, OutputStreamHandle, Sink, Source, SpatialSink};
-+use rodio::{OutputStreamHandle, Sink, Source, SpatialSink};
+-use rodio::{OutputStream, OutputStreamBuilder, Sink, Source, SpatialSink};
++use rodio::{OutputStream, Sink, Source, SpatialSink};
  use tracing::warn;
  
  use crate::{AudioSink, AudioSinkPlayback};
  
-@@ -30,18 +30,10 @@ pub(crate) struct AudioOutput {
- 
- impl Default for AudioOutput {
-     fn default() -> Self {
--        if let Ok((stream, stream_handle)) = OutputStream::try_default() {
--            // We leak `OutputStream` to prevent the audio from stopping.
--            core::mem::forget(stream);
--            Self {
--                stream_handle: Some(stream_handle),
--            }
--        } else {
-         warn!("No audio device found.");
-         Self {
-             stream_handle: None,
-         }
--        }
-     }
+ /// Used internally to play audio on the current "audio device"
+-#[derive(Resource)]
++#[derive(Resource, Default)]
+ pub(crate) struct AudioOutput {
+     stream: Option<OutputStream>,
  }
  
+-impl Default for AudioOutput {
+-    fn default() -> Self {
+-        let stream = OutputStreamBuilder::open_default_stream()
+-            .inspect_err(|_err| {
+-                warn!("No audio device found.");
+-            })
+-            .ok();
+-        Self { stream }
+-    }
+-}
+-
+ /// Marker for internal use, to despawn entities when playback finishes.
+ #[derive(Component, Default)]
+ pub struct PlaybackDespawnMarker;

From 62fc2bc390bb0a51858e7f559eae5a5d6c15f23c Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Tue, 28 Oct 2025 00:33:12 +0100
Subject: [PATCH 16/26] Fixes licence exceptions for symphonia

---
 deny.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deny.toml b/deny.toml
index a203dfaaa8808..4f2fb38ab1151 100644
--- a/deny.toml
+++ b/deny.toml
@@ -48,9 +48,6 @@ exceptions = [
   { name = "symphonia-codec-aac", allow = [
     "MPL-2.0",
   ] },
-  { name = "symphonia-codec-adpcm", allow = [
-    "MPL-2.0",
-  ] },
   { name = "symphonia-codec-pcm", allow = [
     "MPL-2.0",
   ] },
@@ -63,6 +60,9 @@ exceptions = [
   { name = "symphonia-format-isomp4", allow = [
     "MPL-2.0",
   ] },
+  { name = "symphonia-format-ogg", allow = [
+    "MPL-2.0",
+  ] },
   { name = "symphonia-format-riff", allow = [
     "MPL-2.0",
   ] },

From ae86ae59b907032f0bb7fccb274e66f93ec1913c Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Wed, 29 Oct 2025 20:14:25 +0100
Subject: [PATCH 17/26] Removes minimp3 usage and fixes fallback features

---
 Cargo.toml                            | 13 +++++--------
 crates/bevy_audio/Cargo.toml          |  1 -
 crates/bevy_audio/src/audio_source.rs |  4 ++--
 crates/bevy_internal/Cargo.toml       |  1 -
 docs/cargo_features.md                |  1 -
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0eeba2178878f..c7542ea32bc89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -489,16 +489,13 @@ zstd_rust = ["bevy_internal/zstd_rust"]
 zstd_c = ["bevy_internal/zstd_c"]
 
 # FLAC audio format support (through `claxon`)
-fallback-flac = ["bevy_internal/flac"]
+fallback-flac = ["bevy_internal/fallback-flac"]
 
-# MP3 audio format support (through `minimp3`)
-fallback-mp3 = ["bevy_internal/mp3"]
-
-# OGG/VORBIS audio format support (through `lewton`)
-fallback-vorbis = ["bevy_internal/vorbis"]
+# OGG/VORBIS audio format support (through `symphonia`)
+fallback-vorbis = ["bevy_internal/fallback-vorbis"]
 
 # WAV audio format support (through `hound`)
-fallback-wav = ["bevy_internal/wav"]
+fallback-wav = ["bevy_internal/fallback-wav"]
 
 # AAC audio format support (through `symphonia`)
 aac = ["bevy_internal/aac"]
@@ -515,7 +512,7 @@ mp4 = ["bevy_internal/mp4"]
 # MP3 audio format support (through `symphonia`)
 mp3 = ["bevy_internal/mp3"]
 
-# OGG/VORBIS audio format support (through `symphonia`)
+# OGG/VORBIS audio format support (through `lewton`)
 vorbis = ["bevy_internal/vorbis"]
 
 # WAV audio format support (through `symphonia`)
diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index beade62585308..3ca65a770de3d 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -38,7 +38,6 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", default-featu
 ] }
 
 [features]
-fallback-mp3 = ["rodio/minimp3"]
 fallback-flac = ["rodio/claxon"]
 fallback-wav = ["rodio/hound"]
 # TODO: Swap fallback-vorbis and vorbis features
diff --git a/crates/bevy_audio/src/audio_source.rs b/crates/bevy_audio/src/audio_source.rs
index b59d9bf7674e2..57275d1c637a6 100644
--- a/crates/bevy_audio/src/audio_source.rs
+++ b/crates/bevy_audio/src/audio_source.rs
@@ -31,7 +31,7 @@ impl AsRef<[u8]> for AudioSource {
 /// This asset loader supports different audio formats based on the enable Bevy features.
 /// The feature `bevy/vorbis` enables loading from `.ogg` files and is enabled by default.
 /// Other file extensions can be loaded from with additional features:
-/// `.mp3` with `bevy/mp3` or `bevy/fallback-mp3`
+/// `.mp3` with `bevy/mp3`
 /// `.flac` with `bevy/flac` or `bevy/fallback-flac`
 /// `.wav` with `bevy/wav` or `bevy/fallback-wav`
 /// The `bevy/audio-all` feature will enable all file extensions.
@@ -58,7 +58,7 @@ impl AssetLoader for AudioLoader {
 
     fn extensions(&self) -> &[&str] {
         &[
-            #[cfg(any(feature = "mp3", feature = "fallback-mp3", feature = "audio-all"))]
+            #[cfg(any(feature = "mp3", feature = "audio-all"))]
             "mp3",
             #[cfg(any(feature = "flac", feature = "fallback-flac", feature = "audio-all"))]
             "flac",
diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index b6737164b8ef6..cb06815d347d8 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -96,7 +96,6 @@ wav = ["bevy_audio/wav"]
 aac = ["bevy_audio/aac"]
 audio-all = ["bevy_audio/audio-all"]
 fallback-flac = ["bevy_audio/fallback-flac"]
-fallback-mp3 = ["bevy_audio/fallback-mp3"]
 fallback-vorbis = ["bevy_audio/fallback-vorbis"]
 fallback-wav = ["bevy_audio/fallback-wav"]
 
diff --git a/docs/cargo_features.md b/docs/cargo_features.md
index df0d67e321f89..6f507287b31b8 100644
--- a/docs/cargo_features.md
+++ b/docs/cargo_features.md
@@ -123,7 +123,6 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |experimental_pbr_pcss|Enable support for PCSS, at the risk of blowing past the global, per-shader sampler limit on older/lower-end GPUs|
 |exr|EXR image format support|
 |fallback-flac|FLAC audio format support (through `claxon`)|
-|fallback-mp3|MP3 audio format support (through `minimp3`)|
 |fallback-vorbis|OGG/VORBIS audio format support (through `lewton`)|
 |fallback-wav|WAV audio format support (through `hound`)|
 |ff|Farbfeld image format support|

From e7657023cf02a3c8867d37afd6db6dbe41acbc84 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Sun, 23 Nov 2025 09:54:09 +0100
Subject: [PATCH 18/26] Updates cargo_features.md

---
 docs/cargo_features.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/cargo_features.md b/docs/cargo_features.md
index 6f507287b31b8..681daf32770ed 100644
--- a/docs/cargo_features.md
+++ b/docs/cargo_features.md
@@ -123,7 +123,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |experimental_pbr_pcss|Enable support for PCSS, at the risk of blowing past the global, per-shader sampler limit on older/lower-end GPUs|
 |exr|EXR image format support|
 |fallback-flac|FLAC audio format support (through `claxon`)|
-|fallback-vorbis|OGG/VORBIS audio format support (through `lewton`)|
+|fallback-vorbis|OGG/VORBIS audio format support (through `symphonia`)|
 |fallback-wav|WAV audio format support (through `hound`)|
 |ff|Farbfeld image format support|
 |file_watcher|Enables watching the filesystem for Bevy Asset hot-reloading|
@@ -184,7 +184,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |trace_tracy_memory|Tracing support, with memory profiling, exposing a port for Tracy|
 |track_location|Enables source location tracking for change detection and spawning/despawning, which can assist with debugging|
 |ui_picking|Provides an implementation for picking UI|
-|vorbis|OGG/VORBIS audio format support (through `symphonia`)|
+|vorbis|OGG/VORBIS audio format support (through `lewton`)|
 |wav|WAV audio format support (through `symphonia`)|
 |wayland|Wayland display server support|
 |web|Enables use of browser APIs. Note this is currently only applicable on `wasm32` architectures.|

From 22c06db420514a2b188a5acf76c6a4c7af7cde27 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Sun, 23 Nov 2025 09:54:41 +0100
Subject: [PATCH 19/26] Removes obsolete android_shared_stdcxx feature

---
 Cargo.toml                               | 4 ----
 crates/bevy_audio/Cargo.toml             | 2 --
 crates/bevy_internal/Cargo.toml          | 3 ---
 docs/cargo_features.md                   | 1 -
 examples/mobile/android_basic/Cargo.toml | 1 -
 5 files changed, 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c7542ea32bc89..b91402e194236 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -194,7 +194,6 @@ default_app = [
 default_platform = [
   "std",
   "android-game-activity",
-  "android_shared_stdcxx",
   "bevy_gilrs",
   "bevy_winit",
   "default_font",
@@ -551,9 +550,6 @@ morph = ["bevy_internal/morph"]
 # Enables bevy_mesh and bevy_animation morph weight support
 morph_animation = ["bevy_internal/morph_animation"]
 
-# Enable using a shared stdlib for cxx on Android
-android_shared_stdcxx = ["bevy_internal/android_shared_stdcxx"]
-
 # Enable detailed trace event logging. These trace events are expensive even when off, thus they require compile time opt-in
 detailed_trace = ["bevy_internal/detailed_trace"]
 
diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 3ca65a770de3d..ee1f345e42260 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -56,8 +56,6 @@ audio-all = [
   "rodio/vorbis",
   "rodio/wav",
 ]
-# Enable using a shared stdlib for cxx on Android.
-android_shared_stdcxx = ["cpal/oboe-shared-stdcxx"]
 
 [lints]
 workspace = true
diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index cb06815d347d8..5ca3160645eec 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -261,9 +261,6 @@ bevy_gltf = ["dep:bevy_gltf", "bevy_scene", "bevy_pbr"]
 # Used to disable code that is unsupported when Bevy is dynamically linked
 dynamic_linking = ["bevy_diagnostic/dynamic_linking"]
 
-# Enable using a shared stdlib for cxx on Android.
-android_shared_stdcxx = ["bevy_audio/android_shared_stdcxx"]
-
 # Enable AccessKit on Unix backends (currently only works with experimental
 # screen readers and forks.)
 accesskit_unix = ["bevy_winit/accesskit_unix"]
diff --git a/docs/cargo_features.md b/docs/cargo_features.md
index 681daf32770ed..a1b5b3622c8c5 100644
--- a/docs/cargo_features.md
+++ b/docs/cargo_features.md
@@ -61,7 +61,6 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |accesskit_unix|Enable AccessKit on Unix backends (currently only works with experimental screen readers and forks.)|
 |android-game-activity|Android GameActivity support. Default, choose between this and `android-native-activity`.|
 |android-native-activity|Android NativeActivity support. Legacy, should be avoided for most new Android games.|
-|android_shared_stdcxx|Enable using a shared stdlib for cxx on Android|
 |asset_processor|Enables the built-in asset processor for processed assets.|
 |async-io|Use async-io's implementation of block_on instead of futures-lite's implementation. This is preferred if your application uses async-io.|
 |async_executor|Uses `async-executor` as a task execution backend.|
diff --git a/examples/mobile/android_basic/Cargo.toml b/examples/mobile/android_basic/Cargo.toml
index e1a1d3a5bff84..d5a66368b600c 100644
--- a/examples/mobile/android_basic/Cargo.toml
+++ b/examples/mobile/android_basic/Cargo.toml
@@ -14,7 +14,6 @@ crate-type = ["staticlib", "cdylib"]
 [dependencies]
 bevy = { path = "../../", default-features = false, features = [
   "android-native-activity",
-  "android_shared_stdcxx",
   "gltf_animation",
   "bevy_animation",
   "bevy_asset",

From b71dc5e53f07d6d9bb01dd627ecaa67777819e89 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Sun, 23 Nov 2025 09:55:14 +0100
Subject: [PATCH 20/26] TEMPORARY: cpal patch to fix Send + Sync issue

---
 Cargo.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index b91402e194236..193241662938c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4919,3 +4919,6 @@ name = "Mirror"
 description = "Demonstrates how to create a mirror with a second camera"
 category = "3D Rendering"
 wasm = true
+
+[patch.crates-io]
+cpal = { git = "https://github.com/RustAudio/cpal.git", rev = "de5f48fb8f80580014e11402c6aae483e0cb578c" }

From eb9280be7be266e8dbb2c183db1c4f6d441bb7f0 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:45:16 +0100
Subject: [PATCH 21/26] Reexports rodio's ChannelCount and SampleRate aliases

---
 crates/bevy_audio/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index f8803acaa5a32..46c69eb22410c 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -52,7 +52,7 @@ pub use audio_source::*;
 pub use pitch::*;
 pub use volume::*;
 
-pub use rodio::{cpal::Sample as CpalSample, source::Source, Sample};
+pub use rodio::{cpal::Sample as CpalSample, source::Source, ChannelCount, Sample, SampleRate};
 pub use sinks::*;
 
 use bevy_app::prelude::*;

From 79e9dccc41c83dda8509ab9fab6dea3fba35b287 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:53:29 +0100
Subject: [PATCH 22/26] TEMPORARY: rodio patch for latest cpal compatibility

---
 Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 193241662938c..c90ae6f84707b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4921,4 +4921,5 @@ category = "3D Rendering"
 wasm = true
 
 [patch.crates-io]
-cpal = { git = "https://github.com/RustAudio/cpal.git", rev = "de5f48fb8f80580014e11402c6aae483e0cb578c" }
+cpal = { git = "https://github.com/RustAudio/cpal.git", rev = "e32ee65a5335301553cc9650b949b868f922d748" }
+rodio = { git = "https://github.com/philpax/rodio.git", rev = "1a66725ce9ecfd7a89ba780e249477cdd8c644e0" }

From f3b18f74d3d72945a58b0099b55b7b96e402ec89 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:56:40 +0100
Subject: [PATCH 23/26] Fixes decodable example

---
 examples/audio/decodable.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/audio/decodable.rs b/examples/audio/decodable.rs
index c76a9a648a819..8f7e67ad14dfa 100644
--- a/examples/audio/decodable.rs
+++ b/examples/audio/decodable.rs
@@ -1,7 +1,7 @@
 //! Shows how to create a custom [`Decodable`] type by implementing a Sine wave.
 
 use bevy::{
-    audio::{AddAudioSource, AudioPlugin, Source, Volume},
+    audio::{AddAudioSource, AudioPlugin, ChannelCount, SampleRate, Source, Volume},
     math::ops,
     prelude::*,
     reflect::TypePath,
@@ -24,7 +24,7 @@ struct SineDecoder {
     progress_per_frame: f32,
     // how long a period is
     period: f32,
-    sample_rate: u32,
+    sample_rate: SampleRate,
 }
 
 impl SineDecoder {
@@ -35,7 +35,7 @@ impl SineDecoder {
             current_progress: 0.,
             progress_per_frame: frequency / sample_rate as f32,
             period: std::f32::consts::PI * 2.,
-            sample_rate,
+            sample_rate: SampleRate::new(sample_rate).unwrap(),
         }
     }
 }
@@ -58,11 +58,11 @@ impl Source for SineDecoder {
         None
     }
 
-    fn channels(&self) -> u16 {
-        1
+    fn channels(&self) -> ChannelCount {
+        ChannelCount::new(1).unwrap()
     }
 
-    fn sample_rate(&self) -> u32 {
+    fn sample_rate(&self) -> SampleRate {
         self.sample_rate
     }
 

From 14c489411c85c1858f36563eac2ce6b610dfa01c Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 11 Dec 2025 13:30:07 +0100
Subject: [PATCH 24/26] Enables lewton when using audio-all feature

---
 Cargo.toml                   | 2 +-
 crates/bevy_audio/Cargo.toml | 2 +-
 docs/cargo_features.md       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c90ae6f84707b..fdf003185ff40 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -499,7 +499,7 @@ fallback-wav = ["bevy_internal/fallback-wav"]
 # AAC audio format support (through `symphonia`)
 aac = ["bevy_internal/aac"]
 
-# AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through `symphonia`)
+# AAC, FLAC, MP3, MP4, WAV (through `symphonia`) and OGG/VORBIS (through `lewton`) audio formats support
 audio-all = ["bevy_internal/audio-all"]
 
 # FLAC audio format support (through `symphonia`)
diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index ee1f345e42260..2d5f6f0f1dd18 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -53,7 +53,7 @@ audio-all = [
   "rodio/flac",
   "rodio/mp3",
   "rodio/mp4",
-  "rodio/vorbis",
+  "rodio/lewton",
   "rodio/wav",
 ]
 
diff --git a/docs/cargo_features.md b/docs/cargo_features.md
index a1b5b3622c8c5..f3461847c9565 100644
--- a/docs/cargo_features.md
+++ b/docs/cargo_features.md
@@ -64,7 +64,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |asset_processor|Enables the built-in asset processor for processed assets.|
 |async-io|Use async-io's implementation of block_on instead of futures-lite's implementation. This is preferred if your application uses async-io.|
 |async_executor|Uses `async-executor` as a task execution backend.|
-|audio-all|AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through `symphonia`)|
+|audio-all|AAC, FLAC, MP3, MP4, WAV (through `symphonia`) and OGG/VORBIS (through `lewton`) audio formats support|
 |basis-universal|Basis Universal compressed texture support|
 |bevy_animation|Provides animation functionality|
 |bevy_anti_alias|Provides various anti aliasing solutions|

From 210a0bb211fbb23b0df6f87b3bf7e3d4166d82fb Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 11 Dec 2025 13:52:40 +0100
Subject: [PATCH 25/26] Adds migration guide

---
 .../migration-guides/rodio_0_21.md            | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 release-content/migration-guides/rodio_0_21.md

diff --git a/release-content/migration-guides/rodio_0_21.md b/release-content/migration-guides/rodio_0_21.md
new file mode 100644
index 0000000000000..bd73ee3e3f0cf
--- /dev/null
+++ b/release-content/migration-guides/rodio_0_21.md
@@ -0,0 +1,45 @@
+---
+title: "Rodio 0.21 Update"
+pull_requests: [20323]
+---
+
+### Audio Feature Flags
+
+Audio format related features were reworked and now `symphonia` will be the default backend for most of them.
+
+By default, Bevy will enable the `vorbis` feature, which supports OGG/VORBIS files through `lewton`.
+
+If you are not using Bevy's default features, here's a list you can use for reference:
+
+- `vorbis`: OGG/VORBIS audio format support (through `lewton`).
+- `wav`: WAV audio format support (through `symphonia`).
+- `mp3`: MP3 audio format support (through `symphonia`).
+- `mp4`: MP4 audio format support (through `symphonia`). It also enables AAC support.
+- `flac`: FLAC audio format support (through `symphonia`).
+- `aac`: AAC audio format support (through `symphonia`).
+
+There are also "fallback" backend flags you can use for certain formats:
+
+- `fallback-flac`: FLAC audio format support (through `claxon`).
+- `fallback-vorbis`: OGG/VORBIS audio format support (through `symphonia`).
+- `fallback-wav`: WAV audio format support (through `hound`).
+
+Notice that OGG/VORBIS support through `symphonia` is not the default due to issues with buffering, reverb, looping and spatial audio. Check the following issues/PRs for additional context:
+
+- https://github.com/RustAudio/rodio/issues/775
+- https://github.com/RustAudio/rodio/pull/786
+
+The `audio-all` feature was added for convenience. It will enable all the available audio formats. Here's the full list and the corresponding backend for each format:
+
+- AAC, FLAC, MP3, MP4, and WAV: `symphonia`.
+- OGG/VORBIS: `lewton`.
+
+### Audio Traits
+
+`type DecoderItem` was removed from the `Decodable` trait. Now `rodio::Sample` is an alias for `f32`.
+
+### Android Related Features
+
+The `android_shared_stdcxx` feature was removed, as `cpal`'s `oboe-shared-stdcxx` feature was also removed in favor of Android NDK audio APIs.
+
+Keep in mind that if you are using `bevy_audio` the minimum supported Android API version is now 26 (Android 8/Oreo).

From fa00c435e1f5a7f7109185f5f6603a74441d6b74 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 11 Dec 2025 14:03:37 +0100
Subject: [PATCH 26/26] Fix markdown lints

---
 release-content/migration-guides/rodio_0_21.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/release-content/migration-guides/rodio_0_21.md b/release-content/migration-guides/rodio_0_21.md
index bd73ee3e3f0cf..f003527061460 100644
--- a/release-content/migration-guides/rodio_0_21.md
+++ b/release-content/migration-guides/rodio_0_21.md
@@ -3,7 +3,9 @@ title: "Rodio 0.21 Update"
 pull_requests: [20323]
 ---
 
-### Audio Feature Flags
+`rodio` was updated to `0.21` and `cpal` to `0.16`. The following sections will guide you through the necessary changes to ensure compatibility.
+
+## Audio Feature Flags
 
 Audio format related features were reworked and now `symphonia` will be the default backend for most of them.
 
@@ -26,19 +28,19 @@ There are also "fallback" backend flags you can use for certain formats:
 
 Notice that OGG/VORBIS support through `symphonia` is not the default due to issues with buffering, reverb, looping and spatial audio. Check the following issues/PRs for additional context:
 
-- https://github.com/RustAudio/rodio/issues/775
-- https://github.com/RustAudio/rodio/pull/786
+- <https://github.com/RustAudio/rodio/issues/775>
+- <https://github.com/RustAudio/rodio/pull/786>
 
 The `audio-all` feature was added for convenience. It will enable all the available audio formats. Here's the full list and the corresponding backend for each format:
 
 - AAC, FLAC, MP3, MP4, and WAV: `symphonia`.
 - OGG/VORBIS: `lewton`.
 
-### Audio Traits
+## Audio Traits
 
 `type DecoderItem` was removed from the `Decodable` trait. Now `rodio::Sample` is an alias for `f32`.
 
-### Android Related Features
+## Android Related Features
 
 The `android_shared_stdcxx` feature was removed, as `cpal`'s `oboe-shared-stdcxx` feature was also removed in favor of Android NDK audio APIs.