From 0426c8532a429f4ac58ba3f27ba606d79418350b Mon Sep 17 00:00:00 2001 From: Miriam Zimmerman Date: Tue, 19 Nov 2024 18:08:28 -0500 Subject: [PATCH] Update rust submodules. Also, use gecko-in-tree feature to break circular dependency. --- CMakeLists.txt | 4 ++-- src/cubeb-coreaudio-rs | 2 +- src/cubeb-pulse-rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5573ab..dd03d04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,7 +342,7 @@ if(USE_PULSE AND USE_PULSE_RUST) cubeb_pulse_rs DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND cargo build COMMAND cargo build --release + BUILD_COMMAND cargo build --features=gecko-in-tree COMMAND cargo build --release --features=gecko-in-tree BUILD_ALWAYS ON BINARY_DIR "${PROJECT_SOURCE_DIR}/src/cubeb-pulse-rs" INSTALL_COMMAND "" @@ -361,7 +361,7 @@ if(USE_AUDIOUNIT AND USE_AUDIOUNIT_RUST) cubeb_coreaudio_rs DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND cargo build COMMAND cargo build --release + BUILD_COMMAND cargo build --features=gecko-in-tree COMMAND cargo build --release --features=gecko-in-tree BUILD_ALWAYS ON BINARY_DIR "${PROJECT_SOURCE_DIR}/src/cubeb-coreaudio-rs" INSTALL_COMMAND "" diff --git a/src/cubeb-coreaudio-rs b/src/cubeb-coreaudio-rs index 28166fb..d5e7769 160000 --- a/src/cubeb-coreaudio-rs +++ b/src/cubeb-coreaudio-rs @@ -1 +1 @@ -Subproject commit 28166fb5f249f431eb8e22f89efb860744ba86a9 +Subproject commit d5e7769e480a617bfed01511786bc7a083249bf0 diff --git a/src/cubeb-pulse-rs b/src/cubeb-pulse-rs index f951e72..b6cddee 160000 --- a/src/cubeb-pulse-rs +++ b/src/cubeb-pulse-rs @@ -1 +1 @@ -Subproject commit f951e72f2635e70c8ef52bcb2c95b2244ce21507 +Subproject commit b6cddee439c68d38d998a6026234aeddd6ec1734