* [PATCH] audio: dbus requires pixman
@ 2023-06-30 21:41 marcandre.lureau
2023-07-01 6:28 ` Richard Henderson
0 siblings, 1 reply; 4+ messages in thread
From: marcandre.lureau @ 2023-06-30 21:41 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, Marc-André Lureau, Gerd Hoffmann
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] audio: dbus requires pixman
2023-06-30 21:41 [PATCH] audio: dbus requires pixman marcandre.lureau
@ 2023-07-01 6:28 ` Richard Henderson
2023-07-01 8:04 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 4+ messages in thread
From: Richard Henderson @ 2023-07-01 6:28 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Gerd Hoffmann
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~
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] audio: dbus requires pixman
2023-07-01 6:28 ` Richard Henderson
@ 2023-07-01 8:04 ` Philippe Mathieu-Daudé
2023-07-01 10:13 ` Richard Henderson
0 siblings, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-07-01 8:04 UTC (permalink / raw)
To: Richard Henderson, marcandre.lureau, qemu-devel; +Cc: Gerd Hoffmann
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/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] audio: dbus requires pixman
2023-07-01 8:04 ` Philippe Mathieu-Daudé
@ 2023-07-01 10:13 ` Richard Henderson
0 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2023-07-01 10:13 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, marcandre.lureau, qemu-devel; +Cc: Gerd Hoffmann
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~
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-01 10:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-30 21:41 [PATCH] audio: dbus requires pixman marcandre.lureau
2023-07-01 6:28 ` Richard Henderson
2023-07-01 8:04 ` Philippe Mathieu-Daudé
2023-07-01 10:13 ` Richard Henderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).