>
> This version of the CELT codec has long been obsolete, and Opus support
> has been added nearly 5 years ago. It's time we move on and try to stop
> using Celt ;)
> This commit disables CELT by default, but since this could be an
> unexpected change for packagers, if CELT 0.5.1 development headers are
> installed, it will error out unless --enable-celt051/--disable-celt051
> has been explicitly specified.
>
> Signed-off-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
> ---
> m4/spice-deps.m4 | 21 +++++++++++++++++----
> meson_options.txt | 4 ++--
> 2 files changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
> index cf0e048..5606230 100644
> --- a/m4/spice-deps.m4
> +++ b/m4/spice-deps.m4
> @@ -108,7 +108,7 @@ AC_DEFUN([SPICE_CHECK_SMARTCARD], [
>
> # SPICE_CHECK_CELT051
> # -------------------
> -# Adds a --disable-celt051 switch in order to enable/disable CELT 0.5.1
> +# Adds a --enable-celt051 switch in order to enable/disable CELT 0.5.1
> # support, and checks if the needed libraries are available. If found, it
> will
> # return the flags to use in the CELT051_CFLAGS and CELT051_LIBS variables,
> and
> # it will define a HAVE_CELT051 preprocessor symbol as well as a
> HAVE_CELT051
> @@ -116,11 +116,24 @@ AC_DEFUN([SPICE_CHECK_SMARTCARD], [
> #--------------------
> AC_DEFUN([SPICE_CHECK_CELT051], [
> AC_ARG_ENABLE([celt051],
> - [ --disable-celt051 Disable celt051 audio codec (enabled by
> default)],,
> - [enable_celt051="yes"])
> + [ --enable-celt051 Enable celt051 audio codec (disabled by
> default)],,
> + [enable_celt051="auto"])
>
> - if test "x$enable_celt051" = "xyes"; then
> + if test "x$enable_celt051" != "xno"; then
> PKG_CHECK_MODULES([CELT051], [celt051 >= 0.5.1.1],
> [have_celt051=yes], [have_celt051=no])
> + if test "x$enable_celt051" == "xauto"; then
The syntax is test a = b, not test a == b. Same below
> + if test "x$have_celt051" == "xyes"; then
> + AC_MSG_ERROR(m4_normalize([
> + CELT 0.5.1.x has been detected, \
> + but CELT support is no longer automatically
> enabled by default. \
> + Please explicitly use --enable-celt051 or
> --disable-celt051
> + ]))
> + fi
> + # have_celt051 is "no" here, so celt is disabled by default
> + fi
> + if test "x$enable_celt051" == "xyes" && test "x$have_celt051" !=
> "xyes"; then
> + AC_MSG_ERROR(["--enable-celt051 has been specified, but CELT
> 0.5.1 is missing"])
> + fi
> else
> have_celt051=no
> fi
> diff --git a/meson_options.txt b/meson_options.txt
> index 5189f4f..9f07bcc 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -12,8 +12,8 @@ option('extra-checks',
>
> option('celt051',
> type : 'boolean',
> - value : true,
> - description: 'Enable celt051 audio codec (default=true)')
> + value : false,
> + description: 'Enable celt051 audio codec (default=false)')
>
> option('python-checks',
> type : 'boolean',
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel