[PATCH] audio/dbus: Fix building with modules enabled on macOS

[PATCH] audio/dbus: Fix building with modules enabled on macOS

[Philippe Mathieu-Daudé via]

When configuring QEMU with --enable-modules we get on macOS:

  --- stderr ---
  Dependency ui-dbus cannot be satisfied

ui-dbus depends on pixman and opengl, so add these dependencies
to audio-dbus.

Fixes: 739362d420 ("audio: add "dbus" audio backend")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 audio/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/meson.build b/audio/meson.build
index 0ac3791d0b..d9b295514f 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -28,7 +28,7 @@ endforeach
 
 if dbus_display
     module_ss = ss.source_set()
-    module_ss.add(when: gio, if_true: files('dbusaudio.c'))
+    module_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], if_true: files('dbusaudio.c'))
     audio_modules += {'dbus': module_ss}
 endif
 
-- 
2.34.1

Re: [PATCH] audio/dbus: Fix building with modules enabled on macOS

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]

Hi

On Thu, Feb 3, 2022 at 9:04 PM Philippe Mathieu-Daudé via <
qemu-devel@nongnu.org> wrote:

> When configuring QEMU with --enable-modules we get on macOS:
>
>   --- stderr ---
>   Dependency ui-dbus cannot be satisfied
>
> ui-dbus depends on pixman and opengl, so add these dependencies
> to audio-dbus.
>

Weird, why would the audio module need pixman and opengl, on macos?


> Fixes: 739362d420 ("audio: add "dbus" audio backend")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  audio/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/audio/meson.build b/audio/meson.build
> index 0ac3791d0b..d9b295514f 100644
> --- a/audio/meson.build
> +++ b/audio/meson.build
> @@ -28,7 +28,7 @@ endforeach
>
>  if dbus_display
>      module_ss = ss.source_set()
> -    module_ss.add(when: gio, if_true: files('dbusaudio.c'))
> +    module_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], if_true:
> files('dbusaudio.c'))
>      audio_modules += {'dbus': module_ss}
>  endif
>
> --
> 2.34.1
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 1841 bytes --]

Re: [PATCH] audio/dbus: Fix building with modules enabled on macOS

[Philippe Mathieu-Daudé via]

On 3/2/22 19:05, Marc-André Lureau wrote:
> Hi
> 
> On Thu, Feb 3, 2022 at 9:04 PM Philippe Mathieu-Daudé via 
> <qemu-devel@nongnu.org <mailto:qemu-devel@nongnu.org>> wrote:
> 
>     When configuring QEMU with --enable-modules we get on macOS:
> 
>        --- stderr ---
>        Dependency ui-dbus cannot be satisfied
> 
>     ui-dbus depends on pixman and opengl, so add these dependencies
>     to audio-dbus.
> 
> 
> Weird, why would the audio module need pixman and opengl, on macos?

audio/dbusaudio.c depends on module_dep("ui-dbus") which itself
depends on it (ui/meson.build):

if dbus_display
   dbus_ss = ss.source_set()
   ...
   dbus_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'],
               if_true: [files(
                 'dbus-chardev.c',
                 'dbus-clipboard.c',
                 'dbus-console.c',
                 'dbus-error.c',
                 'dbus-listener.c',
                 'dbus.c',
               ), dbus_display1])
   ui_modules += {'dbus' : dbus_ss}
endif

> 
> 
>     Fixes: 739362d420 ("audio: add "dbus" audio backend")
>     Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org
>     <mailto:f4bug@amsat.org>>
>     ---
>       audio/meson.build | 2 +-
>       1 file changed, 1 insertion(+), 1 deletion(-)
> 
>     diff --git a/audio/meson.build b/audio/meson.build
>     index 0ac3791d0b..d9b295514f 100644
>     --- a/audio/meson.build
>     +++ b/audio/meson.build
>     @@ -28,7 +28,7 @@ endforeach
> 
>       if dbus_display
>           module_ss = ss.source_set()
>     -    module_ss.add(when: gio, if_true: files('dbusaudio.c'))
>     +    module_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'],
>     if_true: files('dbusaudio.c'))
>           audio_modules += {'dbus': module_ss}
>       endif
> 
>     -- 
>     2.34.1
> 
> 
> 
> 
> -- 
> Marc-André Lureau

Re: [PATCH] audio/dbus: Fix building with modules enabled on macOS

[Li Zhang]

On 2/3/22 5:58 PM, Philippe Mathieu-Daudé via wrote:
> When configuring QEMU with --enable-modules we get on macOS:
> 
>    --- stderr ---
>    Dependency ui-dbus cannot be satisfied
> 
> ui-dbus depends on pixman and opengl, so add these dependencies
> to audio-dbus.
> 
> Fixes: 739362d420 ("audio: add "dbus" audio backend")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>   audio/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/audio/meson.build b/audio/meson.build
> index 0ac3791d0b..d9b295514f 100644
> --- a/audio/meson.build
> +++ b/audio/meson.build
> @@ -28,7 +28,7 @@ endforeach
>   
>   if dbus_display
>       module_ss = ss.source_set()
> -    module_ss.add(when: gio, if_true: files('dbusaudio.c'))
> +    module_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], if_true: files('dbusaudio.c'))
>       audio_modules += {'dbus': module_ss}
>   endif
>   
> 

I got the same problem when building master branch on my Linux server.
This patch looks good to me and it fixes my problem.

Reviewed-by: Li Zhang <lizhang@suse.de>


Thanks
Li Zhang