blob: 17f8a0beb70273493da1e1cbb8c100ea6cfd25f1 [file] [log] [blame]
Andrew Geissler706d5aa2021-02-12 15:55:30 -06001From f700975f514758a4a7582c2c972fa54ecfca3302 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 1/4] gst/gstpluginloader.c: when env var is set do not fall
5 through to system plugin scanner
Brad Bishop316dfdd2018-06-25 12:45:53 -04006
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
Andrew Geissler706d5aa2021-02-12 15:55:30 -060012written by: Alexander Kanavin <alex.kanavin@gmail.com>
Andrew Geissler6ce62a22020-11-30 19:58:47 -060013
14Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669]
15Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -040016---
Andrew Geissler706d5aa2021-02-12 15:55:30 -060017 gst/gstpluginloader.c | 4 +---
18 1 file changed, 1 insertion(+), 3 deletions(-)
Brad Bishop316dfdd2018-06-25 12:45:53 -040019
20diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
Andrew Geissler706d5aa2021-02-12 15:55:30 -060021index d1e404d..2e00c3c 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -040022--- a/gst/gstpluginloader.c
23+++ b/gst/gstpluginloader.c
Andrew Geissler706d5aa2021-02-12 15:55:30 -060024@@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
Brad Bishop316dfdd2018-06-25 12:45:53 -040025 helper_bin = g_strdup (env);
26 res = gst_plugin_loader_try_helper (loader, helper_bin);
27 g_free (helper_bin);
28- }
29-
30- if (!res) {
31+ } else {
32 GST_LOG ("Trying installed plugin scanner");
33
34 #ifdef G_OS_WIN32
35--
Andrew Geissler706d5aa2021-02-12 15:55:30 -0600362.28.0
Brad Bishop316dfdd2018-06-25 12:45:53 -040037