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 | |
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')
4 files changed, 57 insertions, 62 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 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch deleted file mode 100644 index a2d215d72d..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 4449246a8d788e71dfe4679fba95955cec5894c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 3 Nov 2020 22:58:26 -0800 | ||
4 | Subject: [PATCH] gst_private.h: increse padding in struct _GstClockEntryImpl | ||
5 | |||
6 | When compiling for 32bit architectures with 64bit time_t e.g. riscv32, | ||
7 | the static assert that the GstClockEntryImpl smaller or | ||
8 | equal to the struct _GstClockEntryImpl triggered. | ||
9 | (they were 12bytes off). | ||
10 | |||
11 | To fix this, the padding is increased by 8 bytes (on 32bit). | ||
12 | |||
13 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/694] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | gst/gst_private.h | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/gst/gst_private.h b/gst/gst_private.h | ||
20 | index a8897e1..8252ede 100644 | ||
21 | --- a/gst/gst_private.h | ||
22 | +++ b/gst/gst_private.h | ||
23 | @@ -522,7 +522,7 @@ struct _GstClockEntryImpl | ||
24 | GstClockEntry entry; | ||
25 | GWeakRef clock; | ||
26 | GDestroyNotify destroy_entry; | ||
27 | - gpointer padding[19]; /* padding for allowing e.g. systemclock | ||
28 | + gpointer padding[21]; /* padding for allowing e.g. systemclock | ||
29 | * to add data in lieu of overridable | ||
30 | * virtual functions on the clock */ | ||
31 | }; | ||
32 | -- | ||
33 | 2.29.2 | ||
34 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch index c8bd58d471..96abef17b0 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 355dd938bfb2cd36d6c3c4ed59ba1dcafdc78d95 Mon Sep 17 00:00:00 2001 | 1 | From 598d108e2c438d8f2ecd3bf948fa3ebbd3681490 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> | 2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> |
3 | Date: Fri, 14 Aug 2020 16:38:26 +0100 | 3 | Date: Fri, 14 Aug 2020 16:38:26 +0100 |
4 | Subject: [PATCH 2/4] Remove unused valgrind detection | 4 | Subject: [PATCH 2/3] Remove unused valgrind detection |
5 | 5 | ||
6 | Having this just to log a debug message in case we're | 6 | Having this just to log a debug message in case we're |
7 | running inside valgrind doesn't seem very useful, and | 7 | running inside valgrind doesn't seem very useful, and |
@@ -19,7 +19,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
19 | 3 files changed, 42 deletions(-) | 19 | 3 files changed, 42 deletions(-) |
20 | 20 | ||
21 | diff --git a/gst/gst_private.h b/gst/gst_private.h | 21 | diff --git a/gst/gst_private.h b/gst/gst_private.h |
22 | index 1b0f02b..a8897e1 100644 | 22 | index eefd044d9..8252ede51 100644 |
23 | --- a/gst/gst_private.h | 23 | --- a/gst/gst_private.h |
24 | +++ b/gst/gst_private.h | 24 | +++ b/gst/gst_private.h |
25 | @@ -116,8 +116,6 @@ G_GNUC_INTERNAL gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin | 25 | @@ -116,8 +116,6 @@ G_GNUC_INTERNAL gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin |
@@ -32,10 +32,10 @@ index 1b0f02b..a8897e1 100644 | |||
32 | G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); | 32 | G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); |
33 | G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); | 33 | G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); |
34 | diff --git a/gst/gstinfo.c b/gst/gstinfo.c | 34 | diff --git a/gst/gstinfo.c b/gst/gstinfo.c |
35 | index 37987d3..15f522e 100644 | 35 | index 5d317877b..097f8b20d 100644 |
36 | --- a/gst/gstinfo.c | 36 | --- a/gst/gstinfo.c |
37 | +++ b/gst/gstinfo.c | 37 | +++ b/gst/gstinfo.c |
38 | @@ -304,36 +304,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; | 38 | @@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; |
39 | static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; | 39 | static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; |
40 | static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; | 40 | static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; |
41 | 41 | ||
@@ -72,7 +72,7 @@ index 37987d3..15f522e 100644 | |||
72 | static gchar * | 72 | static gchar * |
73 | _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token, | 73 | _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token, |
74 | guint val) | 74 | guint val) |
75 | @@ -462,9 +432,6 @@ _priv_gst_debug_init (void) | 75 | @@ -463,9 +433,6 @@ _priv_gst_debug_init (void) |
76 | _priv_GST_CAT_PROTECTION = | 76 | _priv_GST_CAT_PROTECTION = |
77 | _gst_debug_category_new ("GST_PROTECTION", 0, "protection"); | 77 | _gst_debug_category_new ("GST_PROTECTION", 0, "protection"); |
78 | 78 | ||
@@ -82,7 +82,7 @@ index 37987d3..15f522e 100644 | |||
82 | env = g_getenv ("GST_DEBUG_OPTIONS"); | 82 | env = g_getenv ("GST_DEBUG_OPTIONS"); |
83 | if (env != NULL) { | 83 | if (env != NULL) { |
84 | if (strstr (env, "full_tags") || strstr (env, "full-tags")) | 84 | if (strstr (env, "full_tags") || strstr (env, "full-tags")) |
85 | @@ -2502,12 +2469,6 @@ gst_debug_construct_win_color (guint colorinfo) | 85 | @@ -2503,12 +2470,6 @@ gst_debug_construct_win_color (guint colorinfo) |
86 | return 0; | 86 | return 0; |
87 | } | 87 | } |
88 | 88 | ||
@@ -96,7 +96,7 @@ index 37987d3..15f522e 100644 | |||
96 | _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, | 96 | _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, |
97 | const gchar * func, gint line, GObject * obj, const gchar * msg, | 97 | const gchar * func, gint line, GObject * obj, const gchar * msg, |
98 | diff --git a/meson.build b/meson.build | 98 | diff --git a/meson.build b/meson.build |
99 | index f95b4f7..143c043 100644 | 99 | index ce1921aa4..7a84d0981 100644 |
100 | --- a/meson.build | 100 | --- a/meson.build |
101 | +++ b/meson.build | 101 | +++ b/meson.build |
102 | @@ -200,7 +200,6 @@ check_headers = [ | 102 | @@ -200,7 +200,6 @@ check_headers = [ |
@@ -108,5 +108,5 @@ index f95b4f7..143c043 100644 | |||
108 | 'sys/uio.h', | 108 | 'sys/uio.h', |
109 | ] | 109 | ] |
110 | -- | 110 | -- |
111 | 2.28.0 | 111 | 2.29.2 |
112 | 112 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch index 1c0e1f8171..bf5e57249c 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 24867db22a5cc35e7643bc218e959ce56c306aca Mon Sep 17 00:00:00 2001 | 1 | From cf8077a7e3ab0ae236ebde79b7fc0b02eac658de Mon Sep 17 00:00:00 2001 |
2 | From: Carlos Rafael Giani <crg7475@mailbox.org> | 2 | From: Carlos Rafael Giani <crg7475@mailbox.org> |
3 | Date: Fri, 25 Oct 2019 00:06:26 +0200 | 3 | Date: Fri, 25 Oct 2019 00:06:26 +0200 |
4 | Subject: [PATCH 3/4] meson: Add option for installed tests | 4 | Subject: [PATCH 3/3] meson: Add option for installed tests |
5 | 5 | ||
6 | This adds an option for producing installed versions of the unit tests. | 6 | This adds an option for producing installed versions of the unit tests. |
7 | These versions don't need meson to run (only a small shell script). This | 7 | These versions don't need meson to run (only a small shell script). This |
@@ -23,7 +23,7 @@ Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> | |||
23 | 23 | ||
24 | diff --git a/build-aux/gen-installed-test-desc.py b/build-aux/gen-installed-test-desc.py | 24 | diff --git a/build-aux/gen-installed-test-desc.py b/build-aux/gen-installed-test-desc.py |
25 | new file mode 100644 | 25 | new file mode 100644 |
26 | index 0000000..69e8a0f | 26 | index 000000000..69e8a0faf |
27 | --- /dev/null | 27 | --- /dev/null |
28 | +++ b/build-aux/gen-installed-test-desc.py | 28 | +++ b/build-aux/gen-installed-test-desc.py |
29 | @@ -0,0 +1,18 @@ | 29 | @@ -0,0 +1,18 @@ |
@@ -47,7 +47,7 @@ index 0000000..69e8a0f | |||
47 | +write_template(args.output, build_template(args.test_execdir, args.testname)) | 47 | +write_template(args.output, build_template(args.test_execdir, args.testname)) |
48 | diff --git a/build-aux/gen-installed-test-shscript.py b/build-aux/gen-installed-test-shscript.py | 48 | diff --git a/build-aux/gen-installed-test-shscript.py b/build-aux/gen-installed-test-shscript.py |
49 | new file mode 100644 | 49 | new file mode 100644 |
50 | index 0000000..5da86fb | 50 | index 000000000..5da86fb37 |
51 | --- /dev/null | 51 | --- /dev/null |
52 | +++ b/build-aux/gen-installed-test-shscript.py | 52 | +++ b/build-aux/gen-installed-test-shscript.py |
53 | @@ -0,0 +1,25 @@ | 53 | @@ -0,0 +1,25 @@ |
@@ -77,7 +77,7 @@ index 0000000..5da86fb | |||
77 | +write_template(args.output, build_template(args.test_execdir, args.testname)) | 77 | +write_template(args.output, build_template(args.test_execdir, args.testname)) |
78 | +os.chmod(args.output, 0o755) | 78 | +os.chmod(args.output, 0o755) |
79 | diff --git a/meson_options.txt b/meson_options.txt | 79 | diff --git a/meson_options.txt b/meson_options.txt |
80 | index 72c3997..346c423 100644 | 80 | index 72c3997e2..346c423d4 100644 |
81 | --- a/meson_options.txt | 81 | --- a/meson_options.txt |
82 | +++ b/meson_options.txt | 82 | +++ b/meson_options.txt |
83 | @@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso | 83 | @@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso |
@@ -90,7 +90,7 @@ index 72c3997..346c423 100644 | |||
90 | # Feature options | 90 | # Feature options |
91 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') | 91 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') |
92 | diff --git a/tests/check/meson.build b/tests/check/meson.build | 92 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
93 | index 372ea41..bb0dcfa 100644 | 93 | index a617cf159..e629131c5 100644 |
94 | --- a/tests/check/meson.build | 94 | --- a/tests/check/meson.build |
95 | +++ b/tests/check/meson.build | 95 | +++ b/tests/check/meson.build |
96 | @@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false) | 96 | @@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false) |
@@ -168,7 +168,7 @@ index 372ea41..bb0dcfa 100644 | |||
168 | env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') | 168 | env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') |
169 | diff --git a/tests/files/testfile b/tests/files/testfile | 169 | diff --git a/tests/files/testfile b/tests/files/testfile |
170 | new file mode 100644 | 170 | new file mode 100644 |
171 | index 0000000..89954e0 | 171 | index 000000000..89954e0e2 |
172 | --- /dev/null | 172 | --- /dev/null |
173 | +++ b/tests/files/testfile | 173 | +++ b/tests/files/testfile |
174 | @@ -0,0 +1,80 @@ | 174 | @@ -0,0 +1,80 @@ |
@@ -253,5 +253,5 @@ index 0000000..89954e0 | |||
253 | +................................................................................ | 253 | +................................................................................ |
254 | +................................................................................ | 254 | +................................................................................ |
255 | -- | 255 | -- |
256 | 2.28.0 | 256 | 2.29.2 |
257 | 257 | ||