|
@@ -0,0 +1,36 @@
|
|
|
+From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001
|
|
|
+From: Tim Philipp <tim@centricular.com>
|
|
|
+Date: Thu, 17 Oct 2019 12:13:35 +0100
|
|
|
+Subject: [PATCH] meson: build gir even when cross-compiling if introspection
|
|
|
+ was enabled explicitly
|
|
|
+
|
|
|
+This can be made to work in certain circumstances when
|
|
|
+cross-compiling, so default to not building g-i stuff
|
|
|
+when cross-compiling, but allow it if introspection was
|
|
|
+enabled explicitly via -Dintrospection=enabled.
|
|
|
+
|
|
|
+Fixes #454 and #381.
|
|
|
+
|
|
|
+Upstream commit: 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8
|
|
|
+Signed-off-by: Tim Philipp <tim@centricular.com>
|
|
|
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
|
+---
|
|
|
+ meson.build | 2 +-
|
|
|
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
+
|
|
|
+diff --git a/meson.build b/meson.build
|
|
|
+index 90d98d8eb00..a47e7f34e8a 100644
|
|
|
+--- a/meson.build
|
|
|
++++ b/meson.build
|
|
|
+@@ -453,7 +453,7 @@ rt_lib = cc.find_library('rt', required : false)
|
|
|
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
|
|
|
+ gnome = import('gnome')
|
|
|
+
|
|
|
+-build_gir = gir.found() and not meson.is_cross_build()
|
|
|
++build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
|
|
|
+
|
|
|
+ gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
|
|
|
+ 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
|
|
|
+--
|
|
|
+2.24.1
|
|
|
+
|