1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e9d8eeedefa8
--- lib/wp/log.h.orig 2024-03-04 17:29:09 UTC
+++ lib/wp/log.h
@@ -59,10 +59,12 @@ struct _WpLogTopic {
WP_LOG_TOPIC_STATIC(WP_LOCAL_LOG_TOPIC, t)
/* make glib log functions also use the local log topic */
-#ifdef G_LOG_DOMAIN
-# undef G_LOG_DOMAIN
+#ifdef WP_USE_LOCAL_LOG_TOPIC_IN_G_LOG
+# ifdef G_LOG_DOMAIN
+# undef G_LOG_DOMAIN
+# endif
+# define G_LOG_DOMAIN (WP_LOCAL_LOG_TOPIC->topic_name)
#endif
-#define G_LOG_DOMAIN (WP_LOCAL_LOG_TOPIC->topic_name)
WP_API
void wp_log_topic_init (WpLogTopic *topic);
--- lib/wp/meson.build.orig 2024-03-04 17:29:09 UTC
+++ lib/wp/meson.build
@@ -126,6 +126,7 @@ wp_lib = library('wireplumber-' + wireplumber_api_vers
c_args : [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
'-DBUILDING_WP',
],
install: true,
--- modules/meson.build.orig 2024-03-04 17:29:09 UTC
+++ modules/meson.build
@@ -1,6 +1,7 @@ common_c_args = [
common_c_args = [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
]
shared_library(
--- modules/module-lua-scripting/wplua/meson.build.orig 2024-03-04 17:29:09 UTC
+++ modules/module-lua-scripting/wplua/meson.build
@@ -19,6 +19,7 @@ wplua_lib = static_library('wplua-' + wireplumber_api_
c_args : [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
],
install: false,
include_directories: wplua_include_dir,
--- src/meson.build.orig 2024-03-04 17:29:09 UTC
+++ src/meson.build
@@ -33,6 +33,7 @@ if build_daemon
c_args : [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
],
install: true,
dependencies : [gobject_dep, gio_dep, wp_dep, pipewire_dep],
--- src/tools/meson.build.orig 2024-03-04 17:29:09 UTC
+++ src/tools/meson.build
@@ -3,6 +3,7 @@ executable('wpctl',
c_args : [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
],
install: true,
dependencies : [gobject_dep, gio_dep, wp_dep, pipewire_dep],
@@ -18,6 +19,7 @@ executable('wpexec',
c_args : [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
],
install: true,
dependencies : [gobject_dep, gio_dep, wp_dep, pipewire_dep],
--- tests/modules/meson.build.orig 2024-03-04 17:29:09 UTC
+++ tests/modules/meson.build
@@ -5,6 +5,7 @@ common_args = [
common_args = [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
]
if get_option('dbus-tests')
--- tests/wp/meson.build.orig 2024-03-04 17:29:09 UTC
+++ tests/wp/meson.build
@@ -5,6 +5,7 @@ common_args = [
common_args = [
'-D_GNU_SOURCE',
'-DG_LOG_USE_STRUCTURED',
+ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG',
]
test(
|
