From nobody Fri Apr 26 21:05:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600243966; cv=none; d=zohomail.com; s=zohoarc; b=QS8NIMbioF+SdmfSfySbBdXJefw2HctxvheKQDBK3mnpAkayKFVuNuAUA7Y7kDh+szUg5X+3EBEvgTSZILEHqYKrtQnOIl9LQFfcDrCBcjxVd30NJq32GDco4RBTFsVczumdLKLl90os94U0hpFGWIAe/9YAG35hK2Hgoc9yzs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600243966; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=QyuwAmE7AiSxCtuldyMRQki5hSOUih9Dz7FoOcByEZ0=; b=oDkyUy+9hqKHqbg4lAfbAOwpGqNaGJh5mI5IlBBLh6r53DxalTOpiAE65txuKAx4bECtUjqBARvWjqvF5AZ/Q9lYyjwaO2AAU8GjiirqvvFjB92+EQvyP9I+6l9zPqkHxzJKXNZFLeJ2bcb1cBTcWjJ6MLQlY2t+EIbhzHMW6Ok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1600243966421180.06005372000072; Wed, 16 Sep 2020 01:12:46 -0700 (PDT) Received: from localhost ([::1]:42648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kISYX-0002YC-Av for importer@patchew.org; Wed, 16 Sep 2020 04:12:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kISXV-0001HC-Sr for qemu-devel@nongnu.org; Wed, 16 Sep 2020 04:11:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48778) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kISXT-0003o4-Uw for qemu-devel@nongnu.org; Wed, 16 Sep 2020 04:11:41 -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-249-yGJfpnvlPkKe19BCadWbhw-1; Wed, 16 Sep 2020 04:11:36 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A5230104D3E7; Wed, 16 Sep 2020 08:11:35 +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 A86DA19D7C; Wed, 16 Sep 2020 08:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600243898; 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; bh=QyuwAmE7AiSxCtuldyMRQki5hSOUih9Dz7FoOcByEZ0=; b=gltwiluXbNYDC6/X2FxIov31OC4li2ARz3WosiBYLoME7IO/Qf8e9Et4pFz/4K9435E4JT kIFkjJJgz66uRDtAA73eEjahnALQvYx5FNRulJBIB5l5z/ZgbIMLlhOovZGeLDtuEARoPu JrhQtG82oHpIc6vieWYa1zuAKy87yBc= X-MC-Unique: yGJfpnvlPkKe19BCadWbhw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] configure: move cocoa option to Meson Date: Wed, 16 Sep 2020 04:11:30 -0400 Message-Id: <20200916081131.21775-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/16 02:16:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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: Christophe de Dinechin , r.bolshakov@yadro.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" While detection of the framework was already there, moving the option allows for better error reporting. Reported-by: Christophe de Dinechin Signed-off-by: Paolo Bonzini --- configure | 17 +++++++---------- meson.build | 10 ++++++++-- meson_options.txt | 2 ++ ui/meson.build | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/configure b/configure index d6fbadad27..b4c0e0d07c 100755 --- a/configure +++ b/configure @@ -448,7 +448,7 @@ bsd=3D"no" linux=3D"no" solaris=3D"no" profiler=3D"no" -cocoa=3D"no" +cocoa=3D"auto" softmmu=3D"yes" linux_user=3D"no" bsd_user=3D"no" @@ -868,7 +868,7 @@ Darwin) QEMU_CFLAGS=3D"-arch x86_64 $QEMU_CFLAGS" QEMU_LDFLAGS=3D"-arch x86_64 $QEMU_LDFLAGS" fi - cocoa=3D"yes" + cocoa=3D"enabled" audio_drv_list=3D"coreaudio try-sdl" audio_possible_drivers=3D"coreaudio sdl" QEMU_LDFLAGS=3D"-framework CoreFoundation -framework IOKit $QEMU_LDFLAGS" @@ -1240,10 +1240,10 @@ for opt do ;; --enable-profiler) profiler=3D"yes" ;; - --disable-cocoa) cocoa=3D"no" + --disable-cocoa) cocoa=3D"disabled" ;; --enable-cocoa) - cocoa=3D"yes" ; + cocoa=3D"enabled" ; audio_drv_list=3D"coreaudio $(echo $audio_drv_list | sed s,coreaudio= ,,g)" ;; --disable-system) softmmu=3D"no" @@ -2388,8 +2388,8 @@ fi # cocoa implies not SDL or GTK # (the cocoa UI code currently assumes it is always the active UI # and doesn't interact well with other UI frontend code) -if test "$cocoa" =3D "yes"; then - if test "$sdl" =3D "yes"; then +if test "$cocoa" =3D "enabled"; then + if test "$sdl" =3D "enabled"; then error_exit "Cocoa and SDL UIs cannot both be enabled at once" fi if test "$gtk" =3D "yes"; then @@ -6622,9 +6622,6 @@ if test "$have_x11" =3D "yes" && test "$need_x11" =3D= "yes"; then echo "X11_CFLAGS=3D$x11_cflags" >> $config_host_mak echo "X11_LIBS=3D$x11_libs" >> $config_host_mak fi -if test "$cocoa" =3D "yes" ; then - echo "CONFIG_COCOA=3Dy" >> $config_host_mak -fi if test "$iconv" =3D "yes" ; then echo "CONFIG_ICONV=3Dy" >> $config_host_mak echo "ICONV_CFLAGS=3D$iconv_cflags" >> $config_host_mak @@ -7937,7 +7934,7 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Dmalloc=3D$malloc -Dmalloc_trim=3D$malloc_trim \ - -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ + -Dcocoa=3D$cocoa -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_png=3D$v= nc_png \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f\ $cross_arg \ diff --git a/meson.build b/meson.build index d3b1e5c34c..c94e92d774 100644 --- a/meson.build +++ b/meson.build @@ -88,7 +88,7 @@ socket =3D [] version_res =3D [] coref =3D [] iokit =3D [] -cocoa =3D [] +cocoa =3D not_found hvf =3D [] if targetos =3D=3D 'windows' socket =3D cc.find_library('ws2_32') @@ -101,7 +101,7 @@ if targetos =3D=3D 'windows' elif targetos =3D=3D 'darwin' coref =3D dependency('appleframeworks', modules: 'CoreFoundation') iokit =3D dependency('appleframeworks', modules: 'IOKit') - cocoa =3D dependency('appleframeworks', modules: 'Cocoa') + cocoa =3D dependency('appleframeworks', modules: 'Cocoa', required: get_= option('cocoa')) hvf =3D dependency('appleframeworks', modules: 'Hypervisor') elif targetos =3D=3D 'sunos' socket =3D [cc.find_library('socket'), @@ -112,6 +112,11 @@ elif targetos =3D=3D 'haiku' cc.find_library('network'), cc.find_library('bsd')] endif + +if not cocoa.found() and get_option('cocoa').enabled() + error('Cocoa not available on this platform') +endif + # The path to glib.h is added to all compilation commands. This was # grandfathered in from the QEMU Makefiles. add_project_arguments(config_host['GLIB_CFLAGS'].split(), @@ -461,6 +466,7 @@ endif =20 # Create config-host.h =20 +config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) config_host_data.set('CONFIG_VNC', vnc.found()) diff --git a/meson_options.txt b/meson_options.txt index 894e006799..599af8485f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,6 +11,8 @@ option('malloc_trim', type : 'feature', value : 'auto', option('malloc', type : 'combo', choices : ['system', 'tcmalloc', 'jemallo= c'], value: 'system', description: 'choose memory allocator to use') =20 +option('cocoa', type : 'feature', value : 'auto', + description: 'Cocoa user interface (macOS only)') option('sdl', type : 'feature', value : 'auto', description: 'SDL user interface') option('sdl_image', type : 'feature', value : 'auto', diff --git a/ui/meson.build b/ui/meson.build index dd6c110136..8a080c38e3 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -15,7 +15,7 @@ softmmu_ss.add(files( =20 softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c', 'spice= -input.c', 'spice-display.c')) -softmmu_ss.add(when: [cocoa, 'CONFIG_COCOA'], if_true: files('cocoa.m')) +softmmu_ss.add(when: cocoa, if_true: files('cocoa.m')) =20 vnc_ss =3D ss.source_set() vnc_ss.add(files( --=20 2.26.2