summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
diff options
context:
space:
mode:
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.patch14
1 files changed, 6 insertions, 8 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
index 13218520..4f9041dc 100644
--- 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
@@ -1,8 +1,8 @@
1From 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19 Mon Sep 17 00:00:00 2001 1From 69cff1595f9e0014c582c6f540d69d86d5e824ff Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> 2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Fri, 18 Oct 2019 00:39:12 +0100 3Date: Fri, 18 Oct 2019 00:39:12 +0100
4Subject: [PATCH 1/2] meson: build gir even when cross-compiling if 4Subject: [PATCH] meson: build gir even when cross-compiling if introspection
5 introspection was enabled explicitly 5 was enabled explicitly
6 6
7This can be made to work in certain circumstances when 7This can be made to work in certain circumstances when
8cross-compiling, so default to not building g-i stuff 8cross-compiling, so default to not building g-i stuff
@@ -14,15 +14,16 @@ See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
14Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19] 14Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19]
15 15
16Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> 16Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
17
17--- 18---
18 meson.build | 2 +- 19 meson.build | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
20 21
21diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
22index 67aeeb4d0..7b3314bd9 100644 23index 2b492faea..bea89b23d 100644
23--- a/meson.build 24--- a/meson.build
24+++ b/meson.build 25+++ b/meson.build
25@@ -411,7 +411,7 @@ python3 = import('python').find_installation() 26@@ -405,7 +405,7 @@ python3 = import('python').find_installation()
26 27
27 gir = find_program('g-ir-scanner', required : get_option('introspection')) 28 gir = find_program('g-ir-scanner', required : get_option('introspection'))
28 gnome = import('gnome') 29 gnome = import('gnome')
@@ -31,6 +32,3 @@ index 67aeeb4d0..7b3314bd9 100644
31 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ 32 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_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
33 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ 34 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
34--
352.17.1
36