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