audio: dbus requires pixman

[PATCH] audio: dbus requires pixman

Posted by marcandre.lureau@redhat.com 2 years, 7 months ago

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

Commit commit 6cc5a615 ("ui/dbus: win32 support") has broken audio/dbus
compilation when pixman is not included.

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1739

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 audio/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/meson.build b/audio/meson.build
index e7e95cf751..df4d968c0f 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -31,7 +31,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], if_true: files('dbusaudio.c'))
     audio_modules += {'dbus': module_ss}
 endif
 
-- 
2.41.0

Re: [PATCH] audio: dbus requires pixman

Posted by Richard Henderson 2 years, 7 months ago

On 6/30/23 23:41, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
> 
> Commit commit 6cc5a615 ("ui/dbus: win32 support") has broken audio/dbus
> compilation when pixman is not included.
> 
> Fixes:https://gitlab.com/qemu-project/qemu/-/issues/1739
> 
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
>   audio/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Queued to tcg-next, per request.


r~

Re: [PATCH] audio: dbus requires pixman

Posted by Philippe Mathieu-Daudé 2 years, 7 months ago

On 1/7/23 08:28, Richard Henderson wrote:
> On 6/30/23 23:41, marcandre.lureau@redhat.com wrote:
>> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>>
>> Commit commit 6cc5a615 ("ui/dbus: win32 support") has broken audio/dbus
>> compilation when pixman is not included.
>>
>> Fixes:https://gitlab.com/qemu-project/qemu/-/issues/1739
>>
>> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
>> ---
>>   audio/meson.build | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Queued to tcg-next, per request.

While this happens to fix the build, I think the proper fix is
different, see:
https://lore.kernel.org/qemu-devel/20230630234839.14716-1-philmd@linaro.org/

Re: [PATCH] audio: dbus requires pixman

Posted by Richard Henderson 2 years, 7 months ago

On 7/1/23 10:04, Philippe Mathieu-Daudé wrote:
> On 1/7/23 08:28, Richard Henderson wrote:
>> On 6/30/23 23:41, marcandre.lureau@redhat.com wrote:
>>> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>>>
>>> Commit commit 6cc5a615 ("ui/dbus: win32 support") has broken audio/dbus
>>> compilation when pixman is not included.
>>>
>>> Fixes:https://gitlab.com/qemu-project/qemu/-/issues/1739
>>>
>>> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
>>> ---
>>>   audio/meson.build | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Queued to tcg-next, per request.
> 
> While this happens to fix the build, I think the proper fix is
> different, see:
> https://lore.kernel.org/qemu-devel/20230630234839.14716-1-philmd@linaro.org/
> 

Doh! I didn't see this until after pushing to master.
But yes, that's more correct, getting the -Ipaths right.


r~