From c8ff7c3b2b89ad3b2f4087ee4320103478439b0d Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Mon, 4 Oct 2021 10:56:00 +0100
Subject: [PATCH] Fall back to builtin resampler, no longer speex

---
 meson.build       | 4 ++--
 meson_options.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 7871f9e..8e993dc 100644
--- a/meson.build
+++ b/meson.build
@@ -140,7 +140,7 @@ if resampler == 'auto'
   if samplerate_dep.found()
     resampler = 'libsamplerate'
   else
-    resampler = 'speex'
+    resampler = 'builtin'
   endif
 endif
 
@@ -447,7 +447,7 @@ if not get_option('no_shared')
   message('Will build Rubber Band Library shared library')
   rubberband_dynamic = shared_library(
     rubberband_dynamic_name,
-    objects: rubberband_static.extract_all_objects(),
+    objects: rubberband_static.extract_all_objects(recursive: true),
     link_args: [
       arch_flags,
       feature_libraries,
diff --git a/meson_options.txt b/meson_options.txt
index 8e65fa0..2f13324 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,7 +9,7 @@ option('resampler',
        type: 'combo',
        choices: ['auto', 'builtin', 'libsamplerate', 'speex', 'ipp'],
        value: 'auto',
-       description: 'Resampler library to use. Recommended is libsamplerate. The default (auto) will use libsamplerate if available, speex otherwise.')
+       description: 'Resampler library to use. The default (auto) will use libsamplerate if available, the builtin implementation otherwise.')
 
 option('ipp_path',
        type: 'string',