From 27ba8c181f412a0622cd3cba7a97c8e3a388600f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Fri, 10 Mar 2023 12:49:56 +0100
Subject: [PATCH] pcm/SoxrResampler: require libsoxr 0.1.2 or later

---
 NEWS                      | 2 ++
 src/pcm/SoxrResampler.cxx | 2 --
 src/pcm/meson.build       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index e23118fb8..75762aff6 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ ver 0.24 (not yet released)
   - opus: implement bitrate calculation
   - sidplay: require libsidplayfp (drop support for the original sidplay)
   - wavpack: require libwavpack version 5
+* resampler
+  - soxr: require libsoxr 0.1.2 or later
 * player
   - add option "mixramp_analyzer" to scan MixRamp tags on-the-fly
   - "one-shot" consume mode
diff --git a/src/pcm/SoxrResampler.cxx b/src/pcm/SoxrResampler.cxx
index dea6d4fe3..85dd0ec26 100644
--- a/src/pcm/SoxrResampler.cxx
+++ b/src/pcm/SoxrResampler.cxx
@@ -239,9 +239,7 @@ SoxrPcmResampler::Close() noexcept
 void
 SoxrPcmResampler::Reset() noexcept
 {
-#if SOXR_THIS_VERSION >= SOXR_VERSION(0,1,2)
 	soxr_clear(soxr);
-#endif
 }
 
 std::span<const std::byte>
diff --git a/src/pcm/meson.build b/src/pcm/meson.build
index 04cb3f536..59d73d59e 100644
--- a/src/pcm/meson.build
+++ b/src/pcm/meson.build
@@ -59,7 +59,7 @@ if libsamplerate_dep.found()
   pcm_sources += 'LibsamplerateResampler.cxx'
 endif
 
-soxr_dep = dependency('soxr', required: get_option('soxr'))
+soxr_dep = dependency('soxr', version: '>= 0.1.2', required: get_option('soxr'))
 if soxr_dep.found()
   conf.set('ENABLE_SOXR', true)
   pcm_sources += 'SoxrResampler.cxx'