4 files changed, 0 insertions, 268 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
deleted file mode 100644
index 1b9278db0..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 11 Apr 2021 19:48:13 +0100
-Subject: [PATCH] tests: respect the idententaion used in meson
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
-
----
- tests/check/meson.build | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 9787b0a..16caac7 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -145,11 +145,11 @@ foreach t : core_tests
- 
-   if not skip_test
-     exe = executable(test_name, fname,
--        c_args : gst_c_args + test_defines,
--        cpp_args : gst_c_args + test_defines,
--        include_directories : [configinc],
--        link_with : link_with_libs,
--        dependencies : gst_deps + test_deps,
-+      c_args : gst_c_args + test_defines,
-+      cpp_args : gst_c_args + test_defines,
-+      include_directories : [configinc],
-+      link_with : link_with_libs,
-+      dependencies : gst_deps + test_deps,
-     )
- 
-     env = environment()
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
deleted file mode 100644
index 456f07626..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 330e15374bb30ac29ee72c4b3de79c17b1157112 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 11 Apr 2021 19:48:13 +0100
-Subject: [PATCH] tests: add support for install the tests
-
-This will provide to run the tests using the gnome-desktop-testing [1]
-
-[1] https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
-
----
- meson.build                  |  4 ++++
- meson_options.txt            |  1 +
- tests/check/meson.build      | 21 ++++++++++++++++++++-
- tests/check/template.test.in |  3 +++
- 4 files changed, 28 insertions(+), 1 deletion(-)
- create mode 100644 tests/check/template.test.in
-
-diff --git a/meson.build b/meson.build
-index 540d6d290e10..0267f22a79ea 100644
---- a/meson.build
-+++ b/meson.build
-@@ -624,6 +624,10 @@ if bashcomp_dep.found()
-   endif
- endif
- 
-+installed_tests_enabled = get_option('installed_tests')
-+installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
-+installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
-+
- plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
- 
- pkgconfig = import('pkgconfig')
-diff --git a/meson_options.txt b/meson_options.txt
-index 340fb5801d02..5b87f68e8d7f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -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')
-+option('installed_tests', type : 'boolean', value : false, description : 'Enable installed tests')
- 
- # 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 e9501feb2af5..fd5a99611e3d 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -125,10 +125,16 @@ test_defines = [
-   '-UG_DISABLE_ASSERT',
-   '-UG_DISABLE_CAST_CHECKS',
-   '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
--  '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"',
-   '-DGST_DISABLE_DEPRECATED',
- ]
- 
-+testfile = meson.current_source_dir() + '/meson.build'
-+if installed_tests_enabled
-+  install_data(testfile, install_dir : installed_tests_metadir, rename : 'testfile')
-+  testfile = installed_tests_metadir + '/testfile'
-+endif
-+test_defines += '-DTESTFILE="@0@"'.format(testfile)
-+
- # sanity checking
- if get_option('check').disabled()
-   if get_option('tests').enabled()
-@@ -151,6 +157,8 @@ foreach t : core_tests
-       include_directories : [configinc],
-       link_with : link_with_libs,
-       dependencies : gst_deps + test_deps,
-+      install_dir: installed_tests_execdir,
-+      install: installed_tests_enabled,
-     )
- 
-     env = environment()
-@@ -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))
-+      test_conf.set('program', test_name)
-+      configure_file(
-+        input: 'template.test.in',
-+        output: test_name + '.test',
-+        install_dir: installed_tests_metadir,
-+        configuration: test_conf
-+      )
-+    endif
- 
-     test(test_name, exe, env: env, timeout : 3 * 60)
-   endif
-diff --git a/tests/check/template.test.in b/tests/check/template.test.in
-new file mode 100644
-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
deleted file mode 100644
index 83f3870c4..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1f13b802bdb1c1e414c70f770dc164c80e0dcd57 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sat, 24 Apr 2021 10:34:47 +0100
-Subject: [PATCH 3/4] tests: use a dictionaries for environment
-
-meson environment() can't be passed to configure_file and it is needed for installed_tests,
-use a dictionary as this is simplest solution to install the environment.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
----
- tests/check/meson.build | 22 ++++++++++++++--------
- 1 file changed, 14 insertions(+), 8 deletions(-)
-
-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,
-     )
- 
--    env = environment()
--    env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root())
--    env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
--    env.set('GST_STATE_IGNORE_ELEMENTS', '')
--    env.set('CK_DEFAULT_TIMEOUT', '20')
--    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')
-+    # meson environment object can't be passed to configure_file and
-+    # installed tests uses configure_file to install the environment.
-+    # use a dictionary as this is the simplest solution
-+    # to install the environment.
-+    env = {
-+      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
-+      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
-+      'GST_STATE_IGNORE_ELEMENTS': '',
-+      'CK_DEFAULT_TIMEOUT': '20',
-+      'GST_REGISTRY': '@0@/@1@.registry'.format(meson.current_build_dir(), test_name),
-+      '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.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
deleted file mode 100644
index 0a312389e..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 616c489d4ff1e7ed878bc3760180ba994fbd1974 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 2 May 2021 01:58:01 +0100
-Subject: [PATCH 4/4] tests: add helper script to run the installed_tests
-
-- this is a bash script that will run the installed_tests
-with some of the environment variables used in the meson
-testing framework.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
----
- 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 100644 tests/check/template.sh.in
-
-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
-       )
-+
-+      # All the tests will be deployed on the target machine and
-+      # we use the home folder ~ for the registry which will then expand at runtime.
-+      # Using the /tmp/gstreamer-1.0/@0@.registry can be problematic as it mostly
-+      # is mounted using tmpfs and if the machine crash from some reason we can lost the registry
-+      # that is useful for debug propose of the tests itself.
-+      env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@.registry'.format(test_name)}
-+
-+      # Set the full path for the test it self.
-+      env += {'TEST': '@0@/@1@'.format(join_paths(prefix, installed_tests_execdir), test_name)}
-+
-+      configure_file(
-+        input : 'template.sh.in',
-+        output: test_name + '.sh',
-+        install_dir: installed_tests_execdir,
-+        configuration : env,
-+      )
-     endif
- 
-     test(test_name, exe, env: env, timeout : 3 * 60)
-diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in
-new file mode 100644
-index 000000000000..cf7d31b0ea5f
---- /dev/null
-+++ b/tests/check/template.sh.in
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+set -ax
-+
-+CK_DEFAULT_TIMEOUT="@CK_DEFAULT_TIMEOUT@"
-+GST_PLUGIN_LOADING_WHITELIST="@GST_PLUGIN_LOADING_WHITELIST@"
-+GST_REGISTRY=@GST_REGISTRY@
-+GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@"
-+exec @TEST@
-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.39.2
-