From nobody Fri Nov 7 18:49:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336337116814.4475588460691; Thu, 24 Jan 2019 05:25:37 -0800 (PST) Received: from localhost ([127.0.0.1]:53875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmf0g-00014F-3x for importer@patchew.org; Thu, 24 Jan 2019 08:25:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmew7-0006CT-21 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmew5-0007YD-3l for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmew1-0007Li-64 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 594703C52; Thu, 24 Jan 2019 13:20:29 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1210767179; Thu, 24 Jan 2019 13:20:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2A7DF31EEB; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:16 +0100 Message-Id: <20190124132020.13571-4-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 24 Jan 2019 13:20:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/7] audio: allow optional audio drivers. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For those audio drivers which can be probed (sdl, alsa, pulse) add a try-$name variants. Unlike the variants without try- prefix they will not error out on probe failure, the driver will be dropped from the list instead. Mainly useful for the audio_drv_list default values. Signed-off-by: Gerd Hoffmann Message-id: 20190124112055.547-3-kraxel@redhat.com --- configure | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 5fcd0f4795..6a2aa3b533 100755 --- a/configure +++ b/configure @@ -3345,22 +3345,36 @@ fi audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/,/ /g') for drv in $audio_drv_list; do case $drv in - alsa) + alsa | try-alsa) if $pkg_config alsa --exists; then alsa_libs=3D$($pkg_config alsa --libs) + if test "$drv" =3D "try-alsa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-alsa= /alsa/') + fi else - error_exit "$drv check failed" \ - "Make sure to have the $drv libs and headers installed." + if test "$drv" =3D "try-alsa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-alsa= //') + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi fi ;; =20 - pa) + pa | try-pa) if $pkg_config libpulse --exists; then pulse_libs=3D$($pkg_config libpulse --libs) audio_pt_int=3D"yes" + if test "$drv" =3D "try-pa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-pa/p= a/') + fi else - error_exit "$drv check failed" \ - "Make sure to have the $drv libs and headers installed." + if test "$drv" =3D "try-pa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-pa//= ') + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi fi ;; =20 @@ -3370,6 +3384,14 @@ for drv in $audio_drv_list; do fi ;; =20 + try-sdl) + if test "$sdl" =3D "no"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-sdl//') + else + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-sdl/sdl/= ') + fi + ;; + coreaudio) coreaudio_libs=3D"-framework CoreAudio" ;; --=20 2.9.3