diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2021-08-30 15:35:29 -0500 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2021-09-11 13:35:14 -0300 |
commit | 8accfe48d26b2d0994e1b7580989e98fff139928 (patch) | |
tree | a21507c6c39a7838e3bb544d75ebc0d802a10035 /recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch | |
parent | 26d93b9bc34bb4c793943f6f1c8417ede534520f (diff) | |
download | meta-freescale-8accfe48d26b2d0994e1b7580989e98fff139928.tar.gz |
gstreamer1.0: Upgrade to 1.18.0.imx
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch | 58 |
1 files changed, 46 insertions, 12 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch index 67a872cd..23ebd5c6 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch | |||
@@ -1,25 +1,44 @@ | |||
1 | From a1d7c582392c8bc87fa9411af77b20e011944357 Mon Sep 17 00:00:00 2001 | 1 | From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Thu, 25 Jan 2018 17:55:02 +0200 | 3 | Date: Sat, 10 Oct 2020 19:09:03 +0000 |
4 | Subject: [PATCH] gst/gstpluginloader.c: when env var is set do not fall | 4 | Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through |
5 | through to system plugin scanner | 5 | to system plugin scanner |
6 | 6 | ||
7 | If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. | 7 | If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. |
8 | 8 | ||
9 | Falling through to the one installed on the system is problamatic in cross-compilation | 9 | Falling through to the one installed on the system is problamatic in cross-compilation |
10 | environemnts, regardless of whether one pointed to by the env var succeeded or failed. | 10 | environemnts, regardless of whether one pointed to by the env var succeeded or failed. |
11 | 11 | ||
12 | Upstream-Status: Pending | 12 | taken from: |
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 13 | http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b |
14 | |||
15 | Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669> | ||
16 | |||
17 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a] | ||
18 | |||
19 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
14 | --- | 20 | --- |
15 | gst/gstpluginloader.c | 4 +--- | 21 | gst/gstpluginloader.c | 15 +++++++-------- |
16 | 1 file changed, 1 insertion(+), 3 deletions(-) | 22 | 1 file changed, 7 insertions(+), 8 deletions(-) |
17 | 23 | ||
18 | diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c | 24 | diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c |
19 | index 430829d..3a75731 100644 | 25 | index d1e404d98..c626bf263 100644 |
20 | --- a/gst/gstpluginloader.c | 26 | --- a/gst/gstpluginloader.c |
21 | +++ b/gst/gstpluginloader.c | 27 | +++ b/gst/gstpluginloader.c |
22 | @@ -471,9 +471,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) | 28 | @@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) |
29 | if (loader->child_running) | ||
30 | return TRUE; | ||
31 | |||
32 | - /* Find the gst-plugin-scanner: first try the env-var if it is set, | ||
33 | - * otherwise use the installed version */ | ||
34 | + /* Find the gst-plugin-scanner */ | ||
35 | env = g_getenv ("GST_PLUGIN_SCANNER_1_0"); | ||
36 | if (env == NULL) | ||
37 | env = g_getenv ("GST_PLUGIN_SCANNER"); | ||
38 | |||
39 | if (env != NULL && *env != '\0') { | ||
40 | + /* use the env-var if it is set */ | ||
41 | GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env); | ||
23 | helper_bin = g_strdup (env); | 42 | helper_bin = g_strdup (env); |
24 | res = gst_plugin_loader_try_helper (loader, helper_bin); | 43 | res = gst_plugin_loader_try_helper (loader, helper_bin); |
25 | g_free (helper_bin); | 44 | g_free (helper_bin); |
@@ -27,9 +46,24 @@ index 430829d..3a75731 100644 | |||
27 | - | 46 | - |
28 | - if (!res) { | 47 | - if (!res) { |
29 | + } else { | 48 | + } else { |
49 | + /* use the installed version */ | ||
30 | GST_LOG ("Trying installed plugin scanner"); | 50 | GST_LOG ("Trying installed plugin scanner"); |
31 | 51 | ||
32 | #ifdef G_OS_WIN32 | 52 | #ifdef G_OS_WIN32 |
53 | @@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) | ||
54 | #endif | ||
55 | res = gst_plugin_loader_try_helper (loader, helper_bin); | ||
56 | g_free (helper_bin); | ||
57 | + } | ||
58 | |||
59 | - if (!res) { | ||
60 | - GST_INFO ("No gst-plugin-scanner available, or not working"); | ||
61 | - } | ||
62 | + if (!res) { | ||
63 | + GST_INFO ("No gst-plugin-scanner available, or not working"); | ||
64 | } | ||
65 | |||
66 | return loader->child_running; | ||
33 | -- | 67 | -- |
34 | 2.15.1 | 68 | 2.29.2 |
35 | 69 | ||