diff options
author | Alexander Kanavin <alex@linutronix.de> | 2024-05-27 20:12:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-30 09:04:14 +0100 |
commit | 46a8430b9efe2db1862d5bfeb66dbd64d975bb8b (patch) | |
tree | a368972be0b01be89e2c5ce1dc116487ed27512b /meta/recipes-multimedia/gstreamer/gstreamer1.0 | |
parent | cd83165cf4be7a04cfa852fd23072bbc7d576d5b (diff) | |
download | poky-46a8430b9efe2db1862d5bfeb66dbd64d975bb8b.tar.gz |
gstreamer1.0: update 1.22.11 -> 1.24.3
Drop gstreamer1.0-omx recipe as upstream has removed it:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4976
kate plugin dropped from bad.
amrnb/amrwb moved from ugly to good.
(From OE-Core rev: 9c21815339afb85f558d8a1e0365614320cdc7d7)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0')
4 files changed, 19 insertions, 23 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 0d839bd6c8..a190370c16 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 5372cd5bf2a9dd247b9c5fc6e4fe248046dbb085 Mon Sep 17 00:00:00 2001 | 1 | From 381f50a27766c425af36a7203061716497e6603f 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 |
@@ -6,16 +6,15 @@ Subject: [PATCH] tests: respect the idententaion used in meson | |||
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 | |||
10 | --- | 9 | --- |
11 | tests/check/meson.build | 10 +++++----- | 10 | tests/check/meson.build | 10 +++++----- |
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | 11 | 1 file changed, 5 insertions(+), 5 deletions(-) |
13 | 12 | ||
14 | diff --git a/tests/check/meson.build b/tests/check/meson.build | 13 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
15 | index 9787b0a..16caac7 100644 | 14 | index 6540279..e9501fe 100644 |
16 | --- a/tests/check/meson.build | 15 | --- a/tests/check/meson.build |
17 | +++ b/tests/check/meson.build | 16 | +++ b/tests/check/meson.build |
18 | @@ -145,11 +145,11 @@ foreach t : core_tests | 17 | @@ -146,11 +146,11 @@ foreach t : core_tests |
19 | 18 | ||
20 | if not skip_test | 19 | if not skip_test |
21 | exe = executable(test_name, fname, | 20 | exe = executable(test_name, fname, |
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 64717e66c3..a990940cc6 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 27e977d03b0f7c1d0bf19621ef0cec0585410e7b Mon Sep 17 00:00:00 2001 | 1 | From 31dea17a1d5de0003719a875a1089df43a50219a 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 |
@@ -10,7 +10,6 @@ This will provide to run the tests using the gnome-desktop-testing [1] | |||
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 | |||
14 | --- | 13 | --- |
15 | meson.build | 4 ++++ | 14 | meson.build | 4 ++++ |
16 | meson_options.txt | 1 + | 15 | meson_options.txt | 1 + |
@@ -20,10 +19,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
20 | create mode 100644 tests/check/template.test.in | 19 | create mode 100644 tests/check/template.test.in |
21 | 20 | ||
22 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
23 | index 60c7bec..f7650b1 100644 | 22 | index efcf189..c97d9a8 100644 |
24 | --- a/meson.build | 23 | --- a/meson.build |
25 | +++ b/meson.build | 24 | +++ b/meson.build |
26 | @@ -606,6 +606,10 @@ if bashcomp_dep.found() | 25 | @@ -624,6 +624,10 @@ if bashcomp_dep.found() |
27 | endif | 26 | endif |
28 | endif | 27 | endif |
29 | 28 | ||
@@ -35,10 +34,10 @@ index 60c7bec..f7650b1 100644 | |||
35 | 34 | ||
36 | pkgconfig = import('pkgconfig') | 35 | pkgconfig = import('pkgconfig') |
37 | diff --git a/meson_options.txt b/meson_options.txt | 36 | diff --git a/meson_options.txt b/meson_options.txt |
38 | index 7363bdb..a34ba37 100644 | 37 | index 340fb58..5b87f68 100644 |
39 | --- a/meson_options.txt | 38 | --- a/meson_options.txt |
40 | +++ b/meson_options.txt | 39 | +++ b/meson_options.txt |
41 | @@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso | 40 | @@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso |
42 | option('memory-alignment', type: 'combo', | 41 | option('memory-alignment', type: 'combo', |
43 | choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], | 42 | choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], |
44 | value: 'malloc') | 43 | value: 'malloc') |
@@ -47,14 +46,14 @@ index 7363bdb..a34ba37 100644 | |||
47 | # Feature options | 46 | # Feature options |
48 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') | 47 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') |
49 | diff --git a/tests/check/meson.build b/tests/check/meson.build | 48 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
50 | index 16caac7..f2d400f 100644 | 49 | index e9501fe..08f8fd8 100644 |
51 | --- a/tests/check/meson.build | 50 | --- a/tests/check/meson.build |
52 | +++ b/tests/check/meson.build | 51 | +++ b/tests/check/meson.build |
53 | @@ -124,10 +124,16 @@ test_defines = [ | 52 | @@ -125,10 +125,16 @@ test_defines = [ |
54 | '-UG_DISABLE_ASSERT', | 53 | '-UG_DISABLE_ASSERT', |
55 | '-UG_DISABLE_CAST_CHECKS', | 54 | '-UG_DISABLE_CAST_CHECKS', |
56 | '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', | 55 | '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', |
57 | - '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"', | 56 | - '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"', |
58 | '-DGST_DISABLE_DEPRECATED', | 57 | '-DGST_DISABLE_DEPRECATED', |
59 | ] | 58 | ] |
60 | 59 | ||
@@ -68,7 +67,7 @@ index 16caac7..f2d400f 100644 | |||
68 | # sanity checking | 67 | # sanity checking |
69 | if get_option('check').disabled() | 68 | if get_option('check').disabled() |
70 | if get_option('tests').enabled() | 69 | if get_option('tests').enabled() |
71 | @@ -150,6 +156,8 @@ foreach t : core_tests | 70 | @@ -151,6 +157,8 @@ foreach t : core_tests |
72 | include_directories : [configinc], | 71 | include_directories : [configinc], |
73 | link_with : link_with_libs, | 72 | link_with : link_with_libs, |
74 | dependencies : gst_deps + test_deps, | 73 | dependencies : gst_deps + test_deps, |
@@ -77,7 +76,7 @@ index 16caac7..f2d400f 100644 | |||
77 | ) | 76 | ) |
78 | 77 | ||
79 | env = environment() | 78 | env = environment() |
80 | @@ -161,6 +169,18 @@ foreach t : core_tests | 79 | @@ -162,6 +170,18 @@ foreach t : core_tests |
81 | env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') | 80 | env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') |
82 | env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') | 81 | env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') |
83 | 82 | ||
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 0fd830f150..27623bf96b 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,4 +1,4 @@ | |||
1 | From 7041bc5adf9501beb1428d8bbae6b351a6bf07f9 Mon Sep 17 00:00:00 2001 | 1 | From 453865e8938c5f50f14409b67246bbbd801fa44d 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] tests: use a dictionaries for environment | 4 | Subject: [PATCH] tests: use a dictionaries for environment |
@@ -9,16 +9,15 @@ 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 | |||
13 | --- | 12 | --- |
14 | tests/check/meson.build | 21 +++++++++++++-------- | 13 | tests/check/meson.build | 21 +++++++++++++-------- |
15 | 1 file changed, 13 insertions(+), 8 deletions(-) | 14 | 1 file changed, 13 insertions(+), 8 deletions(-) |
16 | 15 | ||
17 | diff --git a/tests/check/meson.build b/tests/check/meson.build | 16 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
18 | index f2d400f..50dff7f 100644 | 17 | index 08f8fd8..330abaa 100644 |
19 | --- a/tests/check/meson.build | 18 | --- a/tests/check/meson.build |
20 | +++ b/tests/check/meson.build | 19 | +++ b/tests/check/meson.build |
21 | @@ -160,14 +160,19 @@ foreach t : core_tests | 20 | @@ -161,14 +161,19 @@ foreach t : core_tests |
22 | install: installed_tests_enabled, | 21 | install: installed_tests_enabled, |
23 | ) | 22 | ) |
24 | 23 | ||
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 5689dc9fbb..97b056072d 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,4 +1,4 @@ | |||
1 | From 1b1d1ce4227b6bea7c7def5dac4a663486e070c2 Mon Sep 17 00:00:00 2001 | 1 | From 506ff13a044439a170f770b6663a64c942ae0a05 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] tests: add helper script to run the installed_tests | 4 | Subject: [PATCH] tests: add helper script to run the installed_tests |
@@ -10,7 +10,6 @@ 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 | |||
14 | --- | 13 | --- |
15 | tests/check/meson.build | 17 +++++++++++++++++ | 14 | tests/check/meson.build | 17 +++++++++++++++++ |
16 | tests/check/template.sh.in | 9 +++++++++ | 15 | tests/check/template.sh.in | 9 +++++++++ |
@@ -19,10 +18,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
19 | create mode 100755 tests/check/template.sh.in | 18 | create mode 100755 tests/check/template.sh.in |
20 | 19 | ||
21 | diff --git a/tests/check/meson.build b/tests/check/meson.build | 20 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
22 | index 50dff7f..2b9e979 100644 | 21 | index 330abaa..5d383b1 100644 |
23 | --- a/tests/check/meson.build | 22 | --- a/tests/check/meson.build |
24 | +++ b/tests/check/meson.build | 23 | +++ b/tests/check/meson.build |
25 | @@ -184,6 +184,23 @@ foreach t : core_tests | 24 | @@ -185,6 +185,23 @@ foreach t : core_tests |
26 | install_dir: installed_tests_metadir, | 25 | install_dir: installed_tests_metadir, |
27 | configuration: test_conf | 26 | configuration: test_conf |
28 | ) | 27 | ) |