From 75c1bdc01562b4bbb7f22227843c78eb2b93bb73 Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Thu, 30 Jun 2022 14:00:14 +0100
Subject: [PATCH] Fix speex build

---
 .build.yml               | 13 +++++++++++++
 meson.build              |  2 +-
 src/common/Resampler.cpp |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.build.yml b/.build.yml
index 8425bcf..fadd5e2 100644
--- a/.build.yml
+++ b/.build.yml
@@ -15,10 +15,23 @@ tasks:
   - setup: |
       cd rubberband
       meson build
+      meson build_speex -Dresampler=speex
+      meson build_libsamplerate -Dresampler=libsamplerate
+      meson build_fftw -Dfft=fftw
   - build: |
       cd rubberband
       ninja -C build
       meson test -C build
+      build/rubberband -V
+      ninja -C build_speex
+      meson test -C build_speex
+      build_speex/rubberband -V
+      ninja -C build_libsamplerate
+      meson test -C build_libsamplerate
+      build_libsamplerate/rubberband -V
+      ninja -C build_fftw
+      meson test -C build_fftw
+      build_fftw/rubberband -V
       ./otherbuilds/check.sh
 triggers:
   - action: email
diff --git a/meson.build b/meson.build
index fb28dd7..812a97e 100644
--- a/meson.build
+++ b/meson.build
@@ -241,7 +241,7 @@ elif resampler == 'speex'
   config_summary += { 'Resampler': 'Speex' }
   message('For resampler: using Speex')
   message('(consider libsamplerate if time-varying pitch shift is required)')
-  feature_sources += ['src/speex/resample.c']
+  feature_sources += ['src/ext/speex/resample.c']
   feature_defines += ['-DUSE_SPEEX']
   
 elif resampler == 'ipp'
diff --git a/src/common/Resampler.cpp b/src/common/Resampler.cpp
index 83ba0df..32444a7 100644
--- a/src/common/Resampler.cpp
+++ b/src/common/Resampler.cpp
@@ -54,7 +54,7 @@
 #endif
 
 #ifdef USE_SPEEX
-#include "../speex/speex_resampler.h"
+#include "../ext/speex/speex_resampler.h"
 #endif
 
 #ifdef USE_BQRESAMPLER