diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-02-27 13:27:37 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2020-03-03 18:26:17 -0300 |
| commit | ca1533819c3c5a6cd055e5719a5030daa896262a (patch) | |
| tree | a6008852988e7df0cd6f150e29fc85f1c777cd39 /recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch | |
| parent | cb3f6b356b4b0d4a36e57a280b582cc2cacea326 (diff) | |
| download | meta-freescale-ca1533819c3c5a6cd055e5719a5030daa896262a.tar.gz | |
gstreamer1.0: Transition to meson based builds
Update gstreamer to meson build system.
This update follows the strategy and description provided in commit
[3e71919b865433ca007bf23f9b4f9015e25ac04e] from upstream.
Autotools patches are completely dropped from the layer, and
meson-relevant patches are introduced instead.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch new file mode 100644 index 000000000..1ed7198a5 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> | ||
| 3 | Date: Thu, 17 Oct 2019 12:13:35 +0100 | ||
| 4 | Subject: [PATCH] meson: build gir even when cross-compiling if introspection | ||
| 5 | was enabled explicitly | ||
| 6 | |||
| 7 | This can be made to work in certain circumstances when | ||
| 8 | cross-compiling, so default to not building g-i stuff | ||
| 9 | when cross-compiling, but allow it if introspection was | ||
| 10 | enabled explicitly via -Dintrospection=enabled. | ||
| 11 | |||
| 12 | Fixes #454 and #381. | ||
| 13 | |||
| 14 | Upstream-Status: Backport [35db4a2433fbdf8612cf98b5aab5b14aeb5372f8] | ||
| 15 | |||
| 16 | Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> | ||
| 17 | --- | ||
| 18 | meson.build | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/meson.build b/meson.build | ||
| 22 | index 90d98d8eb..a47e7f34e 100644 | ||
| 23 | --- a/meson.build | ||
| 24 | +++ b/meson.build | ||
| 25 | @@ -466,7 +466,7 @@ rt_lib = cc.find_library('rt', required : false) | ||
| 26 | gir = find_program('g-ir-scanner', required : get_option('introspection')) | ||
| 27 | gnome = import('gnome') | ||
| 28 | |||
| 29 | -build_gir = gir.found() and not meson.is_cross_build() | ||
| 30 | +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) | ||
| 31 | |||
| 32 | gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ | ||
| 33 | 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \ | ||
| 34 | -- | ||
| 35 | 2.17.1 | ||
| 36 | |||
