Le dim. 30 août 2020 17:46, Paolo Bonzini <pbonz...@redhat.com> a écrit :
> Pixman used to be included directly in QEMU_CFLAGS and therefore the
> include path was added to every compiler invocation. Now that (just
> like basically everything else) it is a separate dependency, we
> need to add it to all build target, especially UI modules that need
> it due to their including ui/console.h.
>
> Reported-by: Stefan Weil <s...@weilnetz.de>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
> ui/meson.build | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/ui/meson.build b/ui/meson.build
> index aa8aa31516..82f60756d9 100644
> --- a/ui/meson.build
> +++ b/ui/meson.build
> @@ -40,7 +40,7 @@ ui_modules = {}
>
> if config_host.has_key('CONFIG_CURSES')
> curses_ss = ss.source_set()
> - curses_ss.add(when: [curses, iconv], if_true: files('curses.c'))
> + curses_ss.add(when: [curses, iconv], if_true: [files('curses.c'),
> pixman])
> ui_modules += {'curses' : curses_ss}
> endif
>
> @@ -48,7 +48,7 @@ if config_host.has_key('CONFIG_GTK')
> softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
>
> gtk_ss = ss.source_set()
> - gtk_ss.add(gtk, vte, files('gtk.c'))
> + gtk_ss.add(gtk, vte, pixman, files('gtk.c'))
> gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c'))
> gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c'))
> gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true:
> files('gtk-gl-area.c'))
> @@ -71,7 +71,7 @@ endif
>
> if config_host.has_key('CONFIG_SPICE') and
> config_host.has_key('CONFIG_GIO')
> spice_ss = ss.source_set()
> - spice_ss.add(spice, gio, files('spice-app.c'))
> + spice_ss.add(spice, gio, pixman, files('spice-app.c'))
> ui_modules += {'spice-app': spice_ss}
> endif
>
> --
> 2.26.2
>
>
>
