diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch deleted file mode 100644 index 55871883f..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From f82db8496df8ffb8352248e895258c19f8f4776b 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 20:06:24 +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 [30672ba7d134553e59935ddc875104adba26f25c] | ||
| 15 | |||
| 16 | Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> | ||
| 17 | |||
| 18 | --- | ||
| 19 | meson.build | 2 +- | ||
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 21 | |||
| 22 | diff --git a/meson.build b/meson.build | ||
| 23 | index 2fca28205..2714af718 100644 | ||
| 24 | --- a/meson.build | ||
| 25 | +++ b/meson.build | ||
| 26 | @@ -355,7 +355,7 @@ endif | ||
| 27 | |||
| 28 | gir = find_program('g-ir-scanner', required : get_option('introspection')) | ||
| 29 | gnome = import('gnome') | ||
| 30 | -build_gir = gir.found() and not meson.is_cross_build() | ||
| 31 | +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) | ||
| 32 | gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ | ||
| 33 | 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \ | ||
| 34 | 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ | ||
