summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch235
1 files changed, 235 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
new file mode 100644
index 0000000000..ca85744c19
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
@@ -0,0 +1,235 @@
1From 685731e989dc074a4b0d48b6c8062e2738f09719 Mon Sep 17 00:00:00 2001
2From: Thibault Saunier <tsaunier@igalia.com>
3Date: Mon, 22 Oct 2018 11:44:37 +0200
4Subject: [PATCH] meson: Add variables for gir files
5
6And flatten list of sources for dependencies
7
8Upstream-Status: Backport [685731e989dc074a4b0d48b6c8062e2738f09719]
9
10Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
11---
12 gst-libs/gst/allocators/meson.build | 5 +++--
13 gst-libs/gst/app/meson.build | 6 ++++--
14 gst-libs/gst/audio/meson.build | 5 +++--
15 gst-libs/gst/pbutils/meson.build | 5 +++--
16 gst-libs/gst/rtp/meson.build | 6 ++++--
17 gst-libs/gst/rtsp/meson.build | 5 +++--
18 gst-libs/gst/sdp/meson.build | 6 ++++--
19 gst-libs/gst/tag/meson.build | 5 +++--
20 gst-libs/gst/video/meson.build | 5 +++--
21 9 files changed, 30 insertions(+), 18 deletions(-)
22
23diff --git a/gst-libs/gst/allocators/meson.build b/gst-libs/gst/allocators/meson.build
24index 364baeebf..56f156dc3 100644
25--- a/gst-libs/gst/allocators/meson.build
26+++ b/gst-libs/gst/allocators/meson.build
27@@ -22,7 +22,7 @@ gstallocators = library('gstallocators-@0@'.format(api_version),
28 allocators_gen_sources = []
29 if build_gir
30 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/allocators/allocators.h' ]
31- allocators_gen_sources += [gnome.generate_gir(gstallocators,
32+ allocators_gir = gnome.generate_gir(gstallocators,
33 sources : gst_allocators_sources + gst_allocators_headers,
34 namespace : 'GstAllocators',
35 nsversion : api_version,
36@@ -33,7 +33,8 @@ if build_gir
37 install : true,
38 extra_args : gst_gir_extra_args,
39 dependencies : [gst_dep]
40- )]
41+ )
42+ allocators_gen_sources += allocators_gir
43 endif
44
45 allocators_dep = declare_dependency(link_with: gstallocators,
46diff --git a/gst-libs/gst/app/meson.build b/gst-libs/gst/app/meson.build
47index 81dd0f42c..7a90f5e10 100644
48--- a/gst-libs/gst/app/meson.build
49+++ b/gst-libs/gst/app/meson.build
50@@ -32,7 +32,7 @@ gstapp = library('gstapp-@0@'.format(api_version),
51
52 if build_gir
53 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/app/app.h' ]
54- app_gen_sources += [gnome.generate_gir(gstapp,
55+ app_gir = gnome.generate_gir(gstapp,
56 sources : app_sources + app_headers + [gstapp_c] + [gstapp_h],
57 namespace : 'GstApp',
58 nsversion : api_version,
59@@ -43,7 +43,9 @@ if build_gir
60 install : true,
61 extra_args : gst_gir_extra_args,
62 dependencies : [gst_dep, gst_base_dep]
63- )]
64+ )
65+
66+ app_gen_sources += app_gir
67 endif
68
69 app_dep = declare_dependency(link_with: gstapp,
70diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
71index 0e4efab2e..2a449d4bf 100644
72--- a/gst-libs/gst/audio/meson.build
73+++ b/gst-libs/gst/audio/meson.build
74@@ -153,7 +153,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
75
76 if build_gir
77 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/audio/audio.h' ]
78- audio_gen_sources += [gnome.generate_gir(gstaudio,
79+ audio_gir = gnome.generate_gir(gstaudio,
80 sources : audio_src + audio_headers + [gstaudio_c] + [gstaudio_h],
81 namespace : 'GstAudio',
82 nsversion : api_version,
83@@ -164,7 +164,8 @@ if build_gir
84 install : true,
85 extra_args : gst_gir_extra_args,
86 dependencies : gstaudio_deps
87- )]
88+ )
89+ audio_gen_sources += [audio_gir]
90 endif
91
92 audio_dep = declare_dependency(link_with : gstaudio,
93diff --git a/gst-libs/gst/pbutils/meson.build b/gst-libs/gst/pbutils/meson.build
94index 2faf62622..0e96722fd 100644
95--- a/gst-libs/gst/pbutils/meson.build
96+++ b/gst-libs/gst/pbutils/meson.build
97@@ -63,7 +63,7 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
98 pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
99 if build_gir
100 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
101- pbutils_gen_sources += [gnome.generate_gir(pbutils,
102+ pbutils_gir = gnome.generate_gir(pbutils,
103 sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
104 namespace : 'GstPbutils',
105 nsversion : api_version,
106@@ -74,7 +74,8 @@ if build_gir
107 install : true,
108 extra_args : gst_gir_extra_args,
109 dependencies : gstpbutils_deps
110- )]
111+ )
112+ pbutils_gen_sources += [pbutils_gir]
113 endif
114
115 pbutils_dep = declare_dependency(link_with : pbutils,
116diff --git a/gst-libs/gst/rtp/meson.build b/gst-libs/gst/rtp/meson.build
117index f47ec6592..7ea6658d5 100644
118--- a/gst-libs/gst/rtp/meson.build
119+++ b/gst-libs/gst/rtp/meson.build
120@@ -49,7 +49,7 @@ gst_rtp = library('gstrtp-@0@'.format(api_version),
121 rtp_gen_sources = [gstrtp_enum_h]
122 if build_gir
123 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtp/rtp.h' ]
124- rtp_gen_sources += [gnome.generate_gir(gst_rtp,
125+ rtp_gir = gnome.generate_gir(gst_rtp,
126 sources : rtp_sources + rtp_headers + [gstrtp_enum_c] + [gstrtp_enum_h],
127 namespace : 'GstRtp',
128 nsversion : api_version,
129@@ -60,7 +60,9 @@ if build_gir
130 install : true,
131 extra_args : gst_gir_extra_args,
132 dependencies : gstrtp_deps
133- )]
134+ )
135+
136+ rtp_gen_sources += [rtp_gir]
137 endif
138
139
140diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build
141index 27e309d5a..3632adceb 100644
142--- a/gst-libs/gst/rtsp/meson.build
143+++ b/gst-libs/gst/rtsp/meson.build
144@@ -54,7 +54,7 @@ gst_rtsp = library('gstrtsp-@0@'.format(api_version),
145 rtsp_gen_sources = [gstrtsp_h]
146 if build_gir
147 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtsp/rtsp.h' ]
148- rtsp_gen_sources += [gnome.generate_gir(gst_rtsp,
149+ rtsp_gir = gnome.generate_gir(gst_rtsp,
150 sources : rtsp_sources + rtsp_headers + [gstrtsp_c] + [gstrtsp_h],
151 namespace : 'GstRtsp',
152 nsversion : api_version,
153@@ -65,7 +65,8 @@ if build_gir
154 install : true,
155 extra_args : gst_gir_extra_args,
156 dependencies : gstrtsp_deps + [sdp_dep]
157- )]
158+ )
159+ rtsp_gen_sources += [rtsp_gir]
160 endif
161
162 rtsp_dep = declare_dependency(link_with : gst_rtsp,
163diff --git a/gst-libs/gst/sdp/meson.build b/gst-libs/gst/sdp/meson.build
164index 62c18b732..24cdb5293 100644
165--- a/gst-libs/gst/sdp/meson.build
166+++ b/gst-libs/gst/sdp/meson.build
167@@ -23,7 +23,7 @@ gstsdp = library('gstsdp-@0@'.format(api_version),
168 sdp_gen_sources = []
169 if build_gir
170 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/sdp/sdp.h' ]
171- sdp_gen_sources += [gnome.generate_gir(gstsdp,
172+ sdp_gir = gnome.generate_gir(gstsdp,
173 sources : gst_sdp_sources + gst_sdp_headers,
174 namespace : 'GstSdp',
175 nsversion : api_version,
176@@ -34,7 +34,9 @@ if build_gir
177 install : true,
178 extra_args : gst_gir_extra_args,
179 dependencies : rtsp_deps
180- )]
181+ )
182+
183+ sdp_gen_sources += [sdp_gir]
184 endif
185
186 sdp_dep = declare_dependency(link_with: gstsdp,
187diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build
188index 27e66fd63..5ec37392a 100644
189--- a/gst-libs/gst/tag/meson.build
190+++ b/gst-libs/gst/tag/meson.build
191@@ -93,7 +93,7 @@ gsttag = library('gsttag-@0@'.format(api_version),
192
193 if build_gir
194 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/tag/tag.h' ]
195- tag_gen_sources += [gnome.generate_gir(gsttag,
196+ tag_gir = gnome.generate_gir(gsttag,
197 sources : tag_sources + tag_headers + [gsttag_h] + [gsttag_c],
198 namespace : 'GstTag',
199 nsversion : api_version,
200@@ -104,7 +104,8 @@ if build_gir
201 install : true,
202 extra_args : gst_gir_extra_args,
203 dependencies : tag_deps
204- )]
205+ )
206+ tag_gen_sources += [tag_gir]
207 endif
208
209 tag_dep = declare_dependency(link_with: gsttag,
210diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
211index 5b35e1943..bf77aa157 100644
212--- a/gst-libs/gst/video/meson.build
213+++ b/gst-libs/gst/video/meson.build
214@@ -138,7 +138,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
215
216 if build_gir
217 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/video/video.h' ]
218- video_gen_sources += [gnome.generate_gir(gstvideo,
219+ video_gir = gnome.generate_gir(gstvideo,
220 sources : video_sources + video_headers + [gstvideo_c] + [gstvideo_h],
221 namespace : 'GstVideo',
222 nsversion : api_version,
223@@ -149,7 +149,8 @@ if build_gir
224 install : true,
225 extra_args : gst_gir_extra_args,
226 dependencies : gstvideo_deps
227- )]
228+ )
229+ video_gen_sources += [video_gir]
230 endif
231
232 video_dep = declare_dependency(link_with : gstvideo,
233--
2342.17.1
235
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-27 15:35:48 +0000