From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 381A2C07545 for ; Wed, 25 Oct 2023 11:54:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvcRr-0004nY-Jh; Wed, 25 Oct 2023 07:53:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvcRn-0004mb-Tn for qemu-devel@nongnu.org; Wed, 25 Oct 2023 07:53:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvcRZ-0004Oq-RJ for qemu-devel@nongnu.org; Wed, 25 Oct 2023 07:53:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698234773; 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:autocrypt:autocrypt; bh=LqXLR1fzx9sf3d1tz/D8ZhMB31ufH/Xigc7+XgPUu+g=; b=XlXL8cYRPv8XMw2aNaUgRjPwQSfPz249T7KgFkoF0uaIak8gtb9+8TZ+mniFVoJY0Chmyc +aNyp2FWYNzUNbACAfm0ifn9loWEmm3fgt/Ld4kNSDG9ME78bHUoRFI3KtnAT5D4uqFV7p iP22RclCfBYaUtWveCvKVAeiGNHxe0M= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-Fw61sj4YPxGzcuqdH_CLBw-1; Wed, 25 Oct 2023 07:52:52 -0400 X-MC-Unique: Fw61sj4YPxGzcuqdH_CLBw-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-41cca916954so72918951cf.2 for ; Wed, 25 Oct 2023 04:52:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698234772; x=1698839572; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LqXLR1fzx9sf3d1tz/D8ZhMB31ufH/Xigc7+XgPUu+g=; b=lRbPWzfTz37uDkbTusl1LM1EeSnODUcAdI4Ie5WRObjHhHtu93/8awzokNrrye9UXZ NESZh5m2c2yaMGPyr3/Phvyy4S0Yq0nv68FJZnH8zn70MHQBxFRwQriT5dNC9h6HroQc xoTcXQA7nbAos1rrlbbxoN31gQh4lt9g1S4x+8bR/jGLL5s9ceFR7EUYf9LsHpqnUSWy aX/li4HXxEC9kBKr3IXrOrtYlh3Z15XRifDtC2lXmgO5AVo9H+ZDsu9QOngbg2t+/g+Q Mt1+5DY3qyLAFB7vnvCQXzn3DHWbs1vRtSAsT/niNqpM19vZ7MLAQEaLLPPpfh1sK/cc rGNQ== X-Gm-Message-State: AOJu0YxaFiaA/wGzh7tqOOjB5xl9Ho+OrweToyNTJnWwbL9dntBqXp9m rAD49BH7T9AOZH/cwP9594wa0yuVpcmgOS1oRh/I2WKsIH20aG/KRT1WNU4E/NthAfcpUUwCyTY eqJqQAjwO5++IH7dE32L8V9U= X-Received: by 2002:a05:622a:1701:b0:419:a2c6:8207 with SMTP id h1-20020a05622a170100b00419a2c68207mr19796383qtk.22.1698234772082; Wed, 25 Oct 2023 04:52:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6GJ0+97P6xMLN8GkHjb9kQH5tdRROYDVFQFmZdym480rNuqGfRT6ViWyctC0bn9s2axBf7Q== X-Received: by 2002:a05:622a:1701:b0:419:a2c6:8207 with SMTP id h1-20020a05622a170100b00419a2c68207mr19796369qtk.22.1698234771832; Wed, 25 Oct 2023 04:52:51 -0700 (PDT) Received: from [192.168.0.6] (ip-109-43-176-238.web.vodafone.de. [109.43.176.238]) by smtp.gmail.com with ESMTPSA id fj22-20020a05622a551600b004198ae7f841sm4172935qtb.90.2023.10.25.04.52.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Oct 2023 04:52:51 -0700 (PDT) Message-ID: <52338f56-cf2d-4eba-a6a4-5ca517f9fea6@redhat.com> Date: Wed, 25 Oct 2023 13:52:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 12/19] ui/vnc: VNC requires PIXMAN Content-Language: en-US To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , BALATON Zoltan , qemu-ppc@nongnu.org, Gerd Hoffmann , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , "Dr. David Alan Gilbert" , Eric Blake , Paolo Bonzini References: <20231023113047.2572137-1-marcandre.lureau@redhat.com> <20231023113047.2572137-13-marcandre.lureau@redhat.com> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= xsFNBFH7eUwBEACzyOXKU+5Pcs6wNpKzrlJwzRl3VGZt95VCdb+FgoU9g11m7FWcOafrVRwU yYkTm9+7zBUc0sW5AuPGR/dp3pSLX/yFWsA/UB4nJsHqgDvDU7BImSeiTrnpMOTXb7Arw2a2 4CflIyFqjCpfDM4MuTmzTjXq4Uov1giGE9X6viNo1pxyEpd7PanlKNnf4PqEQp06X4IgUacW tSGj6Gcns1bCuHV8OPWLkf4hkRnu8hdL6i60Yxz4E6TqlrpxsfYwLXgEeswPHOA6Mn4Cso9O 0lewVYfFfsmokfAVMKWzOl1Sr0KGI5T9CpmRfAiSHpthhHWnECcJFwl72NTi6kUcUzG4se81 O6n9d/kTj7pzTmBdfwuOZ0YUSqcqs0W+l1NcASSYZQaDoD3/SLk+nqVeCBB4OnYOGhgmIHNW 0CwMRO/GK+20alxzk//V9GmIM2ACElbfF8+Uug3pqiHkVnKqM7W9/S1NH2qmxB6zMiJUHlTH gnVeZX0dgH27mzstcF786uPcdEqS0KJuxh2kk5IvUSL3Qn3ZgmgdxBMyCPciD/1cb7/Ahazr 3ThHQXSHXkH/aDXdfLsKVuwDzHLVSkdSnZdt5HHh75/NFHxwaTlydgfHmFFwodK8y/TjyiGZ zg2Kje38xnz8zKn9iesFBCcONXS7txENTzX0z80WKBhK+XSFJwARAQABzR5UaG9tYXMgSHV0 aCA8dGh1dGhAcmVkaGF0LmNvbT7CwXgEEwECACIFAlVgX6oCGwMGCwkIBwMCBhUIAgkKCwQW AgMBAh4BAheAAAoJEC7Z13T+cC21EbIP/ii9cvT2HHGbFRl8HqGT6+7Wkb+XLMqJBMAIGiQK QIP3xk1HPTsLfVG0ao4hy/oYkGNOP8+ubLnZen6Yq3zAFiMhQ44lvgigDYJo3Ve59gfe99KX EbtB+X95ODARkq0McR6OAsPNJ7gpEUzfkQUUJTXRDQXfG/FX303Gvk+YU0spm2tsIKPl6AmV 1CegDljzjycyfJbk418MQmMu2T82kjrkEofUO2a24ed3VGC0/Uz//XCR2ZTo+vBoBUQl41BD eFFtoCSrzo3yPFS+w5fkH9NT8ChdpSlbNS32NhYQhJtr9zjWyFRf0Zk+T/1P7ECn6gTEkp5k ofFIA4MFBc/fXbaDRtBmPB0N9pqTFApIUI4vuFPPO0JDrII9dLwZ6lO9EKiwuVlvr1wwzsgq zJTPBU3qHaUO4d/8G+gD7AL/6T4zi8Jo/GmjBsnYaTzbm94lf0CjXjsOX3seMhaE6WAZOQQG tZHAO1kAPWpaxne+wtgMKthyPLNwelLf+xzGvrIKvLX6QuLoWMnWldu22z2ICVnLQChlR9d6 WW8QFEpo/FK7omuS8KvvopFcOOdlbFMM8Y/8vBgVMSsK6fsYUhruny/PahprPbYGiNIhKqz7 UvgyZVl4pBFjTaz/SbimTk210vIlkDyy1WuS8Zsn0htv4+jQPgo9rqFE4mipJjy/iboDzsFN BFH7eUwBEAC2nzfUeeI8dv0C4qrfCPze6NkryUflEut9WwHhfXCLjtvCjnoGqFelH/PE9NF4 4VPSCdvD1SSmFVzu6T9qWdcwMSaC+e7G/z0/AhBfqTeosAF5XvKQlAb9ZPkdDr7YN0a1XDfa +NgA+JZB4ROyBZFFAwNHT+HCnyzy0v9Sh3BgJJwfpXHH2l3LfncvV8rgFv0bvdr70U+On2XH 5bApOyW1WpIG5KPJlDdzcQTyptOJ1dnEHfwnABEfzI3dNf63rlxsGouX/NFRRRNqkdClQR3K gCwciaXfZ7ir7fF0u1N2UuLsWA8Ei1JrNypk+MRxhbvdQC4tyZCZ8mVDk+QOK6pyK2f4rMf/ WmqxNTtAVmNuZIwnJdjRMMSs4W4w6N/bRvpqtykSqx7VXcgqtv6eqoDZrNuhGbekQA0sAnCJ VPArerAZGArm63o39me/bRUQeQVSxEBmg66yshF9HkcUPGVeC4B0TPwz+HFcVhheo6hoJjLq knFOPLRj+0h+ZL+D0GenyqD3CyuyeTT5dGcNU9qT74bdSr20k/CklvI7S9yoQje8BeQAHtdV cvO8XCLrpGuw9SgOS7OP5oI26a0548M4KldAY+kqX6XVphEw3/6U1KTf7WxW5zYLTtadjISB X9xsRWSU+Yqs3C7oN5TIPSoj9tXMoxZkCIHWvnqGwZ7JhwARAQABwsFfBBgBAgAJBQJR+3lM AhsMAAoJEC7Z13T+cC21hPAQAIsBL9MdGpdEpvXs9CYrBkd6tS9mbaSWj6XBDfA1AEdQkBOn ZH1Qt7HJesk+qNSnLv6+jP4VwqK5AFMrKJ6IjE7jqgzGxtcZnvSjeDGPF1h2CKZQPpTw890k fy18AvgFHkVk2Oylyexw3aOBsXg6ukN44vIFqPoc+YSU0+0QIdYJp/XFsgWxnFIMYwDpxSHS 5fdDxUjsk3UBHZx+IhFjs2siVZi5wnHIqM7eK9abr2cK2weInTBwXwqVWjsXZ4tq5+jQrwDK cvxIcwXdUTLGxc4/Z/VRH1PZSvfQxdxMGmNTGaXVNfdFZjm4fz0mz+OUi6AHC4CZpwnsliGV ODqwX8Y1zic9viSTbKS01ZNp175POyWViUk9qisPZB7ypfSIVSEULrL347qY/hm9ahhqmn17 Ng255syASv3ehvX7iwWDfzXbA0/TVaqwa1YIkec+/8miicV0zMP9siRcYQkyTqSzaTFBBmqD oiT+z+/E59qj/EKfyce3sbC9XLjXv3mHMrq1tKX4G7IJGnS989E/fg6crv6NHae9Ckm7+lSs IQu4bBP2GxiRQ+NV3iV/KU3ebMRzqIC//DCOxzQNFNJAKldPe/bKZMCxEqtVoRkuJtNdp/5a yXFZ6TfE1hGKrDBYAm4vrnZ4CXFSBDllL59cFFOJCkn4Xboj/aVxxJxF30bn In-Reply-To: <20231023113047.2572137-13-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 23/10/2023 13.30, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Signed-off-by: Marc-André Lureau > --- > meson.build | 6 +++++- > ui/meson.build | 4 ++-- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/meson.build b/meson.build > index 395d7155f6..c4dd9e01ea 100644 > --- a/meson.build > +++ b/meson.build > @@ -1536,7 +1536,11 @@ endif > vnc = not_found > jpeg = not_found > sasl = not_found > -if get_option('vnc').allowed() and have_system > +if get_option('vnc') \ > + .disable_auto_if(not have_system) \ > + .require(pixman.found(), > + error_message: 'cannot enable VNC if pixman is not available') \ > + .allowed() > vnc = declare_dependency() # dummy dependency > jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'), > method: 'pkg-config') > diff --git a/ui/meson.build b/ui/meson.build > index 7c99613950..b3525ef064 100644 > --- a/ui/meson.build > +++ b/ui/meson.build > @@ -46,8 +46,8 @@ vnc_ss.add(files( > )) > vnc_ss.add(zlib, jpeg, gnutls) > vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) > -system_ss.add_all(when: vnc, if_true: vnc_ss) > -system_ss.add(when: vnc, if_false: files('vnc-stubs.c')) > +system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss) > +system_ss.add(when: [vnc, pixman], if_false: files('vnc-stubs.c')) Is the change to ui/meson.build required at all? ... if I get the first hunk right, if "vnc" is enabled, that means that pixman has been found, too? Thomas