summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
index 67a872cddb..17f8a0beb7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
@@ -1,7 +1,7 @@
1From a1d7c582392c8bc87fa9411af77b20e011944357 Mon Sep 17 00:00:00 2001 1From f700975f514758a4a7582c2c972fa54ecfca3302 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 25 Jan 2018 17:55:02 +0200 3Date: Thu, 25 Jan 2018 17:55:02 +0200
4Subject: [PATCH] gst/gstpluginloader.c: when env var is set do not fall 4Subject: [PATCH 1/4] gst/gstpluginloader.c: when env var is set do not fall
5 through to system plugin scanner 5 through to system plugin scanner
6 6
7If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. 7If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that.
@@ -9,17 +9,19 @@ If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that
9Falling through to the one installed on the system is problamatic in cross-compilation 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. 10environemnts, regardless of whether one pointed to by the env var succeeded or failed.
11 11
12Upstream-Status: Pending 12written by: Alexander Kanavin <alex.kanavin@gmail.com>
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 13
14Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669]
15Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
14--- 16---
15 gst/gstpluginloader.c | 4 +--- 17 gst/gstpluginloader.c | 4 +---
16 1 file changed, 1 insertion(+), 3 deletions(-) 18 1 file changed, 1 insertion(+), 3 deletions(-)
17 19
18diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c 20diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
19index 430829d..3a75731 100644 21index d1e404d..2e00c3c 100644
20--- a/gst/gstpluginloader.c 22--- a/gst/gstpluginloader.c
21+++ b/gst/gstpluginloader.c 23+++ b/gst/gstpluginloader.c
22@@ -471,9 +471,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) 24@@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
23 helper_bin = g_strdup (env); 25 helper_bin = g_strdup (env);
24 res = gst_plugin_loader_try_helper (loader, helper_bin); 26 res = gst_plugin_loader_try_helper (loader, helper_bin);
25 g_free (helper_bin); 27 g_free (helper_bin);
@@ -31,5 +33,5 @@ index 430829d..3a75731 100644
31 33
32 #ifdef G_OS_WIN32 34 #ifdef G_OS_WIN32
33-- 35--
342.15.1 362.28.0
35 37