From 7a03a4b51eb54f52897f00a77fdfb96c565ea7a0 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Fri, 26 Jul 2024 17:55:45 -0300 Subject: gstreamer: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Upgrade gstreamer and all related recipes to 1.24.0, syncing with meta-imx layer. Signed-off-by: Hiago De Franco (cherry picked from commit d1c6878cf25575f98ab12c5e685a0728afa4424a) --- ...2-tests-add-support-for-install-the-tests.patch | 34 ++++--- ...-tests-use-a-dictionaries-for-environment.patch | 21 ++-- ...-helper-script-to-run-the-installed_tests.patch | 36 +++---- ...e-gstbin-test_watch_for_state_change-test.patch | 107 --------------------- 4 files changed, 47 insertions(+), 151 deletions(-) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch (limited to 'recipes-multimedia/gstreamer/gstreamer1.0') 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 568e38cbf..456f07626 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,4 +1,4 @@ -From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001 +From 330e15374bb30ac29ee72c4b3de79c17b1157112 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 11 Apr 2021 19:48:13 +0100 Subject: [PATCH] tests: add support for install the tests @@ -14,16 +14,16 @@ Signed-off-by: Jose Quaresma --- meson.build | 4 ++++ meson_options.txt | 1 + - tests/check/meson.build | 22 +++++++++++++++++++++- + tests/check/meson.build | 21 ++++++++++++++++++++- tests/check/template.test.in | 3 +++ - 4 files changed, 29 insertions(+), 1 deletion(-) + 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 tests/check/template.test.in diff --git a/meson.build b/meson.build -index f9f591d..3906fb3 100644 +index 540d6d290e10..0267f22a79ea 100644 --- a/meson.build +++ b/meson.build -@@ -606,6 +606,10 @@ if bashcomp_dep.found() +@@ -624,6 +624,10 @@ if bashcomp_dep.found() endif endif @@ -35,10 +35,10 @@ index f9f591d..3906fb3 100644 pkgconfig = import('pkgconfig') diff --git a/meson_options.txt b/meson_options.txt -index 7363bdb..a34ba37 100644 +index 340fb5801d02..5b87f68e8d7f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso +@@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso option('memory-alignment', type: 'combo', choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], value: 'malloc') @@ -47,14 +47,14 @@ index 7363bdb..a34ba37 100644 # Feature options option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') diff --git a/tests/check/meson.build b/tests/check/meson.build -index 16caac7..f2d400f 100644 +index e9501feb2af5..fd5a99611e3d 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build -@@ -124,10 +124,16 @@ test_defines = [ +@@ -125,10 +125,16 @@ test_defines = [ '-UG_DISABLE_ASSERT', '-UG_DISABLE_CAST_CHECKS', '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', -- '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"', +- '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"', '-DGST_DISABLE_DEPRECATED', ] @@ -68,7 +68,7 @@ index 16caac7..f2d400f 100644 # sanity checking if get_option('check').disabled() if get_option('tests').enabled() -@@ -150,6 +156,8 @@ foreach t : core_tests +@@ -151,6 +157,8 @@ foreach t : core_tests include_directories : [configinc], link_with : link_with_libs, dependencies : gst_deps + test_deps, @@ -77,10 +77,10 @@ index 16caac7..f2d400f 100644 ) env = environment() -@@ -161,6 +169,18 @@ foreach t : core_tests +@@ -161,6 +169,17 @@ foreach t : core_tests + env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') - + if installed_tests_enabled + test_conf = configuration_data() + test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) @@ -92,16 +92,18 @@ index 16caac7..f2d400f 100644 + configuration: test_conf + ) + endif -+ + test(test_name, exe, env: env, timeout : 3 * 60) endif - endforeach diff --git a/tests/check/template.test.in b/tests/check/template.test.in new file mode 100644 -index 0000000..f701627 +index 000000000000..f701627f87a6 --- /dev/null +++ b/tests/check/template.test.in @@ -0,0 +1,3 @@ +[Test] +Type=session +Exec=@installed_tests_dir@/@program@ +-- +2.39.2 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch index 10a6dcc61..83f3870c4 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch @@ -1,4 +1,4 @@ -From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001 +From 1f13b802bdb1c1e414c70f770dc164c80e0dcd57 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 24 Apr 2021 10:34:47 +0100 Subject: [PATCH 3/4] tests: use a dictionaries for environment @@ -10,14 +10,14 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/- Signed-off-by: Jose Quaresma --- - subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++------- - 1 file changed, 13 insertions(+), 8 deletions(-) + tests/check/meson.build | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) -diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build -index 00a138a568..48ec2532f8 100644 ---- a/subprojects/gstreamer/tests/check/meson.build -+++ b/subprojects/gstreamer/tests/check/meson.build -@@ -161,14 +161,19 @@ foreach t : core_tests +diff --git a/tests/check/meson.build b/tests/check/meson.build +index fd5a99611e3d..330abaaeadd5 100644 +--- a/tests/check/meson.build ++++ b/tests/check/meson.build +@@ -161,14 +161,20 @@ foreach t : core_tests install: installed_tests_enabled, ) @@ -42,9 +42,10 @@ index 00a138a568..48ec2532f8 100644 + 'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner', + 'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer', + } - ++ if installed_tests_enabled test_conf = configuration_data() + test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) -- -2.33.1 +2.39.2 diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch index efa004f8c..0a312389e 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch @@ -1,4 +1,4 @@ -From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001 +From 616c489d4ff1e7ed878bc3760180ba994fbd1974 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 2 May 2021 01:58:01 +0100 Subject: [PATCH 4/4] tests: add helper script to run the installed_tests @@ -11,16 +11,16 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/- Signed-off-by: Jose Quaresma --- - subprojects/gstreamer/tests/check/meson.build | 17 +++++++++++++++++ - .../gstreamer/tests/check/template.sh.in | 9 +++++++++ - .../gstreamer/tests/check/template.test.in | 2 +- + tests/check/meson.build | 17 +++++++++++++++++ + tests/check/template.sh.in | 9 +++++++++ + tests/check/template.test.in | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) - create mode 100755 subprojects/gstreamer/tests/check/template.sh.in + create mode 100644 tests/check/template.sh.in -diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build -index 48ec2532f8..7dc4990d4e 100644 ---- a/subprojects/gstreamer/tests/check/meson.build -+++ b/subprojects/gstreamer/tests/check/meson.build +diff --git a/tests/check/meson.build b/tests/check/meson.build +index 330abaaeadd5..5d383b14dc29 100644 +--- a/tests/check/meson.build ++++ b/tests/check/meson.build @@ -185,6 +185,23 @@ foreach t : core_tests install_dir: installed_tests_metadir, configuration: test_conf @@ -45,11 +45,11 @@ index 48ec2532f8..7dc4990d4e 100644 endif test(test_name, exe, env: env, timeout : 3 * 60) -diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in -new file mode 100755 -index 0000000000..cf7d31b0ea +diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in +new file mode 100644 +index 000000000000..cf7d31b0ea5f --- /dev/null -+++ b/subprojects/gstreamer/tests/check/template.sh.in ++++ b/tests/check/template.sh.in @@ -0,0 +1,9 @@ +#!/bin/sh + @@ -60,15 +60,15 @@ index 0000000000..cf7d31b0ea +GST_REGISTRY=@GST_REGISTRY@ +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" +exec @TEST@ -diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in -index f701627f87..b74ef6ad73 100644 ---- a/subprojects/gstreamer/tests/check/template.test.in -+++ b/subprojects/gstreamer/tests/check/template.test.in +diff --git a/tests/check/template.test.in b/tests/check/template.test.in +index f701627f87a6..b74ef6ad732a 100644 +--- a/tests/check/template.test.in ++++ b/tests/check/template.test.in @@ -1,3 +1,3 @@ [Test] Type=session -Exec=@installed_tests_dir@/@program@ +Exec=@installed_tests_dir@/@program@.sh -- -2.33.1 +2.39.2 diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch deleted file mode 100644 index f51df6d20..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch +++ /dev/null @@ -1,107 +0,0 @@ -From b935abba3d8fa3ea1ce384c08e650afd8c20b78a Mon Sep 17 00:00:00 2001 -From: Claudius Heine -Date: Wed, 2 Feb 2022 13:47:02 +0100 -Subject: [PATCH] tests: remove gstbin:test_watch_for_state_change testcase - -This testcase seems to be flaky, and upstream marked it as such: -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778 - -This patch removes the testcase to avoid it interfering with out ptest. - -Signed-off-by: Claudius Heine - -Upstream-Status: Inappropriate [needs proper upstream fix] ---- - tests/check/gst/gstbin.c | 69 ------------------- - 1 file changed, 69 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index e366d5fe20..ac29d81474 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -691,74 +691,6 @@ GST_START_TEST (test_message_state_changed_children) - - GST_END_TEST; - --GST_START_TEST (test_watch_for_state_change) --{ -- GstElement *src, *sink, *bin; -- GstBus *bus; -- GstStateChangeReturn ret; -- -- bin = gst_element_factory_make ("bin", NULL); -- fail_unless (bin != NULL, "Could not create bin"); -- -- bus = g_object_new (gst_bus_get_type (), NULL); -- gst_object_ref_sink (bus); -- gst_element_set_bus (GST_ELEMENT_CAST (bin), bus); -- -- src = gst_element_factory_make ("fakesrc", NULL); -- fail_if (src == NULL, "Could not create fakesrc"); -- sink = gst_element_factory_make ("fakesink", NULL); -- fail_if (sink == NULL, "Could not create fakesink"); -- -- gst_bin_add (GST_BIN (bin), sink); -- gst_bin_add (GST_BIN (bin), src); -- -- fail_unless (gst_element_link (src, sink), "could not link src and sink"); -- -- /* change state, spawning two times three messages */ -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); -- fail_unless (ret == GST_STATE_CHANGE_ASYNC); -- ret = -- gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, -- GST_CLOCK_TIME_NONE); -- fail_unless (ret == GST_STATE_CHANGE_SUCCESS); -- -- pop_state_changed (bus, 6); -- pop_async_done (bus); -- pop_latency (bus); -- -- fail_unless (gst_bus_have_pending (bus) == FALSE, -- "Unexpected messages on bus"); -- -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); -- fail_unless (ret == GST_STATE_CHANGE_SUCCESS); -- -- pop_state_changed (bus, 3); -- -- /* this one might return either SUCCESS or ASYNC, likely SUCCESS */ -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); -- gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE); -- -- pop_state_changed (bus, 3); -- if (ret == GST_STATE_CHANGE_ASYNC) { -- pop_async_done (bus); -- pop_latency (bus); -- } -- -- fail_unless (gst_bus_have_pending (bus) == FALSE, -- "Unexpected messages on bus"); -- -- gst_bus_set_flushing (bus, TRUE); -- -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL); -- fail_unless (ret == GST_STATE_CHANGE_SUCCESS); -- -- /* clean up */ -- gst_object_unref (bus); -- gst_object_unref (bin); --} -- --GST_END_TEST; -- - GST_START_TEST (test_state_change_error_message) - { - GstElement *src, *sink, *bin; -@@ -1956,7 +1888,6 @@ gst_bin_suite (void) - tcase_add_test (tc_chain, test_message_state_changed); - tcase_add_test (tc_chain, test_message_state_changed_child); - tcase_add_test (tc_chain, test_message_state_changed_children); -- tcase_add_test (tc_chain, test_watch_for_state_change); - tcase_add_test (tc_chain, test_state_change_error_message); - tcase_add_test (tc_chain, test_add_linked); - tcase_add_test (tc_chain, test_add_self); --- -2.33.1 - -- cgit v1.2.3-54-g00ecf