diff options
author | Carlos Rafael Giani <crg7475@mailbox.org> | 2020-01-12 14:59:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-16 22:33:08 +0000 |
commit | 5197e71a8fc1fa17f6e698cf40e69d5b6cdaa779 (patch) | |
tree | 197d820d29719390ad8e348796f4a696e1d6d2f1 /meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server | |
parent | ae3d39ddfd173e5198a02469c06415516a8163a6 (diff) | |
download | poky-5197e71a8fc1fa17f6e698cf40e69d5b6cdaa779.tar.gz |
gstreamer1.0-rtsp-server: Transition to meson based build
* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch is a
fix for GIR support in the meson.build file.
(From OE-Core rev: 63217812467f4d225c80c145edbbceca1dc8efc0)
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch new file mode 100644 index 0000000000..6962a50d6e --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 95ce953e34cd0e9f5d42ce7900a9572e7bc8ca47 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:42:12 +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 | See gstreamer/gstreamer#454 and gstreamer/gstreamer#381. | ||
13 | |||
14 | Upstream-Status: Backport [95ce953e34cd0e9f5d42ce7900a9572e7bc8ca47] | ||
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 e1e3b1d..3f45f0e 100644 | ||
23 | --- a/meson.build | ||
24 | +++ b/meson.build | ||
25 | @@ -173,7 +173,7 @@ endif | ||
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 | |||