On 11 Nov 2014 20:19, "Peter Meerwald" <pmeerw at pmeerw.net> wrote:
>
> From: Peter Meerwald <p.meerwald at bct-electronic.com>
>
> output DEPRECATED warnings for libsamplerate in configure and
> PA daemon's log
>
> libsamplerate offers no particular advantage over the speex
> resampler and is distributed under GPL; support for it will be removed
> in the next release
Might make sense to keep for a release or two more if there's no overhead.
> Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
> ---
>
> how to deprecate the thing?
>
> this just outputs fat warnings; we could also stop probing for
libsamplerate
> unless specifically instructed to look for it
>
> configure.ac | 4 +++-
> src/daemon/main.c | 4 ++++
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 26ebd8c..390a441 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -684,6 +684,8 @@ AS_IF([test "x$enable_samplerate" = "xyes" && test
"x$HAVE_LIBSAMPLERATE" = "x0"
> AM_CONDITIONAL([HAVE_LIBSAMPLERATE], [test "x$HAVE_LIBSAMPLERATE" = x1])
> AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"],
AC_DEFINE([HAVE_LIBSAMPLERATE], 1, [Have libsamplerate?]))
>
> +AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], AC_MSG_WARN([Support for
libsamplerate is DEPRECATED]))
> +
> #### Database support ####
>
> AC_ARG_WITH([database],
> @@ -1511,7 +1513,7 @@ AS_IF([test "x$HAVE_BLUEZ_4" = "x1"],
ENABLE_BLUEZ_4=yes, ENABLE_BLUEZ_4=no)
> AS_IF([test "x$HAVE_BLUEZ_5" = "x1"], ENABLE_BLUEZ_5=yes,
ENABLE_BLUEZ_5=no)
> AS_IF([test "x$HAVE_HAL_COMPAT" = "x1"], ENABLE_HAL_COMPAT=yes,
ENABLE_HAL_COMPAT=no)
> AS_IF([test "x$HAVE_TCPWRAP" = "x1"], ENABLE_TCPWRAP=yes,
ENABLE_TCPWRAP=no)
> -AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE=yes,
ENABLE_LIBSAMPLERATE=no)
> +AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE="yes
(DEPRECATED)", ENABLE_LIBSAMPLERATE=no)
> AS_IF([test "x$HAVE_IPV6" = "x1"], ENABLE_IPV6=yes, ENABLE_IPV6=no)
> AS_IF([test "x$HAVE_OPENSSL" = "x1"], ENABLE_OPENSSL=yes,
ENABLE_OPENSSL=no)
> AS_IF([test "x$HAVE_FFTW" = "x1"], ENABLE_FFTW=yes, ENABLE_FFTW=no)
> diff --git a/src/daemon/main.c b/src/daemon/main.c
> index 0ffc7bd..a28be3f 100644
> --- a/src/daemon/main.c
> +++ b/src/daemon/main.c
> @@ -910,6 +910,10 @@ int main(int argc, char *argv[]) {
> pa_log_debug("Compilation host: %s", CANONICAL_HOST);
> pa_log_debug("Compilation CFLAGS: %s", PA_CFLAGS);
>
> +#ifdef HAVE_LIBSAMPLERATE
> + pa_log_info("Compiled with DEPRECATED libsamplerate support!");
> +#endif
> +
I'd make that a warning, and I think this is good to go.
-- Arun
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/pulseaudio-discuss/attachments/20141111/ce34a62d/attachment.html>
