diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-02-22 14:33:25 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2020-03-03 18:26:17 -0300 |
| commit | 6802b457723b8aaa0fda20f608a34d7bc220942d (patch) | |
| tree | 74e3bd6bfbef3060a0dc5a43d0dd542505f0f099 /recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch | |
| parent | 723deb35baae17006fc029e15ddf6ff55357b580 (diff) | |
| download | meta-freescale-6802b457723b8aaa0fda20f608a34d7bc220942d.tar.gz | |
gstreamer1.0-plugins-bad: Transition to meson based builds
This update follows [427eb30f9b59972b38ae3f25094470bb7034547d]
in upstream, which trasnitions the gstreamer1.0 plugins build
from autotools to meson build.
Additional patches included in meta-freescale are:
- Backport of 2 patches to allow using OpenCV version 4.1.0
- Adaptions required in NXP fork to use meson
- One patch which solves the data dir search on OpenCV.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-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-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch new file mode 100644 index 000000000..132185202 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> | ||
| 3 | Date: Fri, 18 Oct 2019 00:39:12 +0100 | ||
| 4 | Subject: [PATCH 1/2] meson: build gir even when cross-compiling if | ||
| 5 | introspection 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 | See gstreamer/gstreamer#454 and gstreamer/gstreamer#381. | ||
| 13 | |||
| 14 | Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19] | ||
| 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 67aeeb4d0..7b3314bd9 100644 | ||
| 23 | --- a/meson.build | ||
| 24 | +++ b/meson.build | ||
| 25 | @@ -411,7 +411,7 @@ python3 = import('python').find_installation() | ||
| 26 | |||
| 27 | gir = find_program('g-ir-scanner', required : get_option('introspection')) | ||
| 28 | gnome = import('gnome') | ||
| 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 | gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ | ||
| 32 | 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ | ||
| 33 | 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ | ||
| 34 | -- | ||
| 35 | 2.17.1 | ||
| 36 | |||
