[v5] meson: Fixes for dbus modules

[PATCH v5 2/2] audio: Do not include ui/dbus.h

Posted by Akihiko Odaki 1 year, 11 months ago

ui/dbusaudio.c does not depend on ui/dbus.h

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 audio/dbusaudio.c | 1 -
 audio/meson.build | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
index 2aacdac6715b..3cd8e294501f 100644
--- a/audio/dbusaudio.c
+++ b/audio/dbusaudio.c
@@ -33,7 +33,6 @@
 #include <gio/gunixfdlist.h>
 #endif
 
-#include "ui/dbus.h"
 #include "util/dbus-display1.h"
 
 #define AUDIO_CAP "dbus"
diff --git a/audio/meson.build b/audio/meson.build
index c8f658611f42..8931c1697b4d 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -30,7 +30,7 @@ endforeach
 
 if dbus_display
     module_ss = ss.source_set()
-    module_ss.add(when: [gio, pixman], if_true: files('dbusaudio.c'))
+    module_ss.add(when: [gio], if_true: files('dbusaudio.c'))
     audio_modules += {'dbus': module_ss}
 endif
 

-- 
2.43.0

Re: [PATCH v5 2/2] audio: Do not include ui/dbus.h

Posted by Marc-André Lureau 1 year, 11 months ago

Hi

On Sun, Dec 17, 2023 at 10:14 AM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>
> ui/dbusaudio.c does not depend on ui/dbus.h
>

It uses dbus_win32_import_socket()

> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
>  audio/dbusaudio.c | 1 -
>  audio/meson.build | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
> index 2aacdac6715b..3cd8e294501f 100644
> --- a/audio/dbusaudio.c
> +++ b/audio/dbusaudio.c
> @@ -33,7 +33,6 @@
>  #include <gio/gunixfdlist.h>
>  #endif
>
> -#include "ui/dbus.h"
>  #include "util/dbus-display1.h"
>
>  #define AUDIO_CAP "dbus"
> diff --git a/audio/meson.build b/audio/meson.build
> index c8f658611f42..8931c1697b4d 100644
> --- a/audio/meson.build
> +++ b/audio/meson.build
> @@ -30,7 +30,7 @@ endforeach
>
>  if dbus_display
>      module_ss = ss.source_set()
> -    module_ss.add(when: [gio, pixman], if_true: files('dbusaudio.c'))
> +    module_ss.add(when: [gio], if_true: files('dbusaudio.c'))
>      audio_modules += {'dbus': module_ss}
>  endif
>
>
> --
> 2.43.0
>
>


-- 
Marc-André Lureau

Re: [PATCH v5 2/2] audio: Do not include ui/dbus.h

Posted by Akihiko Odaki 1 year, 11 months ago

On 2023/12/18 16:06, Marc-André Lureau wrote:
> Hi
> 
> On Sun, Dec 17, 2023 at 10:14 AM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>>
>> ui/dbusaudio.c does not depend on ui/dbus.h
>>
> 
> It uses dbus_win32_import_socket()

Oops. I withdraw this patch. Please dismiss it and review only the first 
one.