summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
new file mode 100644
index 0000000000..67a872cddb
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
@@ -0,0 +1,35 @@
1From a1d7c582392c8bc87fa9411af77b20e011944357 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 25 Jan 2018 17:55:02 +0200
4Subject: [PATCH] gst/gstpluginloader.c: when env var is set do not fall
5 through to system plugin scanner
6
7If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that.
8
9Falling through to the one installed on the system is problamatic in cross-compilation
10environemnts, regardless of whether one pointed to by the env var succeeded or failed.
11
12Upstream-Status: Pending
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14---
15 gst/gstpluginloader.c | 4 +---
16 1 file changed, 1 insertion(+), 3 deletions(-)
17
18diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
19index 430829d..3a75731 100644
20--- a/gst/gstpluginloader.c
21+++ b/gst/gstpluginloader.c
22@@ -471,9 +471,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
23 helper_bin = g_strdup (env);
24 res = gst_plugin_loader_try_helper (loader, helper_bin);
25 g_free (helper_bin);
26- }
27-
28- if (!res) {
29+ } else {
30 GST_LOG ("Trying installed plugin scanner");
31
32 #ifdef G_OS_WIN32
33--
342.15.1
35
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index f523ef59f9..c2df1f3258 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -17,6 +17,7 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
17SRC_URI_append = " \ 17SRC_URI_append = " \
18 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 18 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
19 file://gtk-doc-tweaks.patch \ 19 file://gtk-doc-tweaks.patch \
20 file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
20" 21"
21 22
22PACKAGECONFIG ??= "" 23PACKAGECONFIG ??= ""