From nobody Tue Feb 10 02:42:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598952248; cv=none; d=zohomail.com; s=zohoarc; b=WE3fl/cPMUsW8FFKJqj9O6dsKklzgv36zCv2nteorEuT7tpjLTMtzHMLrCUcj8J4hzGQjPJfl1CJlXkLxNkpHXB0bAzBAMThV1HgeT7GzyIZI+G0Q2a7UTpcE5PQUBBQ1F+6D4osfsVvyyvhyZs4iBnSkBdjUlH/PrMGj9oV5sQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952248; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X/Fax2FNyxBxy5u0eoIHCfhXtcAhzrgVnFOsa7MwnFk=; b=kXEvt6QmfMF5VfIIHylGkBHVzU5XaOC2SfYiz0M+wOoHE7/ZqRNhD4XuTAk5G8teFUwm5Q5j1/n5RU1jeSN+25yP5jmZwvIu3kj86Zfv4yLaR+RMHxtE6653kmohoWjMTdewQE8vT7HdS6XQp92v5gHdMx/aRaGzvM8f6fQmmWo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598952248083144.71611049246508; Tue, 1 Sep 2020 02:24:08 -0700 (PDT) Received: from localhost ([::1]:46196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2WN-0000Rr-Cu for importer@patchew.org; Tue, 01 Sep 2020 05:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KU-0003a8-E3 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22447) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KS-0006rc-KM for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-302-FyLfm9tSOYCxLTWUuo9OZw-1; Tue, 01 Sep 2020 05:11:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74C871074641; Tue, 1 Sep 2020 09:11:45 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2A6B78B40; Tue, 1 Sep 2020 09:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X/Fax2FNyxBxy5u0eoIHCfhXtcAhzrgVnFOsa7MwnFk=; b=e63e8n98YGp1Y1TgD5AHFbpqOHGO8P24Q1cuu0xZRd8WzP61PgpSIdKk05qr+eEO0lT3pk BEVU2ZfSUqyjnV9WK3LrWdZSVHiGmO6qBjEmqd+BWTeG7WO+wo8bUjANsL+cs2Gn5fl/05 sIjQJLKhxHSr0mSBqc3gtUJsZbi9Ahk= X-MC-Unique: FyLfm9tSOYCxLTWUuo9OZw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/24] meson: add pixman dependency to UI modules Date: Tue, 1 Sep 2020 05:11:28 -0400 Message-Id: <20200901091132.29601-21-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Paolo Bonzini --- 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 =3D {} =20 if config_host.has_key('CONFIG_CURSES') curses_ss =3D 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 +=3D {'curses' : curses_ss} endif =20 @@ -48,7 +48,7 @@ if config_host.has_key('CONFIG_GTK') softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) =20 gtk_ss =3D 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 =20 if config_host.has_key('CONFIG_SPICE') and config_host.has_key('CONFIG_GIO= ') spice_ss =3D ss.source_set() - spice_ss.add(spice, gio, files('spice-app.c')) + spice_ss.add(spice, gio, pixman, files('spice-app.c')) ui_modules +=3D {'spice-app': spice_ss} endif =20 --=20 2.26.2