diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-09-05 08:58:15 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-05 08:58:15 -0300 |
commit | 53710450a793e12912913b29828af21758c347be (patch) | |
tree | 331ff4458576731ea9d2723acfc2f72498ec376c /recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch | |
parent | 774b4924c0e1697b6f9195d865507921329648c2 (diff) | |
parent | cc026b37007884e2118b75fc81cca2c7e83ac0c4 (diff) | |
download | meta-freescale-53710450a793e12912913b29828af21758c347be.tar.gz |
Merge pull request #1196 from Freescale/backport-1193-to-kirkstone
[Backport kirkstone] Recipes-multimedia from NXP release 5.15.32-2.0.0
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 | 69 |
1 files changed, 0 insertions, 69 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 deleted file mode 100644 index 23ebd5c6..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Sat, 10 Oct 2020 19:09:03 +0000 | ||
4 | Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through | ||
5 | to system plugin scanner | ||
6 | |||
7 | If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. | ||
8 | |||
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. | ||
11 | |||
12 | taken from: | ||
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> | ||
20 | --- | ||
21 | gst/gstpluginloader.c | 15 +++++++-------- | ||
22 | 1 file changed, 7 insertions(+), 8 deletions(-) | ||
23 | |||
24 | diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c | ||
25 | index d1e404d98..c626bf263 100644 | ||
26 | --- a/gst/gstpluginloader.c | ||
27 | +++ b/gst/gstpluginloader.c | ||
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); | ||
42 | helper_bin = g_strdup (env); | ||
43 | res = gst_plugin_loader_try_helper (loader, helper_bin); | ||
44 | g_free (helper_bin); | ||
45 | - } | ||
46 | - | ||
47 | - if (!res) { | ||
48 | + } else { | ||
49 | + /* use the installed version */ | ||
50 | GST_LOG ("Trying installed plugin scanner"); | ||
51 | |||
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; | ||
67 | -- | ||
68 | 2.29.2 | ||
69 | |||