pxcloud/spice-common
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-01-07 11:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Disable celt 0.5.1 by default

Browse Source 
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@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Christophe Fergeau 2018-06-05 11:26:57 +02:00 committed by Frediano Ziglio
parent e98f8a430f
commit 72b0d603e1
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
m4/spice-deps.m4
View File

@ -107,7 +107,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
@ -115,11 +115,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
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

4
meson_options.txt
View File

@ -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',