diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2020-12-08 15:05:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-15 22:51:55 +0000 |
commit | d54a590ffe7f9debb43ca2b9aa9141d08248d9c7 (patch) | |
tree | e7fd775d56d5cf516c35433eb392a38fcfcbbbdb /meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch | |
parent | df7bccf25496393ee58ec28afb00ad42d7abf70e (diff) | |
download | poky-d54a590ffe7f9debb43ca2b9aa9141d08248d9c7.tar.gz |
gstreamer1.0: upgrade 1.18.1 -> 1.18.2
Drop patches as it as merged upstream:
* gstreamer1.0: 0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch
* gstreamer1.0-plugins-good: 0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch
Update pacthes:
* gstreamer1.0: 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
(From OE-Core rev: 44803c0ae61072cd64228f31cca6990dbd817b02)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 51 |
1 files changed, 40 insertions, 11 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 17f8a0beb7..fe58e718a7 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,27 +1,41 @@ | |||
1 | From f700975f514758a4a7582c2c972fa54ecfca3302 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 1/4] 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 | written by: Alexander Kanavin <alex.kanavin@gmail.com> | 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 | ||
13 | 14 | ||
14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669] | 15 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669] |
15 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 16 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
16 | --- | 17 | --- |
17 | gst/gstpluginloader.c | 4 +--- | 18 | gst/gstpluginloader.c | 15 +++++++-------- |
18 | 1 file changed, 1 insertion(+), 3 deletions(-) | 19 | 1 file changed, 7 insertions(+), 8 deletions(-) |
19 | 20 | ||
20 | diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c | 21 | diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c |
21 | index d1e404d..2e00c3c 100644 | 22 | index d1e404d98..c626bf263 100644 |
22 | --- a/gst/gstpluginloader.c | 23 | --- a/gst/gstpluginloader.c |
23 | +++ b/gst/gstpluginloader.c | 24 | +++ b/gst/gstpluginloader.c |
24 | @@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) | 25 | @@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) |
26 | if (loader->child_running) | ||
27 | return TRUE; | ||
28 | |||
29 | - /* Find the gst-plugin-scanner: first try the env-var if it is set, | ||
30 | - * otherwise use the installed version */ | ||
31 | + /* Find the gst-plugin-scanner */ | ||
32 | env = g_getenv ("GST_PLUGIN_SCANNER_1_0"); | ||
33 | if (env == NULL) | ||
34 | env = g_getenv ("GST_PLUGIN_SCANNER"); | ||
35 | |||
36 | if (env != NULL && *env != '\0') { | ||
37 | + /* use the env-var if it is set */ | ||
38 | GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env); | ||
25 | helper_bin = g_strdup (env); | 39 | helper_bin = g_strdup (env); |
26 | res = gst_plugin_loader_try_helper (loader, helper_bin); | 40 | res = gst_plugin_loader_try_helper (loader, helper_bin); |
27 | g_free (helper_bin); | 41 | g_free (helper_bin); |
@@ -29,9 +43,24 @@ index d1e404d..2e00c3c 100644 | |||
29 | - | 43 | - |
30 | - if (!res) { | 44 | - if (!res) { |
31 | + } else { | 45 | + } else { |
46 | + /* use the installed version */ | ||
32 | GST_LOG ("Trying installed plugin scanner"); | 47 | GST_LOG ("Trying installed plugin scanner"); |
33 | 48 | ||
34 | #ifdef G_OS_WIN32 | 49 | #ifdef G_OS_WIN32 |
50 | @@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) | ||
51 | #endif | ||
52 | res = gst_plugin_loader_try_helper (loader, helper_bin); | ||
53 | g_free (helper_bin); | ||
54 | + } | ||
55 | |||
56 | - if (!res) { | ||
57 | - GST_INFO ("No gst-plugin-scanner available, or not working"); | ||
58 | - } | ||
59 | + if (!res) { | ||
60 | + GST_INFO ("No gst-plugin-scanner available, or not working"); | ||
61 | } | ||
62 | |||
63 | return loader->child_running; | ||
35 | -- | 64 | -- |
36 | 2.28.0 | 65 | 2.29.2 |
37 | 66 | ||