diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-02-10 07:42:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-15 10:21:34 +0000 |
commit | 4e07f56dced0b06d2cb60530e3989f656eede2cd (patch) | |
tree | bca1ab707f9ea795417ffa5052e59bf0f9aaf939 /meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch | |
parent | 64e6bfbff69a847202192d739e00ab1e141665bd (diff) | |
download | poky-4e07f56dced0b06d2cb60530e3989f656eede2cd.tar.gz |
gstreamer1.0: update 1.20.5 -> 1.22.0
Drop xingmux license snippet from plugins-ugly as it moved to plugins-good;
the license was LGPL in any case:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/d132592423be64ec18a223b67810ac89f391277e/subprojects/gst-plugins-good/tests/check/elements/xingmux.c
videoconvert/videoscale plgins were merged into one.
(From OE-Core rev: fb2d28e0315ece6180c87c7047587673024a09f7)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch index 312c04fbfd..1b9278db04 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch | |||
@@ -1,20 +1,21 @@ | |||
1 | From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17 00:00:00 2001 | 1 | From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 | 3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 |
4 | Subject: [PATCH 1/4] tests: respect the idententaion used in meson | 4 | Subject: [PATCH] tests: respect the idententaion used in meson |
5 | 5 | ||
6 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | 6 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] |
7 | 7 | ||
8 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 8 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | subprojects/gstreamer/tests/check/meson.build | 10 +++++----- | 11 | tests/check/meson.build | 10 +++++----- |
11 | 1 file changed, 5 insertions(+), 5 deletions(-) | 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
12 | 13 | ||
13 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 14 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
14 | index 9c4228b6e4..506606684d 100644 | 15 | index 9787b0a..16caac7 100644 |
15 | --- a/subprojects/gstreamer/tests/check/meson.build | 16 | --- a/tests/check/meson.build |
16 | +++ b/subprojects/gstreamer/tests/check/meson.build | 17 | +++ b/tests/check/meson.build |
17 | @@ -146,11 +146,11 @@ foreach t : core_tests | 18 | @@ -145,11 +145,11 @@ foreach t : core_tests |
18 | 19 | ||
19 | if not skip_test | 20 | if not skip_test |
20 | exe = executable(test_name, fname, | 21 | exe = executable(test_name, fname, |
@@ -22,15 +23,12 @@ index 9c4228b6e4..506606684d 100644 | |||
22 | - cpp_args : gst_c_args + test_defines, | 23 | - cpp_args : gst_c_args + test_defines, |
23 | - include_directories : [configinc], | 24 | - include_directories : [configinc], |
24 | - link_with : link_with_libs, | 25 | - link_with : link_with_libs, |
25 | - dependencies : test_deps + glib_deps + gst_deps, | 26 | - dependencies : gst_deps + test_deps, |
26 | + c_args : gst_c_args + test_defines, | 27 | + c_args : gst_c_args + test_defines, |
27 | + cpp_args : gst_c_args + test_defines, | 28 | + cpp_args : gst_c_args + test_defines, |
28 | + include_directories : [configinc], | 29 | + include_directories : [configinc], |
29 | + link_with : link_with_libs, | 30 | + link_with : link_with_libs, |
30 | + dependencies : test_deps + glib_deps + gst_deps, | 31 | + dependencies : gst_deps + test_deps, |
31 | ) | 32 | ) |
32 | 33 | ||
33 | env = environment() | 34 | env = environment() |
34 | -- | ||
35 | 2.33.1 | ||
36 | |||