0001-meson-build-gir-even-when-cross-compiling-if-introspection.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001
  2. From: Tim Philipp <tim@centricular.com>
  3. Date: Fri, 18 Oct 2019 00:39:12 +0100
  4. Subject: [PATCH] meson: build gir even when cross-compiling if introspection
  5. was enabled explicitly
  6. This can be made to work in certain circumstances when
  7. cross-compiling, so default to not building g-i stuff
  8. when cross-compiling, but allow it if introspection was
  9. enabled explicitly via -Dintrospection=enabled.
  10. See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
  11. Upstream commit: 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19
  12. Signed-off-by: Tim Philipp <tim@centricular.com>
  13. Signed-off-by: Adam Duskett <aduskett@gmail.com>
  14. ---
  15. meson.build | 2 +-
  16. 1 file changed, 1 insertion(+), 1 deletion(-)
  17. diff --git a/meson.build b/meson.build
  18. index 67aeeb4d03..7b3314bd9f 100644
  19. --- a/meson.build
  20. +++ b/meson.build
  21. @@ -405,7 +405,7 @@ python3 = import('python').find_installation()
  22. gir = find_program('g-ir-scanner', required : get_option('introspection'))
  23. gnome = import('gnome')
  24. -build_gir = gir.found() and not meson.is_cross_build()
  25. +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
  26. gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
  27. 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
  28. 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
  29. --
  30. 2.24.1