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
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
|
From 685731e989dc074a4b0d48b6c8062e2738f09719 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Mon, 22 Oct 2018 11:44:37 +0200
Subject: [PATCH] meson: Add variables for gir files
And flatten list of sources for dependencies
Upstream-Status: Backport [685731e989dc074a4b0d48b6c8062e2738f09719]
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
---
gst-libs/gst/allocators/meson.build | 5 +++--
gst-libs/gst/app/meson.build | 6 ++++--
gst-libs/gst/audio/meson.build | 5 +++--
gst-libs/gst/pbutils/meson.build | 5 +++--
gst-libs/gst/rtp/meson.build | 6 ++++--
gst-libs/gst/rtsp/meson.build | 5 +++--
gst-libs/gst/sdp/meson.build | 6 ++++--
gst-libs/gst/tag/meson.build | 5 +++--
gst-libs/gst/video/meson.build | 5 +++--
9 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/gst-libs/gst/allocators/meson.build b/gst-libs/gst/allocators/meson.build
index 364baeebf..56f156dc3 100644
--- a/gst-libs/gst/allocators/meson.build
+++ b/gst-libs/gst/allocators/meson.build
@@ -22,7 +22,7 @@ gstallocators = library('gstallocators-@0@'.format(api_version),
allocators_gen_sources = []
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/allocators/allocators.h' ]
- allocators_gen_sources += [gnome.generate_gir(gstallocators,
+ allocators_gir = gnome.generate_gir(gstallocators,
sources : gst_allocators_sources + gst_allocators_headers,
namespace : 'GstAllocators',
nsversion : api_version,
@@ -33,7 +33,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : [gst_dep]
- )]
+ )
+ allocators_gen_sources += allocators_gir
endif
allocators_dep = declare_dependency(link_with: gstallocators,
diff --git a/gst-libs/gst/app/meson.build b/gst-libs/gst/app/meson.build
index 81dd0f42c..7a90f5e10 100644
--- a/gst-libs/gst/app/meson.build
+++ b/gst-libs/gst/app/meson.build
@@ -32,7 +32,7 @@ gstapp = library('gstapp-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/app/app.h' ]
- app_gen_sources += [gnome.generate_gir(gstapp,
+ app_gir = gnome.generate_gir(gstapp,
sources : app_sources + app_headers + [gstapp_c] + [gstapp_h],
namespace : 'GstApp',
nsversion : api_version,
@@ -43,7 +43,9 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : [gst_dep, gst_base_dep]
- )]
+ )
+
+ app_gen_sources += app_gir
endif
app_dep = declare_dependency(link_with: gstapp,
diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
index 0e4efab2e..2a449d4bf 100644
--- a/gst-libs/gst/audio/meson.build
+++ b/gst-libs/gst/audio/meson.build
@@ -153,7 +153,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/audio/audio.h' ]
- audio_gen_sources += [gnome.generate_gir(gstaudio,
+ audio_gir = gnome.generate_gir(gstaudio,
sources : audio_src + audio_headers + [gstaudio_c] + [gstaudio_h],
namespace : 'GstAudio',
nsversion : api_version,
@@ -164,7 +164,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstaudio_deps
- )]
+ )
+ audio_gen_sources += [audio_gir]
endif
audio_dep = declare_dependency(link_with : gstaudio,
diff --git a/gst-libs/gst/pbutils/meson.build b/gst-libs/gst/pbutils/meson.build
index 2faf62622..0e96722fd 100644
--- a/gst-libs/gst/pbutils/meson.build
+++ b/gst-libs/gst/pbutils/meson.build
@@ -63,7 +63,7 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
- pbutils_gen_sources += [gnome.generate_gir(pbutils,
+ pbutils_gir = gnome.generate_gir(pbutils,
sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
namespace : 'GstPbutils',
nsversion : api_version,
@@ -74,7 +74,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstpbutils_deps
- )]
+ )
+ pbutils_gen_sources += [pbutils_gir]
endif
pbutils_dep = declare_dependency(link_with : pbutils,
diff --git a/gst-libs/gst/rtp/meson.build b/gst-libs/gst/rtp/meson.build
index f47ec6592..7ea6658d5 100644
--- a/gst-libs/gst/rtp/meson.build
+++ b/gst-libs/gst/rtp/meson.build
@@ -49,7 +49,7 @@ gst_rtp = library('gstrtp-@0@'.format(api_version),
rtp_gen_sources = [gstrtp_enum_h]
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtp/rtp.h' ]
- rtp_gen_sources += [gnome.generate_gir(gst_rtp,
+ rtp_gir = gnome.generate_gir(gst_rtp,
sources : rtp_sources + rtp_headers + [gstrtp_enum_c] + [gstrtp_enum_h],
namespace : 'GstRtp',
nsversion : api_version,
@@ -60,7 +60,9 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstrtp_deps
- )]
+ )
+
+ rtp_gen_sources += [rtp_gir]
endif
diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build
index 27e309d5a..3632adceb 100644
--- a/gst-libs/gst/rtsp/meson.build
+++ b/gst-libs/gst/rtsp/meson.build
@@ -54,7 +54,7 @@ gst_rtsp = library('gstrtsp-@0@'.format(api_version),
rtsp_gen_sources = [gstrtsp_h]
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtsp/rtsp.h' ]
- rtsp_gen_sources += [gnome.generate_gir(gst_rtsp,
+ rtsp_gir = gnome.generate_gir(gst_rtsp,
sources : rtsp_sources + rtsp_headers + [gstrtsp_c] + [gstrtsp_h],
namespace : 'GstRtsp',
nsversion : api_version,
@@ -65,7 +65,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstrtsp_deps + [sdp_dep]
- )]
+ )
+ rtsp_gen_sources += [rtsp_gir]
endif
rtsp_dep = declare_dependency(link_with : gst_rtsp,
diff --git a/gst-libs/gst/sdp/meson.build b/gst-libs/gst/sdp/meson.build
index 62c18b732..24cdb5293 100644
--- a/gst-libs/gst/sdp/meson.build
+++ b/gst-libs/gst/sdp/meson.build
@@ -23,7 +23,7 @@ gstsdp = library('gstsdp-@0@'.format(api_version),
sdp_gen_sources = []
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/sdp/sdp.h' ]
- sdp_gen_sources += [gnome.generate_gir(gstsdp,
+ sdp_gir = gnome.generate_gir(gstsdp,
sources : gst_sdp_sources + gst_sdp_headers,
namespace : 'GstSdp',
nsversion : api_version,
@@ -34,7 +34,9 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : rtsp_deps
- )]
+ )
+
+ sdp_gen_sources += [sdp_gir]
endif
sdp_dep = declare_dependency(link_with: gstsdp,
diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build
index 27e66fd63..5ec37392a 100644
--- a/gst-libs/gst/tag/meson.build
+++ b/gst-libs/gst/tag/meson.build
@@ -93,7 +93,7 @@ gsttag = library('gsttag-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/tag/tag.h' ]
- tag_gen_sources += [gnome.generate_gir(gsttag,
+ tag_gir = gnome.generate_gir(gsttag,
sources : tag_sources + tag_headers + [gsttag_h] + [gsttag_c],
namespace : 'GstTag',
nsversion : api_version,
@@ -104,7 +104,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : tag_deps
- )]
+ )
+ tag_gen_sources += [tag_gir]
endif
tag_dep = declare_dependency(link_with: gsttag,
diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
index 5b35e1943..bf77aa157 100644
--- a/gst-libs/gst/video/meson.build
+++ b/gst-libs/gst/video/meson.build
@@ -138,7 +138,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/video/video.h' ]
- video_gen_sources += [gnome.generate_gir(gstvideo,
+ video_gir = gnome.generate_gir(gstvideo,
sources : video_sources + video_headers + [gstvideo_c] + [gstvideo_h],
namespace : 'GstVideo',
nsversion : api_version,
@@ -149,7 +149,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstvideo_deps
- )]
+ )
+ video_gen_sources += [video_gir]
endif
video_dep = declare_dependency(link_with : gstvideo,
--
2.17.1
|
