[Spice-devel] [PATCH spice-gtk 16/34] meson: switch pulse option to auto feature
Christophe Fergeau
cfergeau at redhat.com
Mon Jan 7 14:15:04 UTC 2019
On Mon, Jan 07, 2019 at 12:00:45PM +0400, marcandre.lureau at redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau at redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
> ---
> .gitlab-ci.yml | 1 -
> meson.build | 8 +++-----
> meson_options.txt | 3 +--
> 3 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index e913da4..fabe29e 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -47,7 +47,6 @@ makecheck_simple-meson:
> - meson build -Dauto_features=disabled
> -Dlz4=false
> -Dsasl=false
> - -Dpulse=false
> -Dsmartcard=false
> -Dusbredir=false
> -Ddbus=false || (cat build/meson-logs/meson-log.txt && exit 1)
> diff --git a/meson.build b/meson.build
> index 9bb56c3..69f7e1f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -154,11 +154,9 @@ endif
>
> # pulse
> spice_gtk_has_pulse = false
> -if get_option('pulse')
> - deps = ['libpulse', 'libpulse-mainloop-glib']
> - foreach dep : deps
> - spice_glib_deps += dependency(dep)
> - endforeach
> +d = dependency('libpulse-mainloop-glib', required: get_option('pulse'))
There were 2 deps, one for 'libpulse' the other for
'libpulse-mainloop-glib', did you intentionally drop one?
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20190107/133653d0/attachment.sig>
More information about the Spice-devel
mailing list