diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2024-02-16 19:43:52 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-17 18:19:19 +0000 |
commit | a277d1f7a0dc716b497fd855f20cbd6a7d488f8b (patch) | |
tree | 46c0167ec29f815d52e0ff9efa6ab2afc48fd72f /meta/recipes-multimedia/gstreamer/gstreamer1.0 | |
parent | ee3541ca8a9cfd2e2fc24e7fa042716f78efff91 (diff) | |
download | poky-a277d1f7a0dc716b497fd855f20cbd6a7d488f8b.tar.gz |
gstreamer1.0: upgrade 1.22.9 -> 1.22.10
(From OE-Core rev: d0a546e21760004897f814981445433a5d5e69a6)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0')
4 files changed, 31 insertions, 35 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 1b9278db04..0d839bd6c8 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,4 +1,4 @@ | |||
1 | From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001 | 1 | From 5372cd5bf2a9dd247b9c5fc6e4fe248046dbb085 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] tests: respect the idententaion used in meson | 4 | Subject: [PATCH] tests: respect the idententaion used in meson |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index 568e38cbf1..64717e66c3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001 | 1 | From 27e977d03b0f7c1d0bf19621ef0cec0585410e7b 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] tests: add support for install the tests | 4 | Subject: [PATCH] tests: add support for install the tests |
@@ -20,7 +20,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
20 | create mode 100644 tests/check/template.test.in | 20 | create mode 100644 tests/check/template.test.in |
21 | 21 | ||
22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
23 | index f9f591d..3906fb3 100644 | 23 | index 60c7bec..f7650b1 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -606,6 +606,10 @@ if bashcomp_dep.found() | 26 | @@ -606,6 +606,10 @@ if bashcomp_dep.found() |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch index 10a6dcc619..0fd830f150 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001 | 1 | From 7041bc5adf9501beb1428d8bbae6b351a6bf07f9 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: Sat, 24 Apr 2021 10:34:47 +0100 | 3 | Date: Sat, 24 Apr 2021 10:34:47 +0100 |
4 | Subject: [PATCH 3/4] tests: use a dictionaries for environment | 4 | Subject: [PATCH] tests: use a dictionaries for environment |
5 | 5 | ||
6 | meson environment() can't be passed to configure_file and it is needed for installed_tests, | 6 | meson environment() can't be passed to configure_file and it is needed for installed_tests, |
7 | use a dictionary as this is simplest solution to install the environment. | 7 | use a dictionary as this is simplest solution to install the environment. |
@@ -9,15 +9,16 @@ use a dictionary as this is simplest solution to install the environment. | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | 9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] |
10 | 10 | ||
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++------- | 14 | tests/check/meson.build | 21 +++++++++++++-------- |
14 | 1 file changed, 13 insertions(+), 8 deletions(-) | 15 | 1 file changed, 13 insertions(+), 8 deletions(-) |
15 | 16 | ||
16 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 17 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
17 | index 00a138a568..48ec2532f8 100644 | 18 | index f2d400f..50dff7f 100644 |
18 | --- a/subprojects/gstreamer/tests/check/meson.build | 19 | --- a/tests/check/meson.build |
19 | +++ b/subprojects/gstreamer/tests/check/meson.build | 20 | +++ b/tests/check/meson.build |
20 | @@ -161,14 +161,19 @@ foreach t : core_tests | 21 | @@ -160,14 +160,19 @@ foreach t : core_tests |
21 | install: installed_tests_enabled, | 22 | install: installed_tests_enabled, |
22 | ) | 23 | ) |
23 | 24 | ||
@@ -45,6 +46,3 @@ index 00a138a568..48ec2532f8 100644 | |||
45 | 46 | ||
46 | if installed_tests_enabled | 47 | if installed_tests_enabled |
47 | test_conf = configuration_data() | 48 | test_conf = configuration_data() |
48 | -- | ||
49 | 2.33.1 | ||
50 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch index efa004f8ce..5689dc9fbb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001 | 1 | From 1b1d1ce4227b6bea7c7def5dac4a663486e070c2 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, 2 May 2021 01:58:01 +0100 | 3 | Date: Sun, 2 May 2021 01:58:01 +0100 |
4 | Subject: [PATCH 4/4] tests: add helper script to run the installed_tests | 4 | Subject: [PATCH] tests: add helper script to run the installed_tests |
5 | 5 | ||
6 | - this is a bash script that will run the installed_tests | 6 | - this is a bash script that will run the installed_tests |
7 | with some of the environment variables used in the meson | 7 | with some of the environment variables used in the meson |
@@ -10,18 +10,19 @@ testing framework. | |||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | 10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] |
11 | 11 | ||
12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | subprojects/gstreamer/tests/check/meson.build | 17 +++++++++++++++++ | 15 | tests/check/meson.build | 17 +++++++++++++++++ |
15 | .../gstreamer/tests/check/template.sh.in | 9 +++++++++ | 16 | tests/check/template.sh.in | 9 +++++++++ |
16 | .../gstreamer/tests/check/template.test.in | 2 +- | 17 | tests/check/template.test.in | 2 +- |
17 | 3 files changed, 27 insertions(+), 1 deletion(-) | 18 | 3 files changed, 27 insertions(+), 1 deletion(-) |
18 | create mode 100755 subprojects/gstreamer/tests/check/template.sh.in | 19 | create mode 100755 tests/check/template.sh.in |
19 | 20 | ||
20 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 21 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
21 | index 48ec2532f8..7dc4990d4e 100644 | 22 | index 50dff7f..2b9e979 100644 |
22 | --- a/subprojects/gstreamer/tests/check/meson.build | 23 | --- a/tests/check/meson.build |
23 | +++ b/subprojects/gstreamer/tests/check/meson.build | 24 | +++ b/tests/check/meson.build |
24 | @@ -185,6 +185,23 @@ foreach t : core_tests | 25 | @@ -184,6 +184,23 @@ foreach t : core_tests |
25 | install_dir: installed_tests_metadir, | 26 | install_dir: installed_tests_metadir, |
26 | configuration: test_conf | 27 | configuration: test_conf |
27 | ) | 28 | ) |
@@ -45,11 +46,11 @@ index 48ec2532f8..7dc4990d4e 100644 | |||
45 | endif | 46 | endif |
46 | 47 | ||
47 | test(test_name, exe, env: env, timeout : 3 * 60) | 48 | test(test_name, exe, env: env, timeout : 3 * 60) |
48 | diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in | 49 | diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in |
49 | new file mode 100755 | 50 | new file mode 100755 |
50 | index 0000000000..cf7d31b0ea | 51 | index 0000000..cf7d31b |
51 | --- /dev/null | 52 | --- /dev/null |
52 | +++ b/subprojects/gstreamer/tests/check/template.sh.in | 53 | +++ b/tests/check/template.sh.in |
53 | @@ -0,0 +1,9 @@ | 54 | @@ -0,0 +1,9 @@ |
54 | +#!/bin/sh | 55 | +#!/bin/sh |
55 | + | 56 | + |
@@ -60,15 +61,12 @@ index 0000000000..cf7d31b0ea | |||
60 | +GST_REGISTRY=@GST_REGISTRY@ | 61 | +GST_REGISTRY=@GST_REGISTRY@ |
61 | +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" | 62 | +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" |
62 | +exec @TEST@ | 63 | +exec @TEST@ |
63 | diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in | 64 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in |
64 | index f701627f87..b74ef6ad73 100644 | 65 | index f701627..b74ef6a 100644 |
65 | --- a/subprojects/gstreamer/tests/check/template.test.in | 66 | --- a/tests/check/template.test.in |
66 | +++ b/subprojects/gstreamer/tests/check/template.test.in | 67 | +++ b/tests/check/template.test.in |
67 | @@ -1,3 +1,3 @@ | 68 | @@ -1,3 +1,3 @@ |
68 | [Test] | 69 | [Test] |
69 | Type=session | 70 | Type=session |
70 | -Exec=@installed_tests_dir@/@program@ | 71 | -Exec=@installed_tests_dir@/@program@ |
71 | +Exec=@installed_tests_dir@/@program@.sh | 72 | +Exec=@installed_tests_dir@/@program@.sh |
72 | -- | ||
73 | 2.33.1 | ||
74 | |||