# HG changeset patch # User Chris Cannam # Date 1635159198 -3600 # Mon Oct 25 11:53:18 2021 +0100 # Node ID b4bd594db16971d0be186fc74af8b78b8425f8ec # Parent bcbfa88ef492ea40b2ae31881e71d391a8ae8507 Use built-in resampler by default; add a Speex-specific Makefile; ensure platform tests run default Makefile last, so any output left in test/e2e/out is representative of the BQ resampler diff --git a/.build.yml b/.build.yml --- a/.build.yml +++ b/.build.yml @@ -3,6 +3,7 @@ - libboost-test-dev - valgrind - libsamplerate0-dev + - libsndfile-dev - curl sources: - hg+https://hg.sr.ht/~breakfastquay/bqresample diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # better to stick with a single known library. If no flags are # supplied, the code will refuse to compile. # -RESAMPLE_DEFINES := -DHAVE_LIBSAMPLERATE +RESAMPLE_DEFINES := -DUSE_BQRESAMPLER # Add to VECTOR_DEFINES and ALLOCATOR_DEFINES any options desired for @@ -30,7 +30,7 @@ # THIRD_PARTY_LIBS if using libsamplerate) # THIRD_PARTY_INCLUDES := -THIRD_PARTY_LIBS := -lsamplerate +THIRD_PARTY_LIBS := # If you are including a set of bq libraries into a project, you can diff --git a/build/Makefile.linux.speex b/build/Makefile.linux.speex new file mode 100644 --- /dev/null +++ b/build/Makefile.linux.speex @@ -0,0 +1,11 @@ + +RESAMPLE_DEFINES := -DUSE_SPEEX + +VECTOR_DEFINES := + +ALLOCATOR_DEFINES := -DHAVE_POSIX_MEMALIGN + +THIRD_PARTY_INCLUDES := +THIRD_PARTY_LIBS := + +include build/Makefile.inc diff --git a/build/run-platform-tests.sh b/build/run-platform-tests.sh --- a/build/run-platform-tests.sh +++ b/build/run-platform-tests.sh @@ -50,7 +50,7 @@ fi } -for mf in Makefile build/Makefile.$platformtag build/Makefile.$platformtag.* ; do +for mf in build/Makefile.$platformtag build/Makefile.$platformtag.* Makefile ; do case "$mf" in *~) continue;;