diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0')
2 files changed, 38 insertions, 42 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch index 312c04fb..1b9278db 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +++ b/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 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index d18c19c3..568e38cb 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17 00:00:00 2001 | 1 | From 08b1aaff972a7f6349373fc1ad4cc23081adb52c 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 2/4] tests: add support for install the tests | 4 | Subject: [PATCH] tests: add support for install the tests |
5 | 5 | ||
6 | This will provide to run the tests using the gnome-desktop-testing [1] | 6 | This will provide to run the tests using the gnome-desktop-testing [1] |
7 | 7 | ||
@@ -10,19 +10,20 @@ 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 | |||
13 | --- | 14 | --- |
14 | subprojects/gstreamer/meson.build | 4 ++++ | 15 | meson.build | 4 ++++ |
15 | subprojects/gstreamer/meson_options.txt | 1 + | 16 | meson_options.txt | 1 + |
16 | subprojects/gstreamer/tests/check/meson.build | 22 ++++++++++++++++++- | 17 | tests/check/meson.build | 22 +++++++++++++++++++++- |
17 | .../gstreamer/tests/check/template.test.in | 3 +++ | 18 | tests/check/template.test.in | 3 +++ |
18 | 4 files changed, 29 insertions(+), 1 deletion(-) | 19 | 4 files changed, 29 insertions(+), 1 deletion(-) |
19 | create mode 100644 subprojects/gstreamer/tests/check/template.test.in | 20 | create mode 100644 tests/check/template.test.in |
20 | 21 | ||
21 | diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build | 22 | diff --git a/meson.build b/meson.build |
22 | index d20fe0040f..b595d8f990 100644 | 23 | index f9f591d..3906fb3 100644 |
23 | --- a/subprojects/gstreamer/meson.build | 24 | --- a/meson.build |
24 | +++ b/subprojects/gstreamer/meson.build | 25 | +++ b/meson.build |
25 | @@ -562,6 +562,10 @@ if bashcomp_dep.found() | 26 | @@ -606,6 +606,10 @@ if bashcomp_dep.found() |
26 | endif | 27 | endif |
27 | endif | 28 | endif |
28 | 29 | ||
@@ -33,10 +34,10 @@ index d20fe0040f..b595d8f990 100644 | |||
33 | plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') | 34 | plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') |
34 | 35 | ||
35 | pkgconfig = import('pkgconfig') | 36 | pkgconfig = import('pkgconfig') |
36 | diff --git a/subprojects/gstreamer/meson_options.txt b/subprojects/gstreamer/meson_options.txt | 37 | diff --git a/meson_options.txt b/meson_options.txt |
37 | index 7363bdb7a1..a34ba37dad 100644 | 38 | index 7363bdb..a34ba37 100644 |
38 | --- a/subprojects/gstreamer/meson_options.txt | 39 | --- a/meson_options.txt |
39 | +++ b/subprojects/gstreamer/meson_options.txt | 40 | +++ b/meson_options.txt |
40 | @@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso | 41 | @@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso |
41 | option('memory-alignment', type: 'combo', | 42 | option('memory-alignment', type: 'combo', |
42 | choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], | 43 | choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], |
@@ -45,10 +46,10 @@ index 7363bdb7a1..a34ba37dad 100644 | |||
45 | 46 | ||
46 | # Feature options | 47 | # Feature options |
47 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') | 48 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') |
48 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 49 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
49 | index 506606684d..00a138a568 100644 | 50 | index 16caac7..f2d400f 100644 |
50 | --- a/subprojects/gstreamer/tests/check/meson.build | 51 | --- a/tests/check/meson.build |
51 | +++ b/subprojects/gstreamer/tests/check/meson.build | 52 | +++ b/tests/check/meson.build |
52 | @@ -124,10 +124,16 @@ test_defines = [ | 53 | @@ -124,10 +124,16 @@ test_defines = [ |
53 | '-UG_DISABLE_ASSERT', | 54 | '-UG_DISABLE_ASSERT', |
54 | '-UG_DISABLE_CAST_CHECKS', | 55 | '-UG_DISABLE_CAST_CHECKS', |
@@ -67,16 +68,16 @@ index 506606684d..00a138a568 100644 | |||
67 | # sanity checking | 68 | # sanity checking |
68 | if get_option('check').disabled() | 69 | if get_option('check').disabled() |
69 | if get_option('tests').enabled() | 70 | if get_option('tests').enabled() |
70 | @@ -151,6 +157,8 @@ foreach t : core_tests | 71 | @@ -150,6 +156,8 @@ foreach t : core_tests |
71 | include_directories : [configinc], | 72 | include_directories : [configinc], |
72 | link_with : link_with_libs, | 73 | link_with : link_with_libs, |
73 | dependencies : test_deps + glib_deps + gst_deps, | 74 | dependencies : gst_deps + test_deps, |
74 | + install_dir: installed_tests_execdir, | 75 | + install_dir: installed_tests_execdir, |
75 | + install: installed_tests_enabled, | 76 | + install: installed_tests_enabled, |
76 | ) | 77 | ) |
77 | 78 | ||
78 | env = environment() | 79 | env = environment() |
79 | @@ -162,6 +170,18 @@ foreach t : core_tests | 80 | @@ -161,6 +169,18 @@ foreach t : core_tests |
80 | env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') | 81 | env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') |
81 | env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') | 82 | env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') |
82 | 83 | ||
@@ -95,15 +96,12 @@ index 506606684d..00a138a568 100644 | |||
95 | test(test_name, exe, env: env, timeout : 3 * 60) | 96 | test(test_name, exe, env: env, timeout : 3 * 60) |
96 | endif | 97 | endif |
97 | endforeach | 98 | endforeach |
98 | diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in | 99 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in |
99 | new file mode 100644 | 100 | new file mode 100644 |
100 | index 0000000000..f701627f87 | 101 | index 0000000..f701627 |
101 | --- /dev/null | 102 | --- /dev/null |
102 | +++ b/subprojects/gstreamer/tests/check/template.test.in | 103 | +++ b/tests/check/template.test.in |
103 | @@ -0,0 +1,3 @@ | 104 | @@ -0,0 +1,3 @@ |
104 | +[Test] | 105 | +[Test] |
105 | +Type=session | 106 | +Type=session |
106 | +Exec=@installed_tests_dir@/@program@ | 107 | +Exec=@installed_tests_dir@/@program@ |
107 | -- | ||
108 | 2.33.1 | ||
109 | |||