qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Weil <sw@weilnetz.de>
Subject: [PULL 20/24] meson: add pixman dependency to UI modules
Date: Tue,  1 Sep 2020 05:11:28 -0400	[thread overview]
Message-ID: <20200901091132.29601-21-pbonzini@redhat.com> (raw)
In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com>

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 <sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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




  parent reply	other threads:[~2020-09-01  9:24 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-01  9:11 [PULL 00/24] Meson changes for 2020-09-01 Paolo Bonzini
2020-09-01  9:11 ` [PULL 01/24] meson: bump submodule to 0.55.1 Paolo Bonzini
2020-09-01  9:11 ` [PULL 02/24] block: always link with zlib Paolo Bonzini
2020-09-01  9:11 ` [PULL 03/24] meson: fix SDL2_image detection Paolo Bonzini
2020-09-01  9:11 ` [PULL 04/24] meson: install pc-bios blobs Paolo Bonzini
2020-09-01  9:11 ` [PULL 05/24] meson: install scripts/qemu-trace-stap Paolo Bonzini
2020-09-01  9:11 ` [PULL 06/24] meson: install icons Paolo Bonzini
2020-09-01  9:11 ` [PULL 07/24] meson: install desktop file Paolo Bonzini
2020-09-01  9:11 ` [PULL 08/24] meson: install $localstatedir/run for qga Paolo Bonzini
2020-09-01  9:11 ` [PULL 09/24] build-sys: remove install target from Makefile Paolo Bonzini
2020-09-01  9:11 ` [PULL 10/24] meson: move zlib detection to meson Paolo Bonzini
2020-09-01  9:11 ` [PULL 11/24] configure: rename confsuffix option Paolo Bonzini
2020-09-01  9:11 ` [PULL 12/24] configure: always /-seperate directory from qemu_suffix Paolo Bonzini
2020-09-01  9:11 ` [PULL 13/24] configure: build docdir like other suffixed directories Paolo Bonzini
2020-09-01  9:11 ` [PULL 14/24] meson: pass qemu_suffix option Paolo Bonzini
2020-09-01  9:11 ` [PULL 15/24] meson: use meson datadir instead of qemu_datadir Paolo Bonzini
2020-09-01  9:11 ` [PULL 16/24] meson: pass docdir option Paolo Bonzini
2020-09-01  9:11 ` [PULL 17/24] meson: use meson mandir instead of qemu_mandir Paolo Bonzini
2020-09-01  9:11 ` [PULL 18/24] meson: add NSIS building Paolo Bonzini
2020-09-01  9:11 ` [PULL 19/24] meson: add pixman dependency to chardev/baum module Paolo Bonzini
2020-09-01  9:11 ` Paolo Bonzini [this message]
2020-09-01  9:11 ` [PULL 21/24] configure: do not include ${prefix} in firmwarepath Paolo Bonzini
2020-09-01  9:11 ` [PULL 22/24] meson: use pkg-config method to find dependencies Paolo Bonzini
2020-09-01  9:11 ` [PULL 23/24] build: fix recurse-all target Paolo Bonzini
2020-09-01  9:11 ` [PULL 24/24] meson: add description to options Paolo Bonzini
2020-09-01  9:32   ` Marc-André Lureau
2020-09-01 12:12 ` [PULL 00/24] Meson changes for 2020-09-01 Peter Maydell
2020-09-01 13:19 ` 罗勇刚(Yonggang Luo)
2020-09-01 16:19   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200901091132.29601-21-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).