Il mer 30 ago 2023, 17:21 Philippe Mathieu-Daudé <phi...@linaro.org> ha
scritto:

> On 30/8/23 11:38, marcandre.lur...@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lur...@redhat.com>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> > ---
> >   hw/display/Kconfig |  2 +-
> >   ui/meson.build     | 12 ++++++------
> >   2 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/hw/display/Kconfig b/hw/display/Kconfig
> > index 7b3da68d1c..4d8b0cec40 100644
> > --- a/hw/display/Kconfig
> > +++ b/hw/display/Kconfig
> > @@ -93,7 +93,7 @@ config VGA
> >
> >   config QXL
> >       bool
> > -    depends on SPICE && PCI
> > +    depends on SPICE && PCI && PIXMAN
>
> Shouldn't this be:
>
> --- a/Kconfig.host
> +++ b/Kconfig.host
> @@ -14,4 +14,5 @@ config X11
>   config SPICE
>       bool
> +    depends on PIXMAN
>

No, all that would do is fail the build if SPICE=y and PIXMAN=n, but right
now chardev/ has code that needs Spice but not pixman.

Paolo


> ---
>
> ?
>
> >
> >   config VIRTIO_GPU
> > diff --git a/ui/meson.build b/ui/meson.build
> > index b3525ef064..08d845d43a 100644
> > --- a/ui/meson.build
> > +++ b/ui/meson.build
> > @@ -133,7 +133,7 @@ if sdl.found()
> >     ui_modules += {'sdl' : sdl_ss}
> >   endif
> >
> > -if spice.found()
> > +if spice.found() and pixman.found()
> >     spice_core_ss = ss.source_set()
> >     spice_core_ss.add(spice, pixman, files(
> >       'spice-core.c',
> > @@ -141,12 +141,12 @@ if spice.found()
> >       'spice-display.c'
> >     ))
> >     ui_modules += {'spice-core' : spice_core_ss}
> > -endif
> >
> > -if spice.found() and gio.found()
> > -  spice_ss = ss.source_set()
> > -  spice_ss.add(spice, gio, pixman, files('spice-app.c'))
> > -  ui_modules += {'spice-app': spice_ss}
> > +  if gio.found()
> > +    spice_ss = ss.source_set()
> > +    spice_ss.add(spice, gio, pixman, files('spice-app.c'))
> > +    ui_modules += {'spice-app': spice_ss}
> > +  endif
> >   endif
> >
> >   keymaps = [
>
>

Reply via email to