[v1] configure->meson queue for 6.2

[PATCH 02/24] audio: remove CONFIG_AUDIO_WIN_INT

Posted by Paolo Bonzini 4 years, 4 months ago

Ever since winwaveaudio was removed in 2015, CONFIG_AUDIO_WIN_INT
is only set if dsound is in use, so use CONFIG_AUDIO_DSOUND directly.

Cc: Gerd Hoffman <kraxel@redhat.com>
Cc: Volker Rümelin <vr_qemu@t-online.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 audio/meson.build | 4 ++--
 configure         | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/audio/meson.build b/audio/meson.build
index 7d53b0f920..9a95c58f18 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -8,8 +8,8 @@ softmmu_ss.add(files(
 ))
 
 softmmu_ss.add(when: [coreaudio, 'CONFIG_AUDIO_COREAUDIO'], if_true: files('coreaudio.c'))
-softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'], if_true: files('dsoundaudio.c'))
-softmmu_ss.add(when: ['CONFIG_AUDIO_WIN_INT'], if_true: files('audio_win_int.c'))
+softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'],
+               if_true: files('dsoundaudio.c', 'audio_win_int.c'))
 
 audio_modules = {}
 foreach m : [
diff --git a/configure b/configure
index ab6bc0c994..6a6273ce7b 100755
--- a/configure
+++ b/configure
@@ -245,7 +245,6 @@ block_drv_rw_whitelist=""
 block_drv_ro_whitelist=""
 block_drv_whitelist_tools="no"
 host_cc="cc"
-audio_win_int=""
 libs_qga=""
 debug_info="yes"
 lto="false"
@@ -3075,7 +3074,6 @@ for drv in $audio_drv_list; do
 
     dsound)
       dsound_libs="-lole32 -ldxguid"
-      audio_win_int="yes"
     ;;
 
     oss)
@@ -4560,9 +4558,6 @@ if test "$libjack" = "yes" ; then
     echo "CONFIG_LIBJACK=y" >> $config_host_mak
 fi
 echo "JACK_LIBS=$jack_libs" >> $config_host_mak
-if test "$audio_win_int" = "yes" ; then
-  echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
-fi
 echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
 echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
 if test "$block_drv_whitelist_tools" = "yes" ; then
-- 
2.31.1

Re: [PATCH 02/24] audio: remove CONFIG_AUDIO_WIN_INT

Posted by Marc-André Lureau 4 years, 4 months ago

On Thu, Oct 7, 2021 at 5:09 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Ever since winwaveaudio was removed in 2015, CONFIG_AUDIO_WIN_INT
> is only set if dsound is in use, so use CONFIG_AUDIO_DSOUND directly.
>
> Cc: Gerd Hoffman <kraxel@redhat.com>
> Cc: Volker Rümelin <vr_qemu@t-online.de>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---
>  audio/meson.build | 4 ++--
>  configure         | 5 -----
>  2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/audio/meson.build b/audio/meson.build
> index 7d53b0f920..9a95c58f18 100644
> --- a/audio/meson.build
> +++ b/audio/meson.build
> @@ -8,8 +8,8 @@ softmmu_ss.add(files(
>  ))
>
>  softmmu_ss.add(when: [coreaudio, 'CONFIG_AUDIO_COREAUDIO'], if_true:
> files('coreaudio.c'))
> -softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'], if_true:
> files('dsoundaudio.c'))
> -softmmu_ss.add(when: ['CONFIG_AUDIO_WIN_INT'], if_true:
> files('audio_win_int.c'))
> +softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'],
> +               if_true: files('dsoundaudio.c', 'audio_win_int.c'))
>
>  audio_modules = {}
>  foreach m : [
> diff --git a/configure b/configure
> index ab6bc0c994..6a6273ce7b 100755
> --- a/configure
> +++ b/configure
> @@ -245,7 +245,6 @@ block_drv_rw_whitelist=""
>  block_drv_ro_whitelist=""
>  block_drv_whitelist_tools="no"
>  host_cc="cc"
> -audio_win_int=""
>  libs_qga=""
>  debug_info="yes"
>  lto="false"
> @@ -3075,7 +3074,6 @@ for drv in $audio_drv_list; do
>
>      dsound)
>        dsound_libs="-lole32 -ldxguid"
> -      audio_win_int="yes"
>      ;;
>
>      oss)
> @@ -4560,9 +4558,6 @@ if test "$libjack" = "yes" ; then
>      echo "CONFIG_LIBJACK=y" >> $config_host_mak
>  fi
>  echo "JACK_LIBS=$jack_libs" >> $config_host_mak
> -if test "$audio_win_int" = "yes" ; then
> -  echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
> -fi
>  echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >>
> $config_host_mak
>  echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >>
> $config_host_mak
>  if test "$block_drv_whitelist_tools" = "yes" ; then
> --
> 2.31.1
>
>
>
>

-- 
Marc-André Lureau