meson: Add optional libsamplerate support

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>

diff --git a/meson.build b/meson.build
index 4144276..5919fef 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -252,6 +252,11 @@ if gtk_dep.found()
   cdata.set('HAVE_GTK', 1)
 endif
 
+samplerate_dep = dependency('samplerate', version : '>= 0.1.0', required : get_option('samplerate'))
+if samplerate_dep.found()
+  cdata.set('HAVE_LIBSAMPLERATE', 1)
+endif
+
 soxr_dep = dependency('soxr', version : '>= 0.1.1', required : get_option('soxr'))
 if soxr_dep.found()
   cdata.set('HAVE_SOXR', 1)

diff --git a/meson_options.txt b/meson_options.txt
index fba85fa..7537d79 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -65,6 +65,9 @@ option('lirc',
 option('openssl',
        type : 'feature', value : 'auto',
        description : 'Optional OpenSSL support (used for Airtunes/RAOP)')
+option('samplerate',
+       type : 'feature', value : 'disabled',
+       description : 'Optional libsamplerate support (DEPRECATED)')
 option('soxr',
        type : 'feature', value : 'auto',
        description : 'Optional SoXR support (resampling)')

diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
index 96f8046..467f64e 100644 (file)
--- a/src/pulsecore/meson.build
+++ b/src/pulsecore/meson.build
@@ -126,6 +126,10 @@ if dbus_dep.found()
   ]
 endif
 
+if samplerate_dep.found()
+  libpulsecore_sources += ['resampler/libsamplerate.c']
+endif
+
 if soxr_dep.found()
   libpulsecore_sources += ['resampler/soxr.c']
 endif
@@ -167,7 +171,7 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
   c_args : [pa_c_args, server_c_args],
   install : true,
   link_with : libpulsecore_simd_lib,
-  dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, soxr_dep, speex_dep, x11_dep],
+  dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep],
   implicit_include_directories : false)
 
 libpulsecore_dep = declare_dependency(link_with: libpulsecore)