Skip to contentSkip to conversation

icecc.bbclass: replace deprecated bash command substitution

PATCH In review Jose Quaresma 4 participants 26 messages Feb 7, 2022 – Feb 17, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/17 icecc.bbclass: replace deprecated bash command substitution

- build some packages with icecc enabled is not supported because of the folling that disables the icecc:

DEBUG: while parsing set_icecc_env, unable to handle non-literal command '$ICECC_CC'

- it can be replicated with:

bitbake make && bitbake make -c cleansstate && bitbake make -DD grep ICECC_CC tmp/log/cooker/qemux86-64/console-latest.log

- bash command substitution backquote deprecated

https://www.gnu.org/software/bash/manual/html_node/Command-Substitution.html
https://mywiki.wooledge.org/BashFAQ/082

---
 meta/classes/icecc.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta/classes/icecc.bbclass +6 -6
index 794e9930ad..3bbd2645af 100644
@@ -309,7 +309,7 @@ wait_for_file() {
     local TIMEOUT=$2
     until [ -f "$FILE_TO_TEST" ]
     do
-        TIME_ELAPSED=`expr $TIME_ELAPSED + 1`
+        TIME_ELAPSED=$(expr $TIME_ELAPSED + 1)
         if [ $TIME_ELAPSED -gt $TIMEOUT ]
         then
             return 1
@@ -362,8 +362,8 @@ set_icecc_env() {
         return
     fi
 
-    ICE_VERSION=`$ICECC_CC -dumpversion`
-    ICECC_VERSION=`echo ${ICECC_VERSION} | sed -e "s/@VERSION@/$ICE_VERSION/g"`
+    ICE_VERSION="$($ICECC_CC -dumpversion)"
+    ICECC_VERSION=$(echo ${ICECC_VERSION} | sed -e "s/@VERSION@/$ICE_VERSION/g")
     if [ ! -x "${ICECC_ENV_EXEC}" ]
     then
         bbwarn "Cannot use icecc: invalid ICECC_ENV_EXEC"
@@ -390,18 +390,18 @@ set_icecc_env() {
         chmod 775 $ICE_PATH/$compiler
     done
 
-    ICECC_AS="`${ICECC_CC} -print-prog-name=as`"
+    ICECC_AS="$(${ICECC_CC} -print-prog-name=as)"
     # for target recipes should return something like:
     # /OE/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm920tt-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.8.2/as
     # and just "as" for native, if it returns "as" in current directory (for whatever reason) use "as" from PATH
-    if [ "`dirname "${ICECC_AS}"`" = "." ]
+    if [ "$(dirname "${ICECC_AS}")" = "." ]
     then
         ICECC_AS="${ICECC_WHICH_AS}"
     fi
 
     if [ ! -f "${ICECC_VERSION}.done" ]
     then
-        mkdir -p "`dirname "${ICECC_VERSION}"`"
+        mkdir -p "$(dirname "${ICECC_VERSION}")"
 
         # the ICECC_VERSION generation step must be locked by a mutex
         # in order to prevent race conditions
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/17 spirv-headers: bump to b42ba6

---
 meta/recipes-graphics/spir/spirv-headers_1.5.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/spir/spirv-headers_1.5.4.bb +1 -1
index 522708618e..3144b1eb42 100644
@@ -7,7 +7,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
-SRCREV = "814e728b30ddd0f4509233099a3ad96fd4318c07"
+SRCREV = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 S = "${WORKDIR}/git"
Signature · 1 line
2.35.1
#2 lore raw

PATCH 3/17 spirv-tools: upgrade 2021.4 -> 2022.1

In reply to Jose Quaresma

- General
- Add SPIR-V 1.6 support to wasm build (#4674)
- Improvements to disassembly within PassManager (#4677)
- Basic support for SPIR-V 1.6 (#4663)
- reflect debug (#4662)
- Fix endianness of string literals (#4622)
- Optimizer
- spirv-opt: add pass to Spread Volatile semantics (#4667)
- Fix constant propagation and folding of FClamp instructions (#4651)
- Manually fold floating point division by zero (#4637)
- Allow ADCE to remove dead inputs (#4629)
- Linker
- Linker improvements (#4679)
* test/linker: Code factorisation and small tweaks
* linker: Do not fail when going over limits
- Validator
- val: interface struct with builtins must be Block (#4665)
- Fuzzer
- Avoid id bound errors during opt fuzzing (#4658)
- Avoid uninitialised read when parsing hex float (#4646)

https://github.com/KhronosGroup/SPIRV-Tools/blob/b1877de5cd776117050bd42f08d04b52bce16099/CHANGES

---
 .../spir/{spirv-tools_2021.4.bb => spirv-tools_2022.1.bb}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/spir/{spirv-tools_2021.4.bb => spirv-tools_2022.1.bb} (96%)
meta/recipes-graphics/spir/spirv-tools_2022.1.bb renamed from meta/recipes-graphics/spir/spirv-tools_2021.4.bb +1 -1
similarity index 96%
rename from meta/recipes-graphics/spir/spirv-tools_2021.4.bb
rename to meta/recipes-graphics/spir/spirv-tools_2022.1.bb
index ed56f4668f..24142a4fe0 100644
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "ab8eb607750208066e2d57eff6a34dbaf05f5ada"
+SRCREV = "b1877de5cd776117050bd42f08d04b52bce16099"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
 S = "${WORKDIR}/git"
Signature · 1 line
2.35.1
#3 lore raw

PATCH 4/17 glslang: upgrade 11.7.1 -> 11.8.0

In reply to Jose Quaresma

* Add support for SPIR-V 1.6
* Add support for Vulkan 1.3
* Add --hlsl-dx-position-w option

Update LICENSE.txt
- Expand the GPL 3 with special bison exception to the fully expanded license.

---
 .../glslang/{glslang_11.7.1.bb => glslang_11.8.0.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/glslang/{glslang_11.7.1.bb => glslang_11.8.0.bb} (89%)
meta/recipes-graphics/glslang/glslang_11.8.0.bb renamed from meta/recipes-graphics/glslang/glslang_11.7.1.bb +2 -2
similarity index 89%
rename from meta/recipes-graphics/glslang/glslang_11.7.1.bb
rename to meta/recipes-graphics/glslang/glslang_11.8.0.bb
index 30d9954ea5..a77d8bdf88 100644
@@ -6,9 +6,9 @@ either from a command line or programmatically."
 SECTION = "graphics"
 HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
 LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
 
-SRCREV = "c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5"
+SRCREV = "c34bb3b6c55f6ab084124ad964be95a699700d34"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \
            file://0001-generate-glslang-pkg-config.patch"
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
Signature · 1 line
2.35.1
#4 lore raw

PATCH 5/17 shaderc: upgrade 2021.3 -> 2021.4

In reply to Jose Quaresma

- Support Vulkan 1.3
- Support targeting SPIR-V 1.6, which is the default for Vulkan 1.3
- Updated copyright check: Excludes Glslang generated files when building in source tree
- Fix Android.mk rules for building libshaderc_combined, to adapt to more recent NDKs that have removed the GNU binutils.

---
 .../shaderc/{shaderc_2021.3.bb => shaderc_2021.4.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/shaderc/{shaderc_2021.3.bb => shaderc_2021.4.bb} (95%)
meta/recipes-graphics/shaderc/shaderc_2021.4.bb renamed from meta/recipes-graphics/shaderc/shaderc_2021.3.bb +1 -1
similarity index 95%
rename from meta/recipes-graphics/shaderc/shaderc_2021.3.bb
rename to meta/recipes-graphics/shaderc/shaderc_2021.4.bb
index cc2cfc18a8..a35a41ab00 100644
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRCREV = "6fabc36fbebacfcef8cf82463df2a8247120ebf0"
+SRCREV = "9d0b3848b054d62b5b1e0eba9a50e386c9de3e2b"
 SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
            file://0001-cmake-disable-building-external-dependencies.patch \
            file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
Signature · 1 line
2.35.1
#5 lore raw

PATCH 6/17 shaderc: upgrade 2021.4 -> 2022.0

In reply to Jose Quaresma

- Update to Glslang 11.8.0

---
 .../shaderc/{shaderc_2021.4.bb => shaderc_2022.0.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/shaderc/{shaderc_2021.4.bb => shaderc_2022.0.bb} (95%)
meta/recipes-graphics/shaderc/shaderc_2022.0.bb renamed from meta/recipes-graphics/shaderc/shaderc_2021.4.bb +1 -1
similarity index 95%
rename from meta/recipes-graphics/shaderc/shaderc_2021.4.bb
rename to meta/recipes-graphics/shaderc/shaderc_2022.0.bb
index a35a41ab00..f5ad0bf3bb 100644
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRCREV = "9d0b3848b054d62b5b1e0eba9a50e386c9de3e2b"
+SRCREV = "b0aa18323d65d2ca885d0affeef2aa0b56eb45f7"
 SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
            file://0001-cmake-disable-building-external-dependencies.patch \
            file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
Signature · 1 line
2.35.1
#6 lore raw

PATCH 7/17 gstreamer1.0: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

- Drop backported patches 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch 0002-Remove-unused-valgrind-detection.patch 0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

- Update submitted patches 0001-tests-respect-the-idententaion-used-in-meson.patch 0002-tests-add-support-for-install-the-tests.patch 0003-tests-use-a-dictionaries-for-environment.patch 0004-tests-add-helper-script-to-run-the-installed_tests.patch

---
 ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
 ...pect-the-idententaion-used-in-meson.patch} |  14 +--
 ...002-Remove-unused-valgrind-detection.patch | 112 ------------------
 ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
 ...-use-too-strict-timeout-for-validati.patch |  32 -----
 ...-use-a-dictionaries-for-environment.patch} |  28 +++--
 ...er-script-to-run-the-installed_tests.patch |  74 ++++++++++++
 ...-the-environment-for-installed_tests.patch |  58 ---------
 ...er1.0_1.18.5.bb => gstreamer1.0_1.20.0.bb} |  17 ++-
 9 files changed, 136 insertions(+), 335 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch => 0002-tests-add-support-for-install-the-tests.patch} (65%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb => gstreamer1.0_1.20.0.bb} (76%)
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -69
deleted file mode 100644
index 23ebd5c600..0000000000
@@ -1,69 +0,0 @@
-From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <[email protected]>
-Date: Sat, 10 Oct 2020 19:09:03 +0000
-Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through
- to system plugin scanner
-
-If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that.
-
-Falling through to the one installed on the system is problamatic in cross-compilation
-environemnts, regardless of whether one pointed to by the env var succeeded or failed.
-
-taken from:
-http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a]
-
-Signed-off-by: Jose Quaresma <[email protected]>
----
- gst/gstpluginloader.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
-index d1e404d98..c626bf263 100644
---- a/gst/gstpluginloader.c
-+++ b/gst/gstpluginloader.c
-@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
-   if (loader->child_running)
-     return TRUE;
- 
--  /* Find the gst-plugin-scanner: first try the env-var if it is set,
--   * otherwise use the installed version */
-+  /* Find the gst-plugin-scanner */
-   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
-   if (env == NULL)
-     env = g_getenv ("GST_PLUGIN_SCANNER");
- 
-   if (env != NULL && *env != '\0') {
-+    /* use the env-var if it is set */
-     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
-     helper_bin = g_strdup (env);
-     res = gst_plugin_loader_try_helper (loader, helper_bin);
-     g_free (helper_bin);
--  }
--
--  if (!res) {
-+  } else {
-+    /* use the installed version */
-     GST_LOG ("Trying installed plugin scanner");
- 
- #ifdef G_OS_WIN32
-@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
- #endif
-     res = gst_plugin_loader_try_helper (loader, helper_bin);
-     g_free (helper_bin);
-+  }
- 
--    if (!res) {
--      GST_INFO ("No gst-plugin-scanner available, or not working");
--    }
-+  if (!res) {
-+    GST_INFO ("No gst-plugin-scanner available, or not working");
-   }
- 
-   return loader->child_running;
--- 
-2.29.2
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch +7 -7
similarity index 71%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
index 6f571a12d8..312c04fbfd 100644
@@ -1,4 +1,4 @@
-From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17 00:00:00 2001
+From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH 1/4] tests: respect the idententaion used in meson
@@ -7,13 +7,13 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
 
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- tests/check/meson.build | 10 +++++-----
+ subprojects/gstreamer/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 a617cf159..b2636714b 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
+diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
+index 9c4228b6e4..506606684d 100644
+--- a/subprojects/gstreamer/tests/check/meson.build
++++ b/subprojects/gstreamer/tests/check/meson.build
 @@ -146,11 +146,11 @@ foreach t : core_tests
  
    if not skip_test
@@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
  
      env = environment()
 -- 
-2.31.1
+2.33.1
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -112

112 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +33 -34

104 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch deleted +0 -32
deleted file mode 100644
index e0e64e2c7a..0000000000
@@ -1,32 +0,0 @@
-From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17 00:00:00 2001
-From: Seungha Yang <[email protected]>
-Date: Tue, 15 Sep 2020 00:54:58 +0900
-Subject: [PATCH] tests: seek: Don't use too strict timeout for validation
-
-Expected segment-done message might not be seen within expected
-time if system is not powerful enough.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>
-
-Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c]
-Signed-off-by: Anuj Mittal <[email protected]>
----
- tests/check/pipelines/seek.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/check/pipelines/seek.c b/tests/check/pipelines/seek.c
-index 28bb8846d..5f7447bc5 100644
---- a/tests/check/pipelines/seek.c
-+++ b/tests/check/pipelines/seek.c
-@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
- 
-   GST_INFO ("wait for segment done message");
- 
--  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 * GST_SECOND,
-+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
-       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
-   fail_unless (msg, "no message within the timed window");
-   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg), "segment-done");
--- 
-2.29.2
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +15 -13
similarity index 61%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
index 46813cec3d..10a6dcc619 100644
@@ -1,4 +1,4 @@
-From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17 00:00:00 2001
+From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sat, 24 Apr 2021 10:34:47 +0100
 Subject: [PATCH 3/4] tests: use a dictionaries for environment
@@ -10,29 +10,31 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
 
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- tests/check/meson.build | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
+ subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++-------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
 
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index a697a7b06..f64524904 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -161,14 +161,17 @@ foreach t : core_tests
+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
        install: installed_tests_enabled,
      )
  
 -    env = environment()
--    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
+-    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@/@[email protected]'.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')
-+    # 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
++    # 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.build_root(),
++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
 +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
 +      'GST_STATE_IGNORE_ELEMENTS': '',
 +      'CK_DEFAULT_TIMEOUT': '20',
@@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
      if installed_tests_enabled
        test_conf = configuration_data()
 -- 
-2.31.1
+2.33.1
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +74 -0

74 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -58

58 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +7 -10
similarity index 76%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
index 0d82dd338c..243f99fee9 100644
@@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native"
 
 inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection ptest-gnome
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
 
 S = "${WORKDIR}/gstreamer-${PV}"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
            file://run-ptest \
-           file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
-           file://0002-Remove-unused-valgrind-detection.patch \
-           file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \
-           file://0004-tests-respect-the-idententaion-used-in-meson.patch \
-           file://0005-tests-add-support-for-install-the-tests.patch \
-           file://0006-tests-use-a-dictionaries-for-environment.patch \
-           file://0007-tests-install-the-environment-for-installed_tests.patch \
+           file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3 \
+           file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \
+           file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
+           file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
            "
-SRC_URI[sha256sum] = "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"
+SRC_URI[sha256sum] = "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                    check \
@@ -36,7 +33,7 @@ PACKAGECONFIG[debug] = "-Dgst_debug=true,-Dgst_debug=false"
 PACKAGECONFIG[tracer-hooks] = "-Dtracer_hooks=true,-Dtracer_hooks=false"
 PACKAGECONFIG[coretracers] = "-Dcoretracers=enabled,-Dcoretracers=disabled"
 PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
-PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
+PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"
 PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
 PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
Signature · 1 line
2.35.1
#7 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

Unfortunately this patchset (which is now in master) does not address the ptest fail. Please resolve this as soon as possible.

+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin Running suite(s): GstBin
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
....
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
Test timed out after 300 seconds
FAIL: gstreamer/gst_gstbin.test (Child process killed by signal 9)

Alex

Quoted 687 lines · Jose Quaresma

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

- Drop backported patches 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch 0002-Remove-unused-valgrind-detection.patch 0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

- Update submitted patches 0001-tests-respect-the-idententaion-used-in-meson.patch 0002-tests-add-support-for-install-the-tests.patch 0003-tests-use-a-dictionaries-for-environment.patch 0004-tests-add-helper-script-to-run-the-installed_tests.patch

---
 ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
 ...pect-the-idententaion-used-in-meson.patch} |  14 +--
 ...002-Remove-unused-valgrind-detection.patch | 112 ------------------
 ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
 ...-use-too-strict-timeout-for-validati.patch |  32 -----
 ...-use-a-dictionaries-for-environment.patch} |  28 +++--
 ...er-script-to-run-the-installed_tests.patch |  74 ++++++++++++
 ...-the-environment-for-installed_tests.patch |  58 ---------
 ...er1.0_1.18.5.bb => gstreamer1.0_1.20.0.bb} |  17 ++-
 9 files changed, 136 insertions(+), 335 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch => 0002-tests-add-support-for-install-the-tests.patch} (65%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb => gstreamer1.0_1.20.0.bb} (76%)
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -69
deleted file mode 100644
index 23ebd5c600..0000000000
@@ -1,69 +0,0 @@
-From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <[email protected]>
-Date: Sat, 10 Oct 2020 19:09:03 +0000
-Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through
- to system plugin scanner
-
-If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that.
-
-Falling through to the one installed on the system is problamatic in cross-compilation
-environemnts, regardless of whether one pointed to by the env var succeeded or failed.
-
-taken from:
-http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a]
-
-Signed-off-by: Jose Quaresma <[email protected]>
----
- gst/gstpluginloader.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
-index d1e404d98..c626bf263 100644
---- a/gst/gstpluginloader.c
-+++ b/gst/gstpluginloader.c
-@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
-   if (loader->child_running)
-     return TRUE;
-
--  /* Find the gst-plugin-scanner: first try the env-var if it is set,
--   * otherwise use the installed version */
-+  /* Find the gst-plugin-scanner */
-   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
-   if (env == NULL)
-     env = g_getenv ("GST_PLUGIN_SCANNER");
-
-   if (env != NULL && *env != '\0') {
-+    /* use the env-var if it is set */
-     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
-     helper_bin = g_strdup (env);
-     res = gst_plugin_loader_try_helper (loader, helper_bin);
-     g_free (helper_bin);
--  }
--
--  if (!res) {
-+  } else {
-+    /* use the installed version */
-     GST_LOG ("Trying installed plugin scanner");
-
- #ifdef G_OS_WIN32
-@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
- #endif
-     res = gst_plugin_loader_try_helper (loader, helper_bin);
-     g_free (helper_bin);
-+  }
-
--    if (!res) {
--      GST_INFO ("No gst-plugin-scanner available, or not working");
--    }
-+  if (!res) {
-+    GST_INFO ("No gst-plugin-scanner available, or not working");
-   }
-
-   return loader->child_running;
---
-2.29.2
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch +7 -7
similarity index 71%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
index 6f571a12d8..312c04fbfd 100644
@@ -1,4 +1,4 @@
-From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17 00:00:00 2001
+From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH 1/4] tests: respect the idententaion used in meson
@@ -7,13 +7,13 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
 
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- tests/check/meson.build | 10 +++++-----
+ subprojects/gstreamer/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 a617cf159..b2636714b 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
+diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
+index 9c4228b6e4..506606684d 100644
+--- a/subprojects/gstreamer/tests/check/meson.build
++++ b/subprojects/gstreamer/tests/check/meson.build
 @@ -146,11 +146,11 @@ foreach t : core_tests
 
    if not skip_test
@@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
 
      env = environment()
 --
-2.31.1
+2.33.1
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -112
deleted file mode 100644
index 5121044734..0000000000
@@ -1,112 +0,0 @@
-From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Fri, 14 Aug 2020 16:38:26 +0100
-Subject: [PATCH 2/3] Remove unused valgrind detection
-
-Having this just to log a debug message in case we're
-running inside valgrind doesn't seem very useful, and
-the code that used to use this no longer exists it seems.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>
-
-Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
-
-Signed-off-by: Jose Quaresma <[email protected]>
----
- gst/gst_private.h |  2 --
- gst/gstinfo.c     | 39 ---------------------------------------
- meson.build       |  1 -
- 3 files changed, 42 deletions(-)
-
-diff --git a/gst/gst_private.h b/gst/gst_private.h
-index eefd044..8252ede 100644
---- a/gst/gst_private.h
-+++ b/gst/gst_private.h
-@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
-
- G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed (GstPlugin * plugin);
-
--G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
--
- /* init functions called from gst_init(). */
- G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
- G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize (void);
-diff --git a/gst/gstinfo.c b/gst/gstinfo.c
-index eea1a21..d3035d6 100644
---- a/gst/gstinfo.c
-+++ b/gst/gstinfo.c
-@@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT;
- static gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT;
- static gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON;
-
--/* FIXME: export this? */
--gboolean
--_priv_gst_in_valgrind (void)
--{
--  static enum
--  {
--    GST_VG_UNCHECKED,
--    GST_VG_NO_VALGRIND,
--    GST_VG_INSIDE
--  }
--  in_valgrind = GST_VG_UNCHECKED;
--
--  if (in_valgrind == GST_VG_UNCHECKED) {
--#ifdef HAVE_VALGRIND_VALGRIND_H
--    if (RUNNING_ON_VALGRIND) {
--      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside valgrind");
--      in_valgrind = GST_VG_INSIDE;
--    } else {
--      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind stuff");
--      in_valgrind = GST_VG_NO_VALGRIND;
--    }
--#else
--    in_valgrind = GST_VG_NO_VALGRIND;
--#endif
--    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
--        in_valgrind == GST_VG_INSIDE);
--  }
--  return (in_valgrind == GST_VG_INSIDE);
--}
--
- static gchar *
- _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token,
-     guint val)
-@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
-   _priv_GST_CAT_PROTECTION =
-       _gst_debug_category_new ("GST_PROTECTION", 0, "protection");
-
--  /* print out the valgrind message if we're in valgrind */
--  _priv_gst_in_valgrind ();
--
-   env = g_getenv ("GST_DEBUG_OPTIONS");
-   if (env != NULL) {
-     if (strstr (env, "full_tags") || strstr (env, "full-tags"))
-@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint colorinfo)
-   return 0;
- }
-
--gboolean
--_priv_gst_in_valgrind (void)
--{
--  return FALSE;
--}
--
- void
- _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
-     const gchar * func, gint line, GObject * obj, const gchar * msg,
-diff --git a/meson.build b/meson.build
-index 82a1728..42ae617 100644
---- a/meson.build
-+++ b/meson.build
-@@ -200,7 +200,6 @@ check_headers = [
-   'sys/wait.h',
-   'ucontext.h',
-   'unistd.h',
--  'valgrind/valgrind.h',
-   'sys/resource.h',
-   'sys/uio.h',
- ]
---
-2.29.2
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +33 -34
similarity index 65%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
index b77fb5797f..d18c19c397 100644
@@ -1,4 +1,4 @@
-From c9e93c7a3e4d2773abef4f5e1464af24f36700b3 Mon Sep 17 00:00:00 2001
+From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH 2/4] tests: add support for install the tests
@@ -11,54 +11,44 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
 
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- meson.build             |  5 +++++
- meson_options.txt       |  1 +
- template.test.in        |  3 +++
- tests/check/meson.build | 22 +++++++++++++++++++++-
- 4 files changed, 30 insertions(+), 1 deletion(-)
- create mode 100644 template.test.in
+ subprojects/gstreamer/meson.build             |  4 ++++
+ subprojects/gstreamer/meson_options.txt       |  1 +
+ subprojects/gstreamer/tests/check/meson.build | 22 ++++++++++++++++++-
+ .../gstreamer/tests/check/template.test.in    |  3 +++
+ 4 files changed, 29 insertions(+), 1 deletion(-)
+ create mode 100644 subprojects/gstreamer/tests/check/template.test.in
 
-diff --git a/meson.build b/meson.build
-index c4e8774f5..1abf4eb26 100644
---- a/meson.build
-+++ b/meson.build
-@@ -562,6 +562,11 @@ if bashcomp_dep.found()
+diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build
+index d20fe0040f..b595d8f990 100644
+--- a/subprojects/gstreamer/meson.build
++++ b/subprojects/gstreamer/meson.build
+@@ -562,6 +562,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())
-+installed_tests_enabled = get_option('installed-tests')
-+installed_tests_template = files('template.test.in')
 +
  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 c8cee3762..b5da40eaa 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
+diff --git a/subprojects/gstreamer/meson_options.txt b/subprojects/gstreamer/meson_options.txt
+index 7363bdb7a1..a34ba37dad 100644
+--- a/subprojects/gstreamer/meson_options.txt
++++ b/subprojects/gstreamer/meson_options.txt
 @@ -15,6 +15,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')
++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/template.test.in b/template.test.in
-new file mode 100644
-index 000000000..f701627f8
---- /dev/null
-+++ b/template.test.in
-@@ -0,0 +1,3 @@
-+[Test]
-+Type=session
-+Exec=@installed_tests_dir@/@program@
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index b2636714b..a697a7b06 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
+diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
+index 506606684d..00a138a568 100644
+--- a/subprojects/gstreamer/tests/check/meson.build
++++ b/subprojects/gstreamer/tests/check/meson.build
 @@ -124,10 +124,16 @@ test_defines = [
    '-UG_DISABLE_ASSERT',
    '-UG_DISABLE_CAST_CHECKS',
@@ -95,7 +85,7 @@ index b2636714b..a697a7b06 100644
 +      test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir))
 +      test_conf.set('program', test_name)
 +      configure_file(
-+        input: installed_tests_template,
++        input: 'template.test.in',
 +        output: test_name + '.test',
 +        install_dir: installed_tests_metadir,
 +        configuration: test_conf
@@ -105,6 +95,15 @@ index b2636714b..a697a7b06 100644
      test(test_name, exe, env: env, timeout : 3 * 60)
    endif
  endforeach
+diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in
+new file mode 100644
+index 0000000000..f701627f87
+--- /dev/null
++++ b/subprojects/gstreamer/tests/check/template.test.in
+@@ -0,0 +1,3 @@
++[Test]
++Type=session
++Exec=@installed_tests_dir@/@program@
 --
-2.31.1
+2.33.1
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch deleted +0 -32
deleted file mode 100644
index e0e64e2c7a..0000000000
@@ -1,32 +0,0 @@
-From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17 00:00:00 2001
-From: Seungha Yang <[email protected]>
-Date: Tue, 15 Sep 2020 00:54:58 +0900
-Subject: [PATCH] tests: seek: Don't use too strict timeout for validation
-
-Expected segment-done message might not be seen within expected
-time if system is not powerful enough.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>
-
-Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c]
-Signed-off-by: Anuj Mittal <[email protected]>
----
- tests/check/pipelines/seek.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/check/pipelines/seek.c b/tests/check/pipelines/seek.c
-index 28bb8846d..5f7447bc5 100644
---- a/tests/check/pipelines/seek.c
-+++ b/tests/check/pipelines/seek.c
-@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
-
-   GST_INFO ("wait for segment done message");
-
--  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 * GST_SECOND,
-+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
-       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
-   fail_unless (msg, "no message within the timed window");
-   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg), "segment-done");
---
-2.29.2
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +15 -13
similarity index 61%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
index 46813cec3d..10a6dcc619 100644
@@ -1,4 +1,4 @@
-From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17 00:00:00 2001
+From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sat, 24 Apr 2021 10:34:47 +0100
 Subject: [PATCH 3/4] tests: use a dictionaries for environment
@@ -10,29 +10,31 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
 
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- tests/check/meson.build | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
+ subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++-------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
 
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index a697a7b06..f64524904 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -161,14 +161,17 @@ foreach t : core_tests
+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
        install: installed_tests_enabled,
      )
 
 -    env = environment()
--    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
+-    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@/@[email protected]'.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')
-+    # 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
++    # 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.build_root(),
++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
 +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
 +      'GST_STATE_IGNORE_ELEMENTS': '',
 +      'CK_DEFAULT_TIMEOUT': '20',
@@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
      if installed_tests_enabled
        test_conf = configuration_data()
 --
-2.31.1
+2.33.1
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +74 -0
new file mode 100644
index 0000000000..efa004f8ce
@@ -0,0 +1,74 @@
+From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001
+From: Jose Quaresma <[email protected]>
+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 <[email protected]>
+---
+ subprojects/gstreamer/tests/check/meson.build   | 17 +++++++++++++++++
+ .../gstreamer/tests/check/template.sh.in        |  9 +++++++++
+ .../gstreamer/tests/check/template.test.in      |  2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+ create mode 100755 subprojects/gstreamer/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
+@@ -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/@[email protected] 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/@[email protected]'.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/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in
+new file mode 100755
+index 0000000000..cf7d31b0ea
+--- /dev/null
++++ b/subprojects/gstreamer/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/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
+@@ -1,3 +1,3 @@
+ [Test]
+ Type=session
+-Exec=@installed_tests_dir@/@program@
++Exec=@installed_tests_dir@/@[email protected]
+--
+2.33.1
+
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -58
deleted file mode 100644
index eabe7bcbe1..0000000000
@@ -1,58 +0,0 @@
-From 57d2965e979f886e03eecd7e351bf01812053971 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <[email protected]>
-Date: Sun, 2 May 2021 01:58:01 +0100
-Subject: [PATCH 4/4] tests: install the environment for installed_tests
-
-- adapt the test environment for installed_tests
-- install the test environment for installed_tests
-- run the tests using the installed environment
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-
-Signed-off-by: Jose Quaresma <[email protected]>
----
- template.test.in        |  2 +-
- tests/check/meson.build | 18 ++++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/template.test.in b/template.test.in
-index f701627f8..9a3fbdd09 100644
---- a/template.test.in
-+++ b/template.test.in
-@@ -1,3 +1,3 @@
- [Test]
- Type=session
--Exec=@installed_tests_dir@/@program@
-+Exec=sh -c 'set -aex && source @installed_tests_dir@/@[email protected] && exec @installed_tests_dir@/@program@'
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index f64524904..a67e0f8dd 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -183,6 +183,24 @@ foreach t : core_tests
-         install_dir: installed_tests_metadir,
-         configuration: test_conf
-       )
-+
-+      env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@[email protected]'.format(test_name)}
-+      configure_file(
-+        output: test_name + '.env',
-+        install_dir: installed_tests_execdir,
-+        configuration : env,
-+      )
-+      # helper to convert a meson environment dictionay object exported with configure_file
-+      # this also remove not needed variables for the installed tests
-+      meson.add_postconf_script('sed', '-i',
-+        '-e', '/^#define/!d',
-+        '-e', 's/^#define //g',
-+        '-e', '/^GST_PLUGIN_PATH_1_0/d',
-+        '-e', '/^GST_PLUGIN_SYSTEM_PATH_1_0/d',
-+        '-e', '/^GST_PLUGIN_SCANNER_1_0/d',
-+        '-e', 's/ /=/',
-+        join_paths(meson.current_build_dir(), test_name + '.env')
-+      )
-     endif
-
-     test(test_name, exe, env: env, timeout : 3 * 60)
---
-2.31.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +7 -11
similarity index 76%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
index 0d82dd338c..243f99fee9 100644
@@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native"
 
 inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection ptest-gnome
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
 
 S = "${WORKDIR}/gstreamer-${PV}"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
            file://run-ptest \
-           file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
-           file://0002-Remove-unused-valgrind-detection.patch \
-           file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \
-           file://0004-tests-respect-the-idententaion-used-in-meson.patch \
-           file://0005-tests-add-support-for-install-the-tests.patch \
-           file://0006-tests-use-a-dictionaries-for-environment.patch \
-           file://0007-tests-install-the-environment-for-installed_tests.patch \
+           file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3 \
+           file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \
+           file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
+           file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
            "
-SRC_URI[sha256sum] = "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"
+SRC_URI[sha256sum] = "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                    check \
@@ -36,7 +33,7 @@ PACKAGECONFIG[debug] = "-Dgst_debug=true,-Dgst_debug=false"
 PACKAGECONFIG[tracer-hooks] = "-Dtracer_hooks=true,-Dtracer_hooks=false"
 PACKAGECONFIG[coretracers] = "-Dcoretracers=enabled,-Dcoretracers=disabled"
 PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
-PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
+PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"
 PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
 PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
--

2.35.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161427): https://lists.openembedded.org/g/openembedded-core/message/161427
Mute This Topic: https://lists.openembedded.org/mt/88962313/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#8 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

Hi Alexander,

Can you please clarify in what target arch is this happening and I can try to replicate it with qemu?

It works on my side on qemux86-64.

root@qemux86-64:~# /usr/libexec/installed-tests/gstreamer/gst_gstbin.sh
+ CK_DEFAULT_TIMEOUT=20
+ GST_PLUGIN_LOADING_WHITELIST=gstreamer
+ GST_REGISTRY=/home/root/.cache/gstreamer-1.0/gst_gstbin.registry
+ GST_STATE_IGNORE_ELEMENTS=
+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
Running suite(s): GstBin
100%: Checks: 26, Failures: 0, Errors: 0
Check suite gst_bin ran in 6.239s (tests failed: 0)

Alexander Kanavin <[email protected]> escreveu no dia terça, 8/02/2022 à(s) 22:01:

Quoted 830 lines

Unfortunately this patchset (which is now in master) does not address the ptest fail. Please resolve this as soon as possible.

+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin Running suite(s): GstBin
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
....
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
Test timed out after 300 seconds
FAIL: gstreamer/gst_gstbin.test (Child process killed by signal 9)

Alex

Quoted 4 lines · Jose Quaresma

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

Quoted 13 lines

- Drop backported patches 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch 0002-Remove-unused-valgrind-detection.patch 0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

- Update submitted patches 0001-tests-respect-the-idententaion-used-in-meson.patch 0002-tests-add-support-for-install-the-tests.patch 0003-tests-use-a-dictionaries-for-environment.patch 0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 12 lines
---
 ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
 ...pect-the-idententaion-used-in-meson.patch} |  14 +--
 ...002-Remove-unused-valgrind-detection.patch | 112 ------------------
 ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
 ...-use-too-strict-timeout-for-validati.patch |  32 -----
 ...-use-a-dictionaries-for-environment.patch} |  28 +++--
 ...er-script-to-run-the-installed_tests.patch |  74 ++++++++++++
 ...-the-environment-for-installed_tests.patch |  58 ---------
 ...er1.0_1.18.5.bb => gstreamer1.0_1.20.0.bb} |  17 ++-
 9 files changed, 136 insertions(+), 335 deletions(-)
 delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 1 line

rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)

Quoted 1 line
 delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 1 line

rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch => 0002-tests-add-support-for-install-the-tests.patch} (65%)

Quoted 1 line
 delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 1 line

rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)

Quoted 1 line
 create mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 1 line
 delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 1 line
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb =>

gstreamer1.0_1.20.0.bb} (76%)

Quoted 2 lines

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 3 lines

deleted file mode 100644
index 23ebd5c600..0000000000
---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch line 4

Quoted 6 lines

+++ /dev/null

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -4
@@ -1,69 +0,0 @@
-From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <[email protected]>
-Date: Sat, 10 Oct 2020 19:09:03 +0000
-Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall

through

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 3 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -3
- to system plugin scanner
-
-If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to

use that and only that.

Review line 9

Quoted 2 lines
(quoted diff) +0 -2
-
-Falling through to the one installed on the system is problamatic in

cross-compilation

Review line 10

Quoted 1 line
(quoted diff) +0 -1
-environemnts, regardless of whether one pointed to by the env var

succeeded or failed.

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch line 14

Quoted 3 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -3
-
-taken from:
-

http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b

Review line 15

Quoted 2 lines
(quoted diff) +0 -2
-
-Part-of: <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>

Review line 17

Quoted 2 lines
(quoted diff) +0 -2
-
-Upstream-Status: Backport [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a
]

Quoted 52 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -52
-
-Signed-off-by: Jose Quaresma <[email protected]>
----
- gst/gstpluginloader.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
-index d1e404d98..c626bf263 100644
---- a/gst/gstpluginloader.c
-+++ b/gst/gstpluginloader.c
-@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
-   if (loader->child_running)
-     return TRUE;
-
--  /* Find the gst-plugin-scanner: first try the env-var if it is set,
--   * otherwise use the installed version */
-+  /* Find the gst-plugin-scanner */
-   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
-   if (env == NULL)
-     env = g_getenv ("GST_PLUGIN_SCANNER");
-
-   if (env != NULL && *env != '\0') {
-+    /* use the env-var if it is set */
-     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
-     helper_bin = g_strdup (env);
-     res = gst_plugin_loader_try_helper (loader, helper_bin);
-     g_free (helper_bin);
--  }
--
--  if (!res) {
-+  } else {
-+    /* use the installed version */
-     GST_LOG ("Trying installed plugin scanner");
-
- #ifdef G_OS_WIN32
-@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
- #endif
-     res = gst_plugin_loader_try_helper (loader, helper_bin);
-     g_free (helper_bin);
-+  }
-
--    if (!res) {
--      GST_INFO ("No gst-plugin-scanner available, or not working");
--    }
-+  if (!res) {
-+    GST_INFO ("No gst-plugin-scanner available, or not working");
-   }
-
-   return loader->child_running;
---
-2.29.2
-
Quoted 1 line

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 2 lines

similarity index 71%
rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 1 line

rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 2 lines

index 6f571a12d8..312c04fbfd 100644
---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 1 line

+++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch Upstream-Status: Submitted [

Quoted 7 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch +1 -1
@@ -1,4 +1,4 @@
-From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17 00:00:00 2001
+From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH 1/4] tests: respect the idententaion used in meson
@@ -7,13 +7,13 @@ Upstream-Status: Submitted [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 12 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch +2 -5
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- tests/check/meson.build | 10 +++++-----
+ subprojects/gstreamer/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 a617cf159..b2636714b 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
+diff --git a/subprojects/gstreamer/tests/check/meson.build

b/subprojects/gstreamer/tests/check/meson.build

Quoted 13 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch +4 -1
+index 9c4228b6e4..506606684d 100644
+--- a/subprojects/gstreamer/tests/check/meson.build
++++ b/subprojects/gstreamer/tests/check/meson.build
 @@ -146,11 +146,11 @@ foreach t : core_tests
 
    if not skip_test
@@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
 
      env = environment()
 --
-2.31.1
+2.33.1
 
Quoted 1 line

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 3 lines

deleted file mode 100644
index 5121044734..0000000000
---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch line 10

Quoted 12 lines

+++ /dev/null

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -10
@@ -1,112 +0,0 @@
-From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Fri, 14 Aug 2020 16:38:26 +0100
-Subject: [PATCH 2/3] Remove unused valgrind detection
-
-Having this just to log a debug message in case we're
-running inside valgrind doesn't seem very useful, and
-the code that used to use this no longer exists it seems.
-
-Part-of: <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>

Quoted 5 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -5
-
-Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
-
-Signed-off-by: Jose Quaresma <[email protected]>
----

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -10
- gst/gst_private.h |  2 --
- gst/gstinfo.c     | 39 ---------------------------------------
- meson.build       |  1 -
- 3 files changed, 42 deletions(-)
-
-diff --git a/gst/gst_private.h b/gst/gst_private.h
-index eefd044..8252ede 100644
---- a/gst/gst_private.h
-+++ b/gst/gst_private.h
-@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean

_priv_plugin_deps_env_vars_changed (GstPlugin * plugin

Review line 27

Quoted 2 lines
(quoted diff) +0 -2
-
- G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed (GstPlugin *

plugin);

Quoted 36 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -36
-
--G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
--
- /* init functions called from gst_init(). */
- G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
- G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize (void);
-diff --git a/gst/gstinfo.c b/gst/gstinfo.c
-index eea1a21..d3035d6 100644
---- a/gst/gstinfo.c
-+++ b/gst/gstinfo.c
-@@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT;
- static gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT;
- static gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON;
-
--/* FIXME: export this? */
--gboolean
--_priv_gst_in_valgrind (void)
--{
--  static enum
--  {
--    GST_VG_UNCHECKED,
--    GST_VG_NO_VALGRIND,
--    GST_VG_INSIDE
--  }
--  in_valgrind = GST_VG_UNCHECKED;
--
--  if (in_valgrind == GST_VG_UNCHECKED) {
--#ifdef HAVE_VALGRIND_VALGRIND_H
--    if (RUNNING_ON_VALGRIND) {
--      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside valgrind");
--      in_valgrind = GST_VG_INSIDE;
--    } else {
--      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind stuff");
--      in_valgrind = GST_VG_NO_VALGRIND;
--    }
--#else

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -10
--    in_valgrind = GST_VG_NO_VALGRIND;
--#endif
--    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
--        in_valgrind == GST_VG_INSIDE);
--  }
--  return (in_valgrind == GST_VG_INSIDE);
--}
--
- static gchar *
- _replace_pattern_in_gst_debug_file_name (gchar * name, const char

*token,

Quoted 39 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -39
-     guint val)
-@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
-   _priv_GST_CAT_PROTECTION =
-       _gst_debug_category_new ("GST_PROTECTION", 0, "protection");
-
--  /* print out the valgrind message if we're in valgrind */
--  _priv_gst_in_valgrind ();
--
-   env = g_getenv ("GST_DEBUG_OPTIONS");
-   if (env != NULL) {
-     if (strstr (env, "full_tags") || strstr (env, "full-tags"))
-@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint colorinfo)
-   return 0;
- }
-
--gboolean
--_priv_gst_in_valgrind (void)
--{
--  return FALSE;
--}
--
- void
- _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
-     const gchar * func, gint line, GObject * obj, const gchar * msg,
-diff --git a/meson.build b/meson.build
-index 82a1728..42ae617 100644
---- a/meson.build
-+++ b/meson.build
-@@ -200,7 +200,6 @@ check_headers = [
-   'sys/wait.h',
-   'ucontext.h',
-   'unistd.h',
--  'valgrind/valgrind.h',
-   'sys/resource.h',
-   'sys/uio.h',
- ]
---
-2.29.2
-
Quoted 1 line

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 2 lines

similarity index 65%
rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 1 line

rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 2 lines

index b77fb5797f..d18c19c397 100644
---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 1 line

+++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch Upstream-Status: Submitted [

Quoted 7 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +1 -1
@@ -1,4 +1,4 @@
-From c9e93c7a3e4d2773abef4f5e1464af24f36700b3 Mon Sep 17 00:00:00 2001
+From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH 2/4] tests: add support for install the tests
@@ -11,54 +11,44 @@ Upstream-Status: Submitted [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 12 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +3 -6
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- meson.build             |  5 +++++
- meson_options.txt       |  1 +
- template.test.in        |  3 +++
- tests/check/meson.build | 22 +++++++++++++++++++++-
- 4 files changed, 30 insertions(+), 1 deletion(-)
- create mode 100644 template.test.in
+ subprojects/gstreamer/meson.build             |  4 ++++
+ subprojects/gstreamer/meson_options.txt       |  1 +
+ subprojects/gstreamer/tests/check/meson.build | 22 ++++++++++++++++++-

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +4 -5
+ .../gstreamer/tests/check/template.test.in    |  3 +++
+ 4 files changed, 29 insertions(+), 1 deletion(-)
+ create mode 100644 subprojects/gstreamer/tests/check/template.test.in
 
-diff --git a/meson.build b/meson.build
-index c4e8774f5..1abf4eb26 100644
---- a/meson.build
-+++ b/meson.build
-@@ -562,6 +562,11 @@ if bashcomp_dep.found()
+diff --git a/subprojects/gstreamer/meson.build

b/subprojects/gstreamer/meson.build

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 9 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +5 -0
+index d20fe0040f..b595d8f990 100644
+--- a/subprojects/gstreamer/meson.build
++++ b/subprojects/gstreamer/meson.build
+@@ -562,6 +562,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())

Review Upstream-Status: Submitted [ · line 30

Quoted 1 line
(quoted diff) +0 -0
 +installed_tests_execdir = join_paths(libexecdir, 'installed-tests',

meson.project_name())

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 11 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +1 -6
-+installed_tests_enabled = get_option('installed-tests')
-+installed_tests_template = files('template.test.in')
 +
  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 c8cee3762..b5da40eaa 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
+diff --git a/subprojects/gstreamer/meson_options.txt

b/subprojects/gstreamer/meson_options.txt

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +3 -0
+index 7363bdb7a1..a34ba37dad 100644
+--- a/subprojects/gstreamer/meson_options.txt
++++ b/subprojects/gstreamer/meson_options.txt
 @@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false,

description : 'Enable poiso

Review Upstream-Status: Submitted [ · line 41

Quoted 2 lines
(quoted diff) +0 -0
  option('memory-alignment', type: 'combo',
         choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256',

'512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'],

Review Upstream-Status: Submitted [ · line 44

Quoted 2 lines
(quoted diff) +0 -1
         value: 'malloc')
-+option('installed-tests', type : 'boolean', value : false, description

: 'Enable installed tests')

Review Upstream-Status: Submitted [ · line 43

Quoted 1 line
(quoted diff) +1 -0
++option('installed_tests', type : 'boolean', value : false, description

: 'Enable installed tests')

Review Upstream-Status: Submitted [ · line 45

Quoted 3 lines
(quoted diff) +0 -0
  # Feature options
  option('check', type : 'feature', value : 'auto', description : 'Build

unit test libraries')

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +0 -4
-diff --git a/template.test.in b/template.test.in
-new file mode 100644
-index 000000000..f701627f8
---- /dev/null

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +1 -9
-+++ b/template.test.in
-@@ -0,0 +1,3 @@
-+[Test]
-+Type=session
-+Exec=@installed_tests_dir@/@program@
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index b2636714b..a697a7b06 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
+diff --git a/subprojects/gstreamer/tests/check/meson.build

b/subprojects/gstreamer/tests/check/meson.build

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index b2636714b..a697a7b06 100644 · line 85

Quoted 8 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +3 -0
+index 506606684d..00a138a568 100644
+--- a/subprojects/gstreamer/tests/check/meson.build
++++ b/subprojects/gstreamer/tests/check/meson.build
 @@ -124,10 +124,16 @@ test_defines = [
    '-UG_DISABLE_ASSERT',
    '-UG_DISABLE_CAST_CHECKS',
@@ -95,7 +85,7 @@ index b2636714b..a697a7b06 100644
 +      test_conf.set('installed_tests_dir', join_paths(prefix,

installed_tests_execdir))

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index b2636714b..a697a7b06 100644 · line 98

Quoted 12 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +2 -1
 +      test_conf.set('program', test_name)
 +      configure_file(
-+        input: installed_tests_template,
++        input: 'template.test.in',
 +        output: test_name + '.test',
 +        install_dir: installed_tests_metadir,
 +        configuration: test_conf
@@ -105,6 +95,15 @@ index b2636714b..a697a7b06 100644
      test(test_name, exe, env: env, timeout : 3 * 60)
    endif
  endforeach
+diff --git a/subprojects/gstreamer/tests/check/template.test.in

b/subprojects/gstreamer/tests/check/template.test.in

Quoted 12 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +9 -1
+new file mode 100644
+index 0000000000..f701627f87
+--- /dev/null
++++ b/subprojects/gstreamer/tests/check/template.test.in
+@@ -0,0 +1,3 @@
++[Test]
++Type=session
++Exec=@installed_tests_dir@/@program@
 --
-2.31.1
+2.33.1
 
Quoted 1 line

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 3 lines

deleted file mode 100644
index e0e64e2c7a..0000000000
---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch line 4

Quoted 6 lines

+++ /dev/null

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch deleted +0 -4
@@ -1,32 +0,0 @@
-From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17 00:00:00 2001
-From: Seungha Yang <[email protected]>
-Date: Tue, 15 Sep 2020 00:54:58 +0900
-Subject: [PATCH] tests: seek: Don't use too strict timeout for

validation

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 5 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch deleted +0 -5
-
-Expected segment-done message might not be seen within expected
-time if system is not powerful enough.
-
-Part-of: <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>

Review line 11

Quoted 2 lines
(quoted diff) +0 -2
-
-Upstream-Status: Backport [

https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c
]

Quoted 8 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch deleted +0 -8
-Signed-off-by: Anuj Mittal <[email protected]>
----
- tests/check/pipelines/seek.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/check/pipelines/seek.c b/tests/check/pipelines/seek.c
-index 28bb8846d..5f7447bc5 100644
---- a/tests/check/pipelines/seek.c

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch deleted +0 -10
-+++ b/tests/check/pipelines/seek.c
-@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
-
-   GST_INFO ("wait for segment done message");
-
--  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 * GST_SECOND,
-+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
-       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
-   fail_unless (msg, "no message within the timed window");
-   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg),

"segment-done");

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -3
---
-2.29.2
-

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 2 lines

similarity index 61%
rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 1 line

rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 2 lines

index 46813cec3d..10a6dcc619 100644
---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 1 line

+++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch Upstream-Status: Submitted [

Quoted 7 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +1 -1
@@ -1,4 +1,4 @@
-From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17 00:00:00 2001
+From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sat, 24 Apr 2021 10:34:47 +0100
 Subject: [PATCH 3/4] tests: use a dictionaries for environment
@@ -10,29 +10,31 @@ Upstream-Status: Submitted [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +0 -1
 Signed-off-by: Jose Quaresma <[email protected]>
 ---
- tests/check/meson.build | 19 +++++++++++--------

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +3 -6
- 1 file changed, 11 insertions(+), 8 deletions(-)
+ subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++-------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
 
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index a697a7b06..f64524904 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -161,14 +161,17 @@ foreach t : core_tests
+diff --git a/subprojects/gstreamer/tests/check/meson.build

b/subprojects/gstreamer/tests/check/meson.build

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +4 -0
+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

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +1 -1
        install: installed_tests_enabled,
      )
 
 -    env = environment()
--    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
+-    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@/@[email protected]'.format(meson.current_build_dir(),

test_name))

Review Upstream-Status: Submitted [ · line 29

Quoted 1 line
(quoted diff) +0 -0
 -    env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir +

'/gst-plugin-scanner')

Review Upstream-Status: Submitted [ · line 31

Quoted 2 lines
(quoted diff) +0 -1
 -    env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
-+    # environment() can't be passed to configure_file and it is needed

for installed_tests

Review Upstream-Status: Submitted [ · line 32

Quoted 1 line
(quoted diff) +0 -1
-+    # use a dictionary as this is simplest solution to install the

environment

Quoted 17 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +6 -2
++    # 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.build_root(),
++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
 +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
 +      'GST_STATE_IGNORE_ELEMENTS': '',
 +      'CK_DEFAULT_TIMEOUT': '20',
@@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
      if installed_tests_enabled
        test_conf = configuration_data()
 --
-2.31.1
+2.33.1
 
Quoted 1 line

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

Quoted 4 lines

new file mode 100644
index 0000000000..efa004f8ce
--- /dev/null
+++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch line 10

Quoted 11 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +10 -0
@@ -0,0 +1,74 @@
+From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001
+From: Jose Quaresma <[email protected]>
+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]

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +10 -0
+
+Signed-off-by: Jose Quaresma <[email protected]>
+---
+ subprojects/gstreamer/tests/check/meson.build   | 17 +++++++++++++++++
+ .../gstreamer/tests/check/template.sh.in        |  9 +++++++++
+ .../gstreamer/tests/check/template.test.in      |  2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+ create mode 100755 subprojects/gstreamer/tests/check/template.sh.in
+
+diff --git a/subprojects/gstreamer/tests/check/meson.build

b/subprojects/gstreamer/tests/check/meson.build

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +10 -0
+index 48ec2532f8..7dc4990d4e 100644
+--- a/subprojects/gstreamer/tests/check/meson.build
++++ b/subprojects/gstreamer/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.

Review line 31

Quoted 1 line
(quoted diff) +1 -0
++      # Using the /tmp/gstreamer-1.0/@[email protected] can be problematic

as it mostly

Review line 32

Quoted 1 line
(quoted diff) +1 -0
++      # is mounted using tmpfs and if the machine crash from some

reason we can lost the registry

Review line 34

Quoted 2 lines
(quoted diff) +2 -0
++      # that is useful for debug propose of the tests itself.
++      env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@

.registry'.format(test_name)}

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 3 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +3 -0
++
++      # Set the full path for the test it self.
++      env += {'TEST': '@0@/@1@'.format(join_paths(prefix,

installed_tests_execdir), test_name)}

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 11 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +11 -0
++
++      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/subprojects/gstreamer/tests/check/template.sh.in

b/subprojects/gstreamer/tests/check/template.sh.in

Quoted 5 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +5 -0
+new file mode 100755
+index 0000000000..cf7d31b0ea
+--- /dev/null
++++ b/subprojects/gstreamer/tests/check/template.sh.in
+@@ -0,0 +1,9 @@

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +10 -0
++#!/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/subprojects/gstreamer/tests/check/template.test.in

b/subprojects/gstreamer/tests/check/template.test.in

Quoted 11 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +11 -0
+index f701627f87..b74ef6ad73 100644
+--- a/subprojects/gstreamer/tests/check/template.test.in
++++ b/subprojects/gstreamer/tests/check/template.test.in
+@@ -1,3 +1,3 @@
+ [Test]
+ Type=session
+-Exec=@installed_tests_dir@/@program@
++Exec=@installed_tests_dir@/@[email protected]
+--
+2.33.1
+
Quoted 1 line

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 3 lines

deleted file mode 100644
index eabe7bcbe1..0000000000
---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch line 10

Quoted 12 lines

+++ /dev/null

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -10
@@ -1,58 +0,0 @@
-From 57d2965e979f886e03eecd7e351bf01812053971 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <[email protected]>
-Date: Sun, 2 May 2021 01:58:01 +0100
-Subject: [PATCH 4/4] tests: install the environment for installed_tests
-
-- adapt the test environment for installed_tests
-- install the test environment for installed_tests
-- run the tests using the installed environment
-
-Upstream-Status: Submitted [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]

Quoted 6 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -6
-
-Signed-off-by: Jose Quaresma <[email protected]>
----
- template.test.in        |  2 +-
- tests/check/meson.build | 18 ++++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -10
-
-diff --git a/template.test.in b/template.test.in
-index f701627f8..9a3fbdd09 100644
---- a/template.test.in
-+++ b/template.test.in
-@@ -1,3 +1,3 @@
- [Test]
- Type=session
--Exec=@installed_tests_dir@/@program@
-+Exec=sh -c 'set -aex && source @installed_tests_dir@/@[email protected] &&

exec @installed_tests_dir@/@program@'

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -10
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index f64524904..a67e0f8dd 100644
---- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -183,6 +183,24 @@ foreach t : core_tests
-         install_dir: installed_tests_metadir,
-         configuration: test_conf
-       )
-+
-+      env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@

.registry'.format(test_name)}

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 6 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -6
-+      configure_file(
-+        output: test_name + '.env',
-+        install_dir: installed_tests_execdir,
-+        configuration : env,
-+      )
-+      # helper to convert a meson environment dictionay object

exported with configure_file

Review

Quoted 17 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -16
-+      # this also remove not needed variables for the installed tests
-+      meson.add_postconf_script('sed', '-i',
-+        '-e', '/^#define/!d',
-+        '-e', 's/^#define //g',
-+        '-e', '/^GST_PLUGIN_PATH_1_0/d',
-+        '-e', '/^GST_PLUGIN_SYSTEM_PATH_1_0/d',
-+        '-e', '/^GST_PLUGIN_SCANNER_1_0/d',
-+        '-e', 's/ /=/',
-+        join_paths(meson.current_build_dir(), test_name + '.env')
-+      )
-     endif
-
-     test(test_name, exe, env: env, timeout : 3 * 60)
---
-2.31.1
-
(quoted diff) +0 -0

b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb DEPENDS = "glib-2.0 glib-2.0-native libxml2

Quoted 7 lines

similarity index 76%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb index 0d82dd338c..243f99fee9 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -0
@@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2

bison-native flex-native"

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb DEPENDS = "glib-2.0 glib-2.0-native libxml2 · line 10

Quoted 2 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -0
 inherit meson pkgconfig gettext upstream-version-is-even

gobject-introspection ptest-gnome

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb DEPENDS = "glib-2.0 glib-2.0-native libxml2 · line 11

Quoted 2 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -1
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d

\

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb DEPENDS = "glib-2.0 glib-2.0-native libxml2 · line 11

Quoted 1 line
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +1 -0
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770

\

Quoted 1 line

file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"

Quoted 4 lines

S = "${WORKDIR}/gstreamer-${PV}"

SRC_URI = "

https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \

Quoted 2 lines
            file://run-ptest \

-

file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb

Quoted 2 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -2
-           file://0002-Remove-unused-valgrind-detection.patch \
-

file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \

Quoted 1 line

-

file://0004-tests-respect-the-idententaion-used-in-meson.patch \

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native"

Quoted 3 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -3
-           file://0005-tests-add-support-for-install-the-tests.patch \
-           file://0006-tests-use-a-dictionaries-for-environment.patch \
-

file://0007-tests-install-the-environment-for-installed_tests.patch \

Quoted 1 line

+

file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3
\

Quoted 1 line

+

file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \

Quoted 1 line

+

file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \

Quoted 1 line

+

file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3
\

Quoted 2 lines
            "

-SRC_URI[sha256sum] =

"55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"

Quoted 1 line

+SRC_URI[sha256sum] =

"edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"

Quoted 2 lines

PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests',

'', d)} \

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb PACKAGECONFIG[debug] =

Quoted 2 lines
                    check \
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -0
@@ -36,7 +33,7 @@ PACKAGECONFIG[debug] =

"-Dgst_debug=true,-Dgst_debug=false"

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb PACKAGECONFIG[debug] = · line 34

Quoted 2 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -0
 PACKAGECONFIG[tracer-hooks] = "-Dtracer_hooks=true,-Dtracer_hooks=false"
 PACKAGECONFIG[coretracers] =

"-Dcoretracers=enabled,-Dcoretracers=disabled"

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb PACKAGECONFIG[debug] = · line 39

Quoted 2 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -1
 PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
-PACKAGECONFIG[tests] = "-Dtests=enabled

-Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb PACKAGECONFIG[debug] = · line 36

Quoted 1 line
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +1 -0
+PACKAGECONFIG[tests] = "-Dtests=enabled

-Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb PACKAGECONFIG[debug] = · line 37

Quoted 1 line
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -0
 PACKAGECONFIG[unwind] =

"-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb PACKAGECONFIG[debug] = · line 39

Quoted 2 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0 -0
 PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
 PACKAGECONFIG[bash-completion] =

"-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"

Quoted 7 lines

--
2.35.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#161427):

https://lists.openembedded.org/g/openembedded-core/message/161427

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/88962313/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [

[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Best regards,

José Quaresma
#9 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

Hi Jose

Quoted 3 lines · Jose Quaresma

Hi Alexander,

Can you please clarify in what target arch is this happening and I can try to replicate it with qemu?

I think we are hitting:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778

This testcase seems to be flaky and IIUC upstream marked it as such in their test infrastructure.

In my patchset, I added a patch to disable that testcase.

regards,
Claudius

Quoted 950 lines

It works on my side on qemux86-64.

root@qemux86-64:~# /usr/libexec/installed-tests/gstreamer/gst_gstbin.sh
+ CK_DEFAULT_TIMEOUT=20
+ GST_PLUGIN_LOADING_WHITELIST=gstreamer
+ GST_REGISTRY=/home/root/.cache/gstreamer-1.0/gst_gstbin.registry
+ GST_STATE_IGNORE_ELEMENTS=
+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
Running suite(s): GstBin
100%: Checks: 26, Failures: 0, Errors: 0
Check suite gst_bin ran in 6.239s (tests failed: 0)

Alexander Kanavin <[email protected] <mailto:[email protected]>> escreveu no dia terça, 8/02/2022 à(s) 22:01:

    Unfortunately this patchset (which is now in master) does not address
    the ptest fail. Please resolve this as soon as possible.

    + exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
    Running suite(s): GstBin
    Executing: gstreamer/gst_gstbin.test
    Executing: gstreamer/gst_gstbin.test
    ....
    Executing: gstreamer/gst_gstbin.test
    Executing: gstreamer/gst_gstbin.test
    Test timed out after 300 seconds
    FAIL: gstreamer/gst_gstbin.test (Child process killed by signal 9)

    Alex

    On Mon, 7 Feb 2022 at 02:08, Jose Quaresma <[email protected]
    <mailto:[email protected]>> wrote:
     >
     > - License update:
     >   The code actually is LGPLv2.1 but the COPYING file is wrong.
     >
    https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042>
     >
     > - Drop backported patches
     >   0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     >   0002-Remove-unused-valgrind-detection.patch
     >   0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     >
     > - Update submitted patches
     >   0001-tests-respect-the-idententaion-used-in-meson.patch
     >   0002-tests-add-support-for-install-the-tests.patch
     >   0003-tests-use-a-dictionaries-for-environment.patch
     >   0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >
     > Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ---
     >  ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
     >  ...pect-the-idententaion-used-in-meson.patch} |  14 +--
     >  ...002-Remove-unused-valgrind-detection.patch | 112
    ------------------
     >  ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
     >  ...-use-too-strict-timeout-for-validati.patch |  32 -----
     >  ...-use-a-dictionaries-for-environment.patch} |  28 +++--
     >  ...er-script-to-run-the-installed_tests.patch |  74 ++++++++++++
     >  ...-the-environment-for-installed_tests.patch |  58 ---------
     >  ...er1.0_1.18.5.bb <http://er1.0_1.18.5.bb> =>
    gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} |  17 ++-
     >  9 files changed, 136 insertions(+), 335 deletions(-)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch
    => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch
    => 0002-tests-add-support-for-install-the-tests.patch} (65%)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch
    => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)
     >  create mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     >  rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>} (76%)
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     > deleted file mode 100644
     > index 23ebd5c600..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     > +++ /dev/null
     > @@ -1,69 +0,0 @@
     > -From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sat, 10 Oct 2020 19:09:03 +0000
     > -Subject: [PATCH 1/3] gstpluginloader: when env var is set do not
    fall through
     > - to system plugin scanner
     > -
     > -If we set a custom GST_PLUGIN_SCANNER env var, then we probably
    want to use that and only that.
     > -
     > -Falling through to the one installed on the system is
    problamatic in cross-compilation
     > -environemnts, regardless of whether one pointed to by the env
    var succeeded or failed.
     > -
     > -taken from:
     >
    -http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b
    <http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b>
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>>
     > -
     > -Upstream-Status: Backport
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a>]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gstpluginloader.c | 15 +++++++--------
     > - 1 file changed, 7 insertions(+), 8 deletions(-)
     > -
     > -diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
     > -index d1e404d98..c626bf263 100644
     > ---- a/gst/gstpluginloader.c
     > -+++ b/gst/gstpluginloader.c
     > -@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader *
    loader)
     > -   if (loader->child_running)
     > -     return TRUE;
     > -
     > --  /* Find the gst-plugin-scanner: first try the env-var if it
    is set,
     > --   * otherwise use the installed version */
     > -+  /* Find the gst-plugin-scanner */
     > -   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
     > -   if (env == NULL)
     > -     env = g_getenv ("GST_PLUGIN_SCANNER");
     > -
     > -   if (env != NULL && *env != '\0') {
     > -+    /* use the env-var if it is set */
     > -     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
     > -     helper_bin = g_strdup (env);
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > --  }
     > --
     > --  if (!res) {
     > -+  } else {
     > -+    /* use the installed version */
     > -     GST_LOG ("Trying installed plugin scanner");
     > -
     > - #ifdef G_OS_WIN32
     > -@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader *
    loader)
     > - #endif
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > -+  }
     > -
     > --    if (!res) {
     > --      GST_INFO ("No gst-plugin-scanner available, or not working");
     > --    }
     > -+  if (!res) {
     > -+    GST_INFO ("No gst-plugin-scanner available, or not working");
     > -   }
     > -
     > -   return loader->child_running;
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
     > similarity index 71%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
     > index 6f571a12d8..312c04fbfd 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-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 @@
     > -From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17
    00:00:00 2001
     > +From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 1/4] tests: respect the idententaion used in meson
     > @@ -7,13 +7,13 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 10 +++++-----
     > + subprojects/gstreamer/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 a617cf159..b2636714b 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 9c4228b6e4..506606684d 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -146,11 +146,11 @@ foreach t : core_tests
     >
     >     if not skip_test
     > @@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
     >
     >       env = environment()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     > deleted file mode 100644
     > index 5121044734..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     > +++ /dev/null
     > @@ -1,112 +0,0 @@
     > -From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17
    00:00:00 2001
     > -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]
    <mailto:[email protected]>>
     > -Date: Fri, 14 Aug 2020 16:38:26 +0100
     > -Subject: [PATCH 2/3] Remove unused valgrind detection
     > -
     > -Having this just to log a debug message in case we're
     > -running inside valgrind doesn't seem very useful, and
     > -the code that used to use this no longer exists it seems.
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>>
     > -
     > -Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gst_private.h |  2 --
     > - gst/gstinfo.c     | 39 ---------------------------------------
     > - meson.build       |  1 -
     > - 3 files changed, 42 deletions(-)
     > -
     > -diff --git a/gst/gst_private.h b/gst/gst_private.h
     > -index eefd044..8252ede 100644
     > ---- a/gst/gst_private.h
     > -+++ b/gst/gst_private.h
     > -@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean
    _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
     > -
     > - G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed
    (GstPlugin * plugin);
     > -
     > --G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
     > --
     > - /* init functions called from gst_init(). */
     > - G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
     > - G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize (void);
     > -diff --git a/gst/gstinfo.c b/gst/gstinfo.c
     > -index eea1a21..d3035d6 100644
     > ---- a/gst/gstinfo.c
     > -+++ b/gst/gstinfo.c
     > -@@ -305,36 +305,6 @@ static gboolean pretty_tags =
    PRETTY_TAGS_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON;
     > -
     > --/* FIXME: export this? */
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  static enum
     > --  {
     > --    GST_VG_UNCHECKED,
     > --    GST_VG_NO_VALGRIND,
     > --    GST_VG_INSIDE
     > --  }
     > --  in_valgrind = GST_VG_UNCHECKED;
     > --
     > --  if (in_valgrind == GST_VG_UNCHECKED) {
     > --#ifdef HAVE_VALGRIND_VALGRIND_H
     > --    if (RUNNING_ON_VALGRIND) {
     > --      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside
    valgrind");
     > --      in_valgrind = GST_VG_INSIDE;
     > --    } else {
     > --      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind
    stuff");
     > --      in_valgrind = GST_VG_NO_VALGRIND;
     > --    }
     > --#else
     > --    in_valgrind = GST_VG_NO_VALGRIND;
     > --#endif
     > --    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
     > --        in_valgrind == GST_VG_INSIDE);
     > --  }
     > --  return (in_valgrind == GST_VG_INSIDE);
     > --}
     > --
     > - static gchar *
     > - _replace_pattern_in_gst_debug_file_name (gchar * name, const
    char *token,
     > -     guint val)
     > -@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
     > -   _priv_GST_CAT_PROTECTION =
     > -       _gst_debug_category_new ("GST_PROTECTION", 0, "protection");
     > -
     > --  /* print out the valgrind message if we're in valgrind */
     > --  _priv_gst_in_valgrind ();
     > --
     > -   env = g_getenv ("GST_DEBUG_OPTIONS");
     > -   if (env != NULL) {
     > -     if (strstr (env, "full_tags") || strstr (env, "full-tags"))
     > -@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint
    colorinfo)
     > -   return 0;
     > - }
     > -
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  return FALSE;
     > --}
     > --
     > - void
     > - _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
     > -     const gchar * func, gint line, GObject * obj, const gchar *
    msg,
     > -diff --git a/meson.build b/meson.build
     > -index 82a1728..42ae617 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -200,7 +200,6 @@ check_headers = [
     > -   'sys/wait.h',
     > -   'ucontext.h',
     > -   'unistd.h',
     > --  'valgrind/valgrind.h',
     > -   'sys/resource.h',
     > -   'sys/uio.h',
     > - ]
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
     > similarity index 65%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
     > index b77fb5797f..d18c19c397 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-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 @@
     > -From c9e93c7a3e4d2773abef4f5e1464af24f36700b3 Mon Sep 17
    00:00:00 2001
     > +From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 2/4] tests: add support for install the tests
     > @@ -11,54 +11,44 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - meson.build             |  5 +++++
     > - meson_options.txt       |  1 +
     > - template.test.in <http://template.test.in>        |  3 +++
     > - tests/check/meson.build | 22 +++++++++++++++++++++-
     > - 4 files changed, 30 insertions(+), 1 deletion(-)
     > - create mode 100644 template.test.in <http://template.test.in>
     > + subprojects/gstreamer/meson.build             |  4 ++++
     > + subprojects/gstreamer/meson_options.txt       |  1 +
     > + subprojects/gstreamer/tests/check/meson.build | 22
    ++++++++++++++++++-
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>    |  3 +++
     > + 4 files changed, 29 insertions(+), 1 deletion(-)
     > + create mode 100644
    subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     >
     > -diff --git a/meson.build b/meson.build
     > -index c4e8774f5..1abf4eb26 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -562,6 +562,11 @@ if bashcomp_dep.found()
     > +diff --git a/subprojects/gstreamer/meson.build
    b/subprojects/gstreamer/meson.build
     > +index d20fe0040f..b595d8f990 100644
     > +--- a/subprojects/gstreamer/meson.build
     > ++++ b/subprojects/gstreamer/meson.build
     > +@@ -562,6 +562,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())
     > -+installed_tests_enabled = get_option('installed-tests')
     > -+installed_tests_template = files('template.test.in
    <http://template.test.in>')
     >  +
     >   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 c8cee3762..b5da40eaa 100644
     > ---- a/meson_options.txt
     > -+++ b/meson_options.txt
     > +diff --git a/subprojects/gstreamer/meson_options.txt
    b/subprojects/gstreamer/meson_options.txt
     > +index 7363bdb7a1..a34ba37dad 100644
     > +--- a/subprojects/gstreamer/meson_options.txt
     > ++++ b/subprojects/gstreamer/meson_options.txt
     >  @@ -15,6 +15,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')
     > ++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/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -new file mode 100644
     > -index 000000000..f701627f8
     > ---- /dev/null
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -0,0 +1,3 @@
     > -+[Test]
     > -+Type=session
     > -+Exec=@installed_tests_dir@/@program@
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index b2636714b..a697a7b06 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 506606684d..00a138a568 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -124,10 +124,16 @@ test_defines = [
     >     '-UG_DISABLE_ASSERT',
     >     '-UG_DISABLE_CAST_CHECKS',
     > @@ -95,7 +85,7 @@ index b2636714b..a697a7b06 100644
     >  +      test_conf.set('installed_tests_dir', join_paths(prefix,
    installed_tests_execdir))
     >  +      test_conf.set('program', test_name)
     >  +      configure_file(
     > -+        input: installed_tests_template,
     > ++        input: 'template.test.in <http://template.test.in>',
     >  +        output: test_name + '.test',
     >  +        install_dir: installed_tests_metadir,
     >  +        configuration: test_conf
     > @@ -105,6 +95,15 @@ index b2636714b..a697a7b06 100644
     >       test(test_name, exe, env: env, timeout : 3 * 60)
     >     endif
     >   endforeach
     > +diff --git a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +new file mode 100644
     > +index 0000000000..f701627f87
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -0,0 +1,3 @@
     > ++[Test]
     > ++Type=session
     > ++Exec=@installed_tests_dir@/@program@
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     > deleted file mode 100644
     > index e0e64e2c7a..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     > +++ /dev/null
     > @@ -1,32 +0,0 @@
     > -From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17
    00:00:00 2001
     > -From: Seungha Yang <[email protected]
    <mailto:[email protected]>>
     > -Date: Tue, 15 Sep 2020 00:54:58 +0900
     > -Subject: [PATCH] tests: seek: Don't use too strict timeout for
    validation
     > -
     > -Expected segment-done message might not be seen within expected
     > -time if system is not powerful enough.
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>>
     > -
     > -Upstream-Status: Backport
    [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c
    <https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c>]
     > -Signed-off-by: Anuj Mittal <[email protected]
    <mailto:[email protected]>>
     > ----
     > - tests/check/pipelines/seek.c | 2 +-
     > - 1 file changed, 1 insertion(+), 1 deletion(-)
     > -
     > -diff --git a/tests/check/pipelines/seek.c
    b/tests/check/pipelines/seek.c
     > -index 28bb8846d..5f7447bc5 100644
     > ---- a/tests/check/pipelines/seek.c
     > -+++ b/tests/check/pipelines/seek.c
     > -@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
     > -
     > -   GST_INFO ("wait for segment done message");
     > -
     > --  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 *
    GST_SECOND,
     > -+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
     > -       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
     > -   fail_unless (msg, "no message within the timed window");
     > -   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg),
    "segment-done");
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
     > similarity index 61%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
     > index 46813cec3d..10a6dcc619 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-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 @@
     > -From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17
    00:00:00 2001
     > +From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sat, 24 Apr 2021 10:34:47 +0100
     >  Subject: [PATCH 3/4] tests: use a dictionaries for environment
     > @@ -10,29 +10,31 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 19 +++++++++++--------
     > - 1 file changed, 11 insertions(+), 8 deletions(-)
     > + subprojects/gstreamer/tests/check/meson.build | 21
    ++++++++++++-------
     > + 1 file changed, 13 insertions(+), 8 deletions(-)
     >
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index a697a7b06..f64524904 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -161,14 +161,17 @@ foreach t : core_tests
     > +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
     >         install: installed_tests_enabled,
     >       )
     >
     >  -    env = environment()
     > --    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
     > +-    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@/@[email protected]'.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')
     > -+    # 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
     > ++    # 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.build_root(),
     > ++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
     >  +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
     >  +      'GST_STATE_IGNORE_ELEMENTS': '',
     >  +      'CK_DEFAULT_TIMEOUT': '20',
     > @@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
     >       if installed_tests_enabled
     >         test_conf = configuration_data()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > 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
     > new file mode 100644
     > index 0000000000..efa004f8ce
     > --- /dev/null
     > +++
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
     > @@ -0,0 +1,74 @@
     > +From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17
    00:00:00 2001
     > +From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +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
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]
     > +
     > +Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +---
     > + subprojects/gstreamer/tests/check/meson.build   | 17
    +++++++++++++++++
     > + .../gstreamer/tests/check/template.sh.in
    <http://template.sh.in>        |  9 +++++++++
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>      |  2 +-
     > + 3 files changed, 27 insertions(+), 1 deletion(-)
     > + create mode 100755
    subprojects/gstreamer/tests/check/template.sh.in <http://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
     > +@@ -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/@[email protected] 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/@[email protected]'.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 <http://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/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
    b/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
     > +new file mode 100755
     > +index 0000000000..cf7d31b0ea
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.sh.in
    <http://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/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +index f701627f87..b74ef6ad73 100644
     > +--- a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -1,3 +1,3 @@
     > + [Test]
     > + Type=session
     > +-Exec=@installed_tests_dir@/@program@
     > ++Exec=@installed_tests_dir@/@[email protected]
     > +--
     > +2.33.1
     > +
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     > deleted file mode 100644
     > index eabe7bcbe1..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     > +++ /dev/null
     > @@ -1,58 +0,0 @@
     > -From 57d2965e979f886e03eecd7e351bf01812053971 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sun, 2 May 2021 01:58:01 +0100
     > -Subject: [PATCH 4/4] tests: install the environment for
    installed_tests
     > -
     > -- adapt the test environment for installed_tests
     > -- install the test environment for installed_tests
     > -- run the tests using the installed environment
     > -
     > -Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - template.test.in <http://template.test.in>        |  2 +-
     > - tests/check/meson.build | 18 ++++++++++++++++++
     > - 2 files changed, 19 insertions(+), 1 deletion(-)
     > -
     > -diff --git a/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -index f701627f8..9a3fbdd09 100644
     > ---- a/template.test.in <http://template.test.in>
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -1,3 +1,3 @@
     > - [Test]
     > - Type=session
     > --Exec=@installed_tests_dir@/@program@
     > -+Exec=sh -c 'set -aex && source
    @installed_tests_dir@/@[email protected] && exec
    @installed_tests_dir@/@program@'
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index f64524904..a67e0f8dd 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -183,6 +183,24 @@ foreach t : core_tests
     > -         install_dir: installed_tests_metadir,
     > -         configuration: test_conf
     > -       )
     > -+
     > -+      env += {'GST_REGISTRY':
    '~/.cache/gstreamer-1.0/@[email protected]'.format(test_name)}
     > -+      configure_file(
     > -+        output: test_name + '.env',
     > -+        install_dir: installed_tests_execdir,
     > -+        configuration : env,
     > -+      )
     > -+      # helper to convert a meson environment dictionay object
    exported with configure_file
     > -+      # this also remove not needed variables for the installed
    tests
     > -+      meson.add_postconf_script('sed', '-i',
     > -+        '-e', '/^#define/!d',
     > -+        '-e', 's/^#define //g',
     > -+        '-e', '/^GST_PLUGIN_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SYSTEM_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SCANNER_1_0/d',
     > -+        '-e', 's/ /=/',
     > -+        join_paths(meson.current_build_dir(), test_name + '.env')
     > -+      )
     > -     endif
     > -
     > -     test(test_name, exe, env: env, timeout : 3 * 60)
     > ---
     > -2.31.1
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > similarity index 76%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > index 0d82dd338c..243f99fee9 100644
     > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > @@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2
    bison-native flex-native"
     >
     >  inherit meson pkgconfig gettext upstream-version-is-even
    gobject-introspection ptest-gnome
     >
     > -LIC_FILES_CHKSUM =
    "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
     > +LIC_FILES_CHKSUM =
    "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
     >                     
    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
     >
     >  S = "${WORKDIR}/gstreamer-${PV}"
     >
     >  SRC_URI =
    "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz
    <https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$%7BPV%7D.tar.xz>
    \
     >             file://run-ptest \
     > -         
      file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
     > -           file://0002-Remove-unused-valgrind-detection.patch \
     > -         
      file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \
     > -         
      file://0004-tests-respect-the-idententaion-used-in-meson.patch \
     > -         
      file://0005-tests-add-support-for-install-the-tests.patch \
     > -         
      file://0006-tests-use-a-dictionaries-for-environment.patch \
     > -         
      file://0007-tests-install-the-environment-for-installed_tests.patch \
     > +         
      file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3 \
     > +         
      file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \
     > +         
      file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
     > +         
      file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
     >             "
     > -SRC_URI[sha256sum] =
    "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"
     > +SRC_URI[sha256sum] =
    "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"
     >
     >  PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1',
    'tests', '', d)} \
     >                     check \
     > @@ -36,7 +33,7 @@ PACKAGECONFIG[debug] =
    "-Dgst_debug=true,-Dgst_debug=false"
     >  PACKAGECONFIG[tracer-hooks] =
    "-Dtracer_hooks=true,-Dtracer_hooks=false"
     >  PACKAGECONFIG[coretracers] =
    "-Dcoretracers=enabled,-Dcoretracers=disabled"
     >  PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
     > -PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
     > +PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"
     >  PACKAGECONFIG[unwind] =
    "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
     >  PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
     >  PACKAGECONFIG[bash-completion] =
    "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
     > --
     > 2.35.1
     >
     >
     > -=-=-=-=-=-=-=-=-=-=-=-
     > Links: You receive all messages sent to this group.
     > View/Reply Online (#161427):
    https://lists.openembedded.org/g/openembedded-core/message/161427
    <https://lists.openembedded.org/g/openembedded-core/message/161427>
     > Mute This Topic:
    https://lists.openembedded.org/mt/88962313/1686489
    <https://lists.openembedded.org/mt/88962313/1686489>
     > Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
     > Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    <https://lists.openembedded.org/g/openembedded-core/unsub>
    [[email protected] <mailto:[email protected]>]
     > -=-=-=-=-=-=-=-=-=-=-=-
     >
Signature · 3 lines
Best regards,

José Quaresma
Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]
#10 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

Yes, it seems to be sporadic. Here's a sample fail:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/3083
https://autobuilder.yocto.io/pub/non-release/20220208-14/testresults/qemux86-64-ptest/gstreamer1.0.log

Alex

Quoted 977 lines · Claudius Heine

Hi Jose

Quoted 4 lines · Jose Quaresma

Hi Alexander,

Can you please clarify in what target arch is this happening and I can try to replicate it with qemu?

I think we are hitting:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778

This testcase seems to be flaky and IIUC upstream marked it as such in their test infrastructure.

In my patchset, I added a patch to disable that testcase.

regards,
Claudius

Quoted 948 lines

It works on my side on qemux86-64.

root@qemux86-64:~# /usr/libexec/installed-tests/gstreamer/gst_gstbin.sh
+ CK_DEFAULT_TIMEOUT=20
+ GST_PLUGIN_LOADING_WHITELIST=gstreamer
+ GST_REGISTRY=/home/root/.cache/gstreamer-1.0/gst_gstbin.registry
+ GST_STATE_IGNORE_ELEMENTS=
+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
Running suite(s): GstBin
100%: Checks: 26, Failures: 0, Errors: 0
Check suite gst_bin ran in 6.239s (tests failed: 0)

Alexander Kanavin <[email protected] <mailto:[email protected]>> escreveu no dia terça, 8/02/2022 à(s) 22:01:

    Unfortunately this patchset (which is now in master) does not address
    the ptest fail. Please resolve this as soon as possible.

    + exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
    Running suite(s): GstBin
    Executing: gstreamer/gst_gstbin.test
    Executing: gstreamer/gst_gstbin.test
    ....
    Executing: gstreamer/gst_gstbin.test
    Executing: gstreamer/gst_gstbin.test
    Test timed out after 300 seconds
    FAIL: gstreamer/gst_gstbin.test (Child process killed by signal 9)

    Alex

    On Mon, 7 Feb 2022 at 02:08, Jose Quaresma <[email protected]
    <mailto:[email protected]>> wrote:
     >
     > - License update:
     >   The code actually is LGPLv2.1 but the COPYING file is wrong.
     >
    https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042>
     >
     > - Drop backported patches
     >   0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     >   0002-Remove-unused-valgrind-detection.patch
     >   0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     >
     > - Update submitted patches
     >   0001-tests-respect-the-idententaion-used-in-meson.patch
     >   0002-tests-add-support-for-install-the-tests.patch
     >   0003-tests-use-a-dictionaries-for-environment.patch
     >   0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >
     > Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ---
     >  ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
     >  ...pect-the-idententaion-used-in-meson.patch} |  14 +--
     >  ...002-Remove-unused-valgrind-detection.patch | 112
    ------------------
     >  ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
     >  ...-use-too-strict-timeout-for-validati.patch |  32 -----
     >  ...-use-a-dictionaries-for-environment.patch} |  28 +++--
     >  ...er-script-to-run-the-installed_tests.patch |  74 ++++++++++++
     >  ...-the-environment-for-installed_tests.patch |  58 ---------
     >  ...er1.0_1.18.5.bb <http://er1.0_1.18.5.bb> =>
    gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} |  17 ++-
     >  9 files changed, 136 insertions(+), 335 deletions(-)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch
    => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch
    => 0002-tests-add-support-for-install-the-tests.patch} (65%)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch
    => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)
     >  create mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     >  rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>} (76%)
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     > deleted file mode 100644
     > index 23ebd5c600..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     > +++ /dev/null
     > @@ -1,69 +0,0 @@
     > -From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sat, 10 Oct 2020 19:09:03 +0000
     > -Subject: [PATCH 1/3] gstpluginloader: when env var is set do not
    fall through
     > - to system plugin scanner
     > -
     > -If we set a custom GST_PLUGIN_SCANNER env var, then we probably
    want to use that and only that.
     > -
     > -Falling through to the one installed on the system is
    problamatic in cross-compilation
     > -environemnts, regardless of whether one pointed to by the env
    var succeeded or failed.
     > -
     > -taken from:
     >
    -http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b
    <http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b>
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>>
     > -
     > -Upstream-Status: Backport
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a>]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gstpluginloader.c | 15 +++++++--------
     > - 1 file changed, 7 insertions(+), 8 deletions(-)
     > -
     > -diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
     > -index d1e404d98..c626bf263 100644
     > ---- a/gst/gstpluginloader.c
     > -+++ b/gst/gstpluginloader.c
     > -@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader *
    loader)
     > -   if (loader->child_running)
     > -     return TRUE;
     > -
     > --  /* Find the gst-plugin-scanner: first try the env-var if it
    is set,
     > --   * otherwise use the installed version */
     > -+  /* Find the gst-plugin-scanner */
     > -   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
     > -   if (env == NULL)
     > -     env = g_getenv ("GST_PLUGIN_SCANNER");
     > -
     > -   if (env != NULL && *env != '\0') {
     > -+    /* use the env-var if it is set */
     > -     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
     > -     helper_bin = g_strdup (env);
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > --  }
     > --
     > --  if (!res) {
     > -+  } else {
     > -+    /* use the installed version */
     > -     GST_LOG ("Trying installed plugin scanner");
     > -
     > - #ifdef G_OS_WIN32
     > -@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader *
    loader)
     > - #endif
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > -+  }
     > -
     > --    if (!res) {
     > --      GST_INFO ("No gst-plugin-scanner available, or not working");
     > --    }
     > -+  if (!res) {
     > -+    GST_INFO ("No gst-plugin-scanner available, or not working");
     > -   }
     > -
     > -   return loader->child_running;
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
     > similarity index 71%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
     > index 6f571a12d8..312c04fbfd 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-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 @@
     > -From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17
    00:00:00 2001
     > +From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 1/4] tests: respect the idententaion used in meson
     > @@ -7,13 +7,13 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 10 +++++-----
     > + subprojects/gstreamer/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 a617cf159..b2636714b 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 9c4228b6e4..506606684d 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -146,11 +146,11 @@ foreach t : core_tests
     >
     >     if not skip_test
     > @@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
     >
     >       env = environment()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     > deleted file mode 100644
     > index 5121044734..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     > +++ /dev/null
     > @@ -1,112 +0,0 @@
     > -From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17
    00:00:00 2001
     > -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]
    <mailto:[email protected]>>
     > -Date: Fri, 14 Aug 2020 16:38:26 +0100
     > -Subject: [PATCH 2/3] Remove unused valgrind detection
     > -
     > -Having this just to log a debug message in case we're
     > -running inside valgrind doesn't seem very useful, and
     > -the code that used to use this no longer exists it seems.
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>>
     > -
     > -Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gst_private.h |  2 --
     > - gst/gstinfo.c     | 39 ---------------------------------------
     > - meson.build       |  1 -
     > - 3 files changed, 42 deletions(-)
     > -
     > -diff --git a/gst/gst_private.h b/gst/gst_private.h
     > -index eefd044..8252ede 100644
     > ---- a/gst/gst_private.h
     > -+++ b/gst/gst_private.h
     > -@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean
    _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
     > -
     > - G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed
    (GstPlugin * plugin);
     > -
     > --G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
     > --
     > - /* init functions called from gst_init(). */
     > - G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
     > - G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize (void);
     > -diff --git a/gst/gstinfo.c b/gst/gstinfo.c
     > -index eea1a21..d3035d6 100644
     > ---- a/gst/gstinfo.c
     > -+++ b/gst/gstinfo.c
     > -@@ -305,36 +305,6 @@ static gboolean pretty_tags =
    PRETTY_TAGS_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON;
     > -
     > --/* FIXME: export this? */
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  static enum
     > --  {
     > --    GST_VG_UNCHECKED,
     > --    GST_VG_NO_VALGRIND,
     > --    GST_VG_INSIDE
     > --  }
     > --  in_valgrind = GST_VG_UNCHECKED;
     > --
     > --  if (in_valgrind == GST_VG_UNCHECKED) {
     > --#ifdef HAVE_VALGRIND_VALGRIND_H
     > --    if (RUNNING_ON_VALGRIND) {
     > --      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside
    valgrind");
     > --      in_valgrind = GST_VG_INSIDE;
     > --    } else {
     > --      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind
    stuff");
     > --      in_valgrind = GST_VG_NO_VALGRIND;
     > --    }
     > --#else
     > --    in_valgrind = GST_VG_NO_VALGRIND;
     > --#endif
     > --    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
     > --        in_valgrind == GST_VG_INSIDE);
     > --  }
     > --  return (in_valgrind == GST_VG_INSIDE);
     > --}
     > --
     > - static gchar *
     > - _replace_pattern_in_gst_debug_file_name (gchar * name, const
    char *token,
     > -     guint val)
     > -@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
     > -   _priv_GST_CAT_PROTECTION =
     > -       _gst_debug_category_new ("GST_PROTECTION", 0, "protection");
     > -
     > --  /* print out the valgrind message if we're in valgrind */
     > --  _priv_gst_in_valgrind ();
     > --
     > -   env = g_getenv ("GST_DEBUG_OPTIONS");
     > -   if (env != NULL) {
     > -     if (strstr (env, "full_tags") || strstr (env, "full-tags"))
     > -@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint
    colorinfo)
     > -   return 0;
     > - }
     > -
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  return FALSE;
     > --}
     > --
     > - void
     > - _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
     > -     const gchar * func, gint line, GObject * obj, const gchar *
    msg,
     > -diff --git a/meson.build b/meson.build
     > -index 82a1728..42ae617 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -200,7 +200,6 @@ check_headers = [
     > -   'sys/wait.h',
     > -   'ucontext.h',
     > -   'unistd.h',
     > --  'valgrind/valgrind.h',
     > -   'sys/resource.h',
     > -   'sys/uio.h',
     > - ]
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
     > similarity index 65%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
     > index b77fb5797f..d18c19c397 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-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 @@
     > -From c9e93c7a3e4d2773abef4f5e1464af24f36700b3 Mon Sep 17
    00:00:00 2001
     > +From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 2/4] tests: add support for install the tests
     > @@ -11,54 +11,44 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - meson.build             |  5 +++++
     > - meson_options.txt       |  1 +
     > - template.test.in <http://template.test.in>        |  3 +++
     > - tests/check/meson.build | 22 +++++++++++++++++++++-
     > - 4 files changed, 30 insertions(+), 1 deletion(-)
     > - create mode 100644 template.test.in <http://template.test.in>
     > + subprojects/gstreamer/meson.build             |  4 ++++
     > + subprojects/gstreamer/meson_options.txt       |  1 +
     > + subprojects/gstreamer/tests/check/meson.build | 22
    ++++++++++++++++++-
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>    |  3 +++
     > + 4 files changed, 29 insertions(+), 1 deletion(-)
     > + create mode 100644
    subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     >
     > -diff --git a/meson.build b/meson.build
     > -index c4e8774f5..1abf4eb26 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -562,6 +562,11 @@ if bashcomp_dep.found()
     > +diff --git a/subprojects/gstreamer/meson.build
    b/subprojects/gstreamer/meson.build
     > +index d20fe0040f..b595d8f990 100644
     > +--- a/subprojects/gstreamer/meson.build
     > ++++ b/subprojects/gstreamer/meson.build
     > +@@ -562,6 +562,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())
     > -+installed_tests_enabled = get_option('installed-tests')
     > -+installed_tests_template = files('template.test.in
    <http://template.test.in>')
     >  +
     >   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 c8cee3762..b5da40eaa 100644
     > ---- a/meson_options.txt
     > -+++ b/meson_options.txt
     > +diff --git a/subprojects/gstreamer/meson_options.txt
    b/subprojects/gstreamer/meson_options.txt
     > +index 7363bdb7a1..a34ba37dad 100644
     > +--- a/subprojects/gstreamer/meson_options.txt
     > ++++ b/subprojects/gstreamer/meson_options.txt
     >  @@ -15,6 +15,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')
     > ++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/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -new file mode 100644
     > -index 000000000..f701627f8
     > ---- /dev/null
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -0,0 +1,3 @@
     > -+[Test]
     > -+Type=session
     > -+Exec=@installed_tests_dir@/@program@
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index b2636714b..a697a7b06 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 506606684d..00a138a568 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -124,10 +124,16 @@ test_defines = [
     >     '-UG_DISABLE_ASSERT',
     >     '-UG_DISABLE_CAST_CHECKS',
     > @@ -95,7 +85,7 @@ index b2636714b..a697a7b06 100644
     >  +      test_conf.set('installed_tests_dir', join_paths(prefix,
    installed_tests_execdir))
     >  +      test_conf.set('program', test_name)
     >  +      configure_file(
     > -+        input: installed_tests_template,
     > ++        input: 'template.test.in <http://template.test.in>',
     >  +        output: test_name + '.test',
     >  +        install_dir: installed_tests_metadir,
     >  +        configuration: test_conf
     > @@ -105,6 +95,15 @@ index b2636714b..a697a7b06 100644
     >       test(test_name, exe, env: env, timeout : 3 * 60)
     >     endif
     >   endforeach
     > +diff --git a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +new file mode 100644
     > +index 0000000000..f701627f87
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -0,0 +1,3 @@
     > ++[Test]
     > ++Type=session
     > ++Exec=@installed_tests_dir@/@program@
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     > deleted file mode 100644
     > index e0e64e2c7a..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     > +++ /dev/null
     > @@ -1,32 +0,0 @@
     > -From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17
    00:00:00 2001
     > -From: Seungha Yang <[email protected]
    <mailto:[email protected]>>
     > -Date: Tue, 15 Sep 2020 00:54:58 +0900
     > -Subject: [PATCH] tests: seek: Don't use too strict timeout for
    validation
     > -
     > -Expected segment-done message might not be seen within expected
     > -time if system is not powerful enough.
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>>
     > -
     > -Upstream-Status: Backport
    [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c
    <https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c>]
     > -Signed-off-by: Anuj Mittal <[email protected]
    <mailto:[email protected]>>
     > ----
     > - tests/check/pipelines/seek.c | 2 +-
     > - 1 file changed, 1 insertion(+), 1 deletion(-)
     > -
     > -diff --git a/tests/check/pipelines/seek.c
    b/tests/check/pipelines/seek.c
     > -index 28bb8846d..5f7447bc5 100644
     > ---- a/tests/check/pipelines/seek.c
     > -+++ b/tests/check/pipelines/seek.c
     > -@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
     > -
     > -   GST_INFO ("wait for segment done message");
     > -
     > --  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 *
    GST_SECOND,
     > -+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
     > -       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
     > -   fail_unless (msg, "no message within the timed window");
     > -   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg),
    "segment-done");
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
     > similarity index 61%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
     > index 46813cec3d..10a6dcc619 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-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 @@
     > -From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17
    00:00:00 2001
     > +From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sat, 24 Apr 2021 10:34:47 +0100
     >  Subject: [PATCH 3/4] tests: use a dictionaries for environment
     > @@ -10,29 +10,31 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 19 +++++++++++--------
     > - 1 file changed, 11 insertions(+), 8 deletions(-)
     > + subprojects/gstreamer/tests/check/meson.build | 21
    ++++++++++++-------
     > + 1 file changed, 13 insertions(+), 8 deletions(-)
     >
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index a697a7b06..f64524904 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -161,14 +161,17 @@ foreach t : core_tests
     > +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
     >         install: installed_tests_enabled,
     >       )
     >
     >  -    env = environment()
     > --    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
     > +-    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@/@[email protected]'.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')
     > -+    # 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
     > ++    # 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.build_root(),
     > ++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
     >  +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
     >  +      'GST_STATE_IGNORE_ELEMENTS': '',
     >  +      'CK_DEFAULT_TIMEOUT': '20',
     > @@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
     >       if installed_tests_enabled
     >         test_conf = configuration_data()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > 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
     > new file mode 100644
     > index 0000000000..efa004f8ce
     > --- /dev/null
     > +++
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
     > @@ -0,0 +1,74 @@
     > +From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17
    00:00:00 2001
     > +From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +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
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]
     > +
     > +Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +---
     > + subprojects/gstreamer/tests/check/meson.build   | 17
    +++++++++++++++++
     > + .../gstreamer/tests/check/template.sh.in
    <http://template.sh.in>        |  9 +++++++++
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>      |  2 +-
     > + 3 files changed, 27 insertions(+), 1 deletion(-)
     > + create mode 100755
    subprojects/gstreamer/tests/check/template.sh.in <http://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
     > +@@ -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/@[email protected] 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/@[email protected]'.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 <http://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/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
    b/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
     > +new file mode 100755
     > +index 0000000000..cf7d31b0ea
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.sh.in
    <http://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/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +index f701627f87..b74ef6ad73 100644
     > +--- a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -1,3 +1,3 @@
     > + [Test]
     > + Type=session
     > +-Exec=@installed_tests_dir@/@program@
     > ++Exec=@installed_tests_dir@/@[email protected]
     > +--
     > +2.33.1
     > +
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     > deleted file mode 100644
     > index eabe7bcbe1..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     > +++ /dev/null
     > @@ -1,58 +0,0 @@
     > -From 57d2965e979f886e03eecd7e351bf01812053971 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sun, 2 May 2021 01:58:01 +0100
     > -Subject: [PATCH 4/4] tests: install the environment for
    installed_tests
     > -
     > -- adapt the test environment for installed_tests
     > -- install the test environment for installed_tests
     > -- run the tests using the installed environment
     > -
     > -Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - template.test.in <http://template.test.in>        |  2 +-
     > - tests/check/meson.build | 18 ++++++++++++++++++
     > - 2 files changed, 19 insertions(+), 1 deletion(-)
     > -
     > -diff --git a/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -index f701627f8..9a3fbdd09 100644
     > ---- a/template.test.in <http://template.test.in>
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -1,3 +1,3 @@
     > - [Test]
     > - Type=session
     > --Exec=@installed_tests_dir@/@program@
     > -+Exec=sh -c 'set -aex && source
    @installed_tests_dir@/@[email protected] && exec
    @installed_tests_dir@/@program@'
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index f64524904..a67e0f8dd 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -183,6 +183,24 @@ foreach t : core_tests
     > -         install_dir: installed_tests_metadir,
     > -         configuration: test_conf
     > -       )
     > -+
     > -+      env += {'GST_REGISTRY':
    '~/.cache/gstreamer-1.0/@[email protected]'.format(test_name)}
     > -+      configure_file(
     > -+        output: test_name + '.env',
     > -+        install_dir: installed_tests_execdir,
     > -+        configuration : env,
     > -+      )
     > -+      # helper to convert a meson environment dictionay object
    exported with configure_file
     > -+      # this also remove not needed variables for the installed
    tests
     > -+      meson.add_postconf_script('sed', '-i',
     > -+        '-e', '/^#define/!d',
     > -+        '-e', 's/^#define //g',
     > -+        '-e', '/^GST_PLUGIN_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SYSTEM_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SCANNER_1_0/d',
     > -+        '-e', 's/ /=/',
     > -+        join_paths(meson.current_build_dir(), test_name + '.env')
     > -+      )
     > -     endif
     > -
     > -     test(test_name, exe, env: env, timeout : 3 * 60)
     > ---
     > -2.31.1
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > similarity index 76%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > index 0d82dd338c..243f99fee9 100644
     > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > @@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2
    bison-native flex-native"
     >
     >  inherit meson pkgconfig gettext upstream-version-is-even
    gobject-introspection ptest-gnome
     >
     > -LIC_FILES_CHKSUM =
    "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
     > +LIC_FILES_CHKSUM =
    "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
     >
    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
     >
     >  S = "${WORKDIR}/gstreamer-${PV}"
     >
     >  SRC_URI =
    "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz
    <https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$%7BPV%7D.tar.xz>
    \
     >             file://run-ptest \
     > -
      file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
     > -           file://0002-Remove-unused-valgrind-detection.patch \
     > -
      file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \
     > -
      file://0004-tests-respect-the-idententaion-used-in-meson.patch \
     > -
      file://0005-tests-add-support-for-install-the-tests.patch \
     > -
      file://0006-tests-use-a-dictionaries-for-environment.patch \
     > -
      file://0007-tests-install-the-environment-for-installed_tests.patch \
     > +
      file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3 \
     > +
      file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \
     > +
      file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
     > +
      file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
     >             "
     > -SRC_URI[sha256sum] =
    "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"
     > +SRC_URI[sha256sum] =
    "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"
     >
     >  PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1',
    'tests', '', d)} \
     >                     check \
     > @@ -36,7 +33,7 @@ PACKAGECONFIG[debug] =
    "-Dgst_debug=true,-Dgst_debug=false"
     >  PACKAGECONFIG[tracer-hooks] =
    "-Dtracer_hooks=true,-Dtracer_hooks=false"
     >  PACKAGECONFIG[coretracers] =
    "-Dcoretracers=enabled,-Dcoretracers=disabled"
     >  PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
     > -PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
     > +PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"
     >  PACKAGECONFIG[unwind] =
    "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
     >  PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
     >  PACKAGECONFIG[bash-completion] =
    "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
     > --
     > 2.35.1
     >
     >
     > -=-=-=-=-=-=-=-=-=-=-=-
     > Links: You receive all messages sent to this group.
     > View/Reply Online (#161427):
    https://lists.openembedded.org/g/openembedded-core/message/161427
    <https://lists.openembedded.org/g/openembedded-core/message/161427>
     > Mute This Topic:
    https://lists.openembedded.org/mt/88962313/1686489
    <https://lists.openembedded.org/mt/88962313/1686489>
     > Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
     > Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    <https://lists.openembedded.org/g/openembedded-core/unsub>
    [[email protected] <mailto:[email protected]>]
     > -=-=-=-=-=-=-=-=-=-=-=-
     >
Quoted 4 lines

--
Best regards,

José Quaresma

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]

#11 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

Alexander Kanavin <[email protected]> escreveu no dia quarta, 9/02/2022 à(s) 10:34:

Quoted 5 lines

Yes, it seems to be sporadic. Here's a sample fail:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/3083

https://autobuilder.yocto.io/pub/non-release/20220208-14/testresults/qemux86-64-ptest/gstreamer1.0.log

I ask for help upstream but I will try to replicate this with GST_DEBUG enabled.
Which is the best option to send a patch not for merge but only to run on the autobuilder to generate some logs?

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778

Quoted 1,091 lines

Alex

Quoted 12 lines · Claudius Heine

Hi Jose

Quoted 4 lines · Jose Quaresma

Hi Alexander,

Can you please clarify in what target arch is this happening and I can try to replicate it with qemu?

I think we are hitting:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778

Quoted 12 lines

This testcase seems to be flaky and IIUC upstream marked it as such in their test infrastructure.

In my patchset, I added a patch to disable that testcase.

regards,
Claudius

Quoted 4 lines

It works on my side on qemux86-64.

root@qemux86-64:~#

/usr/libexec/installed-tests/gstreamer/gst_gstbin.sh

Quoted 10 lines
Quoted 10 lines

+ CK_DEFAULT_TIMEOUT=20
+ GST_PLUGIN_LOADING_WHITELIST=gstreamer
+ GST_REGISTRY=/home/root/.cache/gstreamer-1.0/gst_gstbin.registry
+ GST_STATE_IGNORE_ELEMENTS=
+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin Running suite(s): GstBin
100%: Checks: 26, Failures: 0, Errors: 0
Check suite gst_bin ran in 6.239s (tests failed: 0)

Quoted 5 lines
Quoted 5 lines

Alexander Kanavin <[email protected] <mailto:[email protected]>> escreveu no dia terça, 8/02/2022 à(s) 22:01:

Unfortunately this patchset (which is now in master) does not

address

Quoted 12 lines
Quoted 12 lines

the ptest fail. Please resolve this as soon as possible.

+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin Running suite(s): GstBin
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
....
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
Test timed out after 300 seconds
FAIL: gstreamer/gst_gstbin.test (Child process killed by signal 9)

Quoted 3 lines
Quoted 3 lines
    Alex

    On Mon, 7 Feb 2022 at 02:08, Jose Quaresma <

[email protected]

Quoted 6 lines
Quoted 6 lines

<mailto:[email protected]>> wrote:
>
> - License update:
> The code actually is LGPLv2.1 but the COPYING file is wrong.
>

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

Quoted 1 line
Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

Quoted 4 lines
Quoted 4 lines
     >
     > - Drop backported patches
     >

0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 2 lines
Quoted 2 lines
     >   0002-Remove-unused-valgrind-detection.patch
     >

0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 10 lines
Quoted 10 lines
     >
     > - Update submitted patches
     >   0001-tests-respect-the-idententaion-used-in-meson.patch
     >   0002-tests-add-support-for-install-the-tests.patch
     >   0003-tests-use-a-dictionaries-for-environment.patch
     >   0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >
     > Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ---
Quoted 8 lines
Quoted 8 lines
     >  ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
     >  ...pect-the-idententaion-used-in-meson.patch} |  14 +--
     >  ...002-Remove-unused-valgrind-detection.patch | 112
    ------------------
     >  ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
     >  ...-use-too-strict-timeout-for-validati.patch |  32 -----
     >  ...-use-a-dictionaries-for-environment.patch} |  28 +++--
     >  ...er-script-to-run-the-installed_tests.patch |  74

++++++++++++

Quoted 6 lines
Quoted 6 lines
     >  ...-the-environment-for-installed_tests.patch |  58 ---------
     >  ...er1.0_1.18.5.bb <http://er1.0_1.18.5.bb> =>
    gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} |  17 ++-
     >  9 files changed, 136 insertions(+), 335 deletions(-)
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 2 lines
Quoted 2 lines

> rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 3 lines
Quoted 3 lines
    => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 2 lines
Quoted 2 lines

> rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch

Quoted 3 lines
Quoted 3 lines
    => 0002-tests-add-support-for-install-the-tests.patch} (65%)
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 2 lines
Quoted 2 lines

> rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch

Quoted 3 lines
Quoted 3 lines
    => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)
     >  create mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 2 lines
Quoted 2 lines
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 1 line
Quoted 1 line
     >  rename meta/recipes-multimedia/gstreamer/{

gstreamer1.0_1.18.5.bb

Quoted 5 lines
Quoted 5 lines
    <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>} (76%)
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 4 lines
Quoted 4 lines
     > deleted file mode 100644
     > index 23ebd5c600..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 8 lines
Quoted 8 lines
     > +++ /dev/null
     > @@ -1,69 +0,0 @@
     > -From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sat, 10 Oct 2020 19:09:03 +0000
     > -Subject: [PATCH 1/3] gstpluginloader: when env var is set do

not

Quoted 6 lines
Quoted 6 lines

fall through
> - to system plugin scanner
> -
> -If we set a custom GST_PLUGIN_SCANNER env var, then we probably
want to use that and only that.
> -

Quoted 8 lines
Quoted 8 lines

> -Falling through to the one installed on the system is
problamatic in cross-compilation
> -environemnts, regardless of whether one pointed to by the env
var succeeded or failed.
> -
> -taken from:
>
-

http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b

Quoted 1 line
Quoted 1 line
    <

http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b

Quoted 4 lines
Quoted 4 lines
     > -
     > -Part-of:
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669

Quoted 1 line
Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>>

Quoted 3 lines
Quoted 3 lines
     > -
     > -Upstream-Status: Backport
    [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a

Quoted 1 line
Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a

Quoted 13 lines

]

Quoted 12 lines
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gstpluginloader.c | 15 +++++++--------
     > - 1 file changed, 7 insertions(+), 8 deletions(-)
     > -
     > -diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
     > -index d1e404d98..c626bf263 100644
     > ---- a/gst/gstpluginloader.c
     > -+++ b/gst/gstpluginloader.c
     > -@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader

*

Quoted 19 lines
Quoted 19 lines
    loader)
     > -   if (loader->child_running)
     > -     return TRUE;
     > -
     > --  /* Find the gst-plugin-scanner: first try the env-var if it
    is set,
     > --   * otherwise use the installed version */
     > -+  /* Find the gst-plugin-scanner */
     > -   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
     > -   if (env == NULL)
     > -     env = g_getenv ("GST_PLUGIN_SCANNER");
     > -
     > -   if (env != NULL && *env != '\0') {
     > -+    /* use the env-var if it is set */
     > -     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
     > -     helper_bin = g_strdup (env);
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > --  }
Quoted 8 lines
Quoted 8 lines
     > --
     > --  if (!res) {
     > -+  } else {
     > -+    /* use the installed version */
     > -     GST_LOG ("Trying installed plugin scanner");
     > -
     > - #ifdef G_OS_WIN32
     > -@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader

*

Quoted 8 lines
Quoted 8 lines
    loader)
     > - #endif
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > -+  }
     > -
     > --    if (!res) {
     > --      GST_INFO ("No gst-plugin-scanner available, or not

working");

Quoted 3 lines
Quoted 3 lines
     > --    }
     > -+  if (!res) {
     > -+    GST_INFO ("No gst-plugin-scanner available, or not

working");

Quoted 8 lines
Quoted 8 lines
     > -   }
     > -
     > -   return loader->child_running;
     > ---
     > -2.29.2
     > -
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 3 lines
Quoted 3 lines

> similarity index 71%
> rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 2 lines
Quoted 2 lines

> rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 3 lines
Quoted 3 lines
     > index 6f571a12d8..312c04fbfd 100644
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 2 lines
Quoted 2 lines
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 9 lines
Quoted 9 lines
     > @@ -1,4 +1,4 @@
     > -From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17
    00:00:00 2001
     > +From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 1/4] tests: respect the idententaion used in

meson

Quoted 24 lines
Quoted 24 lines
     > @@ -7,13 +7,13 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 10 +++++-----
     > + subprojects/gstreamer/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 a617cf159..b2636714b 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 9c4228b6e4..506606684d 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -146,11 +146,11 @@ foreach t : core_tests
     >
     >     if not skip_test
     > @@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
Quoted 8 lines
Quoted 8 lines
     >
     >       env = environment()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 4 lines
Quoted 4 lines
     > deleted file mode 100644
     > index 5121044734..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 5 lines
Quoted 5 lines
     > +++ /dev/null
     > @@ -1,112 +0,0 @@
     > -From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17
    00:00:00 2001
     > -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <

[email protected]

Quoted 10 lines
Quoted 10 lines
    <mailto:[email protected]>>
     > -Date: Fri, 14 Aug 2020 16:38:26 +0100
     > -Subject: [PATCH 2/3] Remove unused valgrind detection
     > -
     > -Having this just to log a debug message in case we're
     > -running inside valgrind doesn't seem very useful, and
     > -the code that used to use this no longer exists it seems.
     > -
     > -Part-of:
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595

Quoted 1 line
Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>>

Quoted 2 lines
Quoted 2 lines

> -
> -Upstream-Status: Backport

[a2cbf75523cdf8a4df1baa7007d86ef455972245]

Quoted 16 lines
Quoted 16 lines
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gst_private.h |  2 --
     > - gst/gstinfo.c     | 39 ---------------------------------------
     > - meson.build       |  1 -
     > - 3 files changed, 42 deletions(-)
     > -
     > -diff --git a/gst/gst_private.h b/gst/gst_private.h
     > -index eefd044..8252ede 100644
     > ---- a/gst/gst_private.h
     > -+++ b/gst/gst_private.h
     > -@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean
    _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
     > -
Quoted 8 lines
Quoted 8 lines
     > - G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed
    (GstPlugin * plugin);
     > -
     > --G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
     > --
     > - /* init functions called from gst_init(). */
     > - G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
     > - G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize

(void);

Quoted 7 lines
Quoted 7 lines
     > -diff --git a/gst/gstinfo.c b/gst/gstinfo.c
     > -index eea1a21..d3035d6 100644
     > ---- a/gst/gstinfo.c
     > -+++ b/gst/gstinfo.c
     > -@@ -305,36 +305,6 @@ static gboolean pretty_tags =
    PRETTY_TAGS_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __default_level =

GST_LEVEL_DEFAULT;

Quoted 1 line
Quoted 1 line

> - static gint G_GNUC_MAY_ALIAS __use_color =

GST_DEBUG_COLOR_MODE_ON;

Quoted 32 lines
Quoted 32 lines
     > -
     > --/* FIXME: export this? */
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  static enum
     > --  {
     > --    GST_VG_UNCHECKED,
     > --    GST_VG_NO_VALGRIND,
     > --    GST_VG_INSIDE
     > --  }
     > --  in_valgrind = GST_VG_UNCHECKED;
     > --
     > --  if (in_valgrind == GST_VG_UNCHECKED) {
     > --#ifdef HAVE_VALGRIND_VALGRIND_H
     > --    if (RUNNING_ON_VALGRIND) {
     > --      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside
    valgrind");
     > --      in_valgrind = GST_VG_INSIDE;
     > --    } else {
     > --      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind
    stuff");
     > --      in_valgrind = GST_VG_NO_VALGRIND;
     > --    }
     > --#else
     > --    in_valgrind = GST_VG_NO_VALGRIND;
     > --#endif
     > --    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
     > --        in_valgrind == GST_VG_INSIDE);
     > --  }
     > --  return (in_valgrind == GST_VG_INSIDE);
     > --}
Quoted 8 lines
Quoted 8 lines

> --
> - static gchar *
> - _replace_pattern_in_gst_debug_file_name (gchar * name, const
char *token,
> - guint val)
> -@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
> - _priv_GST_CAT_PROTECTION =
> - _gst_debug_category_new ("GST_PROTECTION", 0,

"protection");

Quoted 7 lines
Quoted 7 lines
     > -
     > --  /* print out the valgrind message if we're in valgrind */
     > --  _priv_gst_in_valgrind ();
     > --
     > -   env = g_getenv ("GST_DEBUG_OPTIONS");
     > -   if (env != NULL) {
     > -     if (strstr (env, "full_tags") || strstr (env,

"full-tags"))

Quoted 5 lines
Quoted 5 lines
     > -@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint
    colorinfo)
     > -   return 0;
     > - }
     > -
Quoted 8 lines
Quoted 8 lines
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  return FALSE;
     > --}
     > --
     > - void
     > - _gst_debug_dump_mem (GstDebugCategory * cat, const gchar *

file,

Quoted 1 line
Quoted 1 line

> - const gchar * func, gint line, GObject * obj, const gchar

*

Quoted 10 lines
Quoted 10 lines
    msg,
     > -diff --git a/meson.build b/meson.build
     > -index 82a1728..42ae617 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -200,7 +200,6 @@ check_headers = [
     > -   'sys/wait.h',
     > -   'ucontext.h',
     > -   'unistd.h',
     > --  'valgrind/valgrind.h',
Quoted 8 lines
Quoted 8 lines
     > -   'sys/resource.h',
     > -   'sys/uio.h',
     > - ]
     > ---
     > -2.29.2
     > -
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 3 lines
Quoted 3 lines

> similarity index 65%
> rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 2 lines
Quoted 2 lines

> rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 3 lines
Quoted 3 lines
     > index b77fb5797f..d18c19c397 100644
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 2 lines
Quoted 2 lines
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 66 lines
Quoted 66 lines
     > @@ -1,4 +1,4 @@
     > -From c9e93c7a3e4d2773abef4f5e1464af24f36700b3 Mon Sep 17
    00:00:00 2001
     > +From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 2/4] tests: add support for install the tests
     > @@ -11,54 +11,44 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - meson.build             |  5 +++++
     > - meson_options.txt       |  1 +
     > - template.test.in <http://template.test.in>        |  3 +++
     > - tests/check/meson.build | 22 +++++++++++++++++++++-
     > - 4 files changed, 30 insertions(+), 1 deletion(-)
     > - create mode 100644 template.test.in <http://template.test.in>
     > + subprojects/gstreamer/meson.build             |  4 ++++
     > + subprojects/gstreamer/meson_options.txt       |  1 +
     > + subprojects/gstreamer/tests/check/meson.build | 22
    ++++++++++++++++++-
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>    |  3 +++
     > + 4 files changed, 29 insertions(+), 1 deletion(-)
     > + create mode 100644
    subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     >
     > -diff --git a/meson.build b/meson.build
     > -index c4e8774f5..1abf4eb26 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -562,6 +562,11 @@ if bashcomp_dep.found()
     > +diff --git a/subprojects/gstreamer/meson.build
    b/subprojects/gstreamer/meson.build
     > +index d20fe0040f..b595d8f990 100644
     > +--- a/subprojects/gstreamer/meson.build
     > ++++ b/subprojects/gstreamer/meson.build
     > +@@ -562,6 +562,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())
     > -+installed_tests_enabled = get_option('installed-tests')
     > -+installed_tests_template = files('template.test.in
    <http://template.test.in>')
     >  +
     >   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 c8cee3762..b5da40eaa 100644
     > ---- a/meson_options.txt
     > -+++ b/meson_options.txt
     > +diff --git a/subprojects/gstreamer/meson_options.txt
    b/subprojects/gstreamer/meson_options.txt
Quoted 8 lines
Quoted 8 lines

> +index 7363bdb7a1..a34ba37dad 100644
> +--- a/subprojects/gstreamer/meson_options.txt
> ++++ b/subprojects/gstreamer/meson_options.txt
> @@ -15,6 +15,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'],

Quoted 8 lines
Quoted 8 lines

> value: 'malloc')
> -+option('installed-tests', type : 'boolean', value : false,
description : 'Enable installed tests')
> ++option('installed_tests', type : 'boolean', value : false,
description : 'Enable installed tests')
>
> # Feature options
> option('check', type : 'feature', value : 'auto', description

:

Quoted 30 lines
Quoted 30 lines
    'Build unit test libraries')
     > -diff --git a/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -new file mode 100644
     > -index 000000000..f701627f8
     > ---- /dev/null
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -0,0 +1,3 @@
     > -+[Test]
     > -+Type=session
     > -+Exec=@installed_tests_dir@/@program@
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index b2636714b..a697a7b06 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 506606684d..00a138a568 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -124,10 +124,16 @@ test_defines = [
     >     '-UG_DISABLE_ASSERT',
     >     '-UG_DISABLE_CAST_CHECKS',
     > @@ -95,7 +85,7 @@ index b2636714b..a697a7b06 100644
     >  +      test_conf.set('installed_tests_dir', join_paths(prefix,
    installed_tests_execdir))
     >  +      test_conf.set('program', test_name)
     >  +      configure_file(
     > -+        input: installed_tests_template,
     > ++        input: 'template.test.in <http://template.test.in>',
Quoted 8 lines
Quoted 8 lines
     >  +        output: test_name + '.test',
     >  +        install_dir: installed_tests_metadir,
     >  +        configuration: test_conf
     > @@ -105,6 +95,15 @@ index b2636714b..a697a7b06 100644
     >       test(test_name, exe, env: env, timeout : 3 * 60)
     >     endif
     >   endforeach
     > +diff --git a/subprojects/gstreamer/tests/check/

template.test.in

Quoted 10 lines
Quoted 10 lines
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +new file mode 100644
     > +index 0000000000..f701627f87
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -0,0 +1,3 @@
     > ++[Test]
Quoted 8 lines
Quoted 8 lines
     > ++Type=session
     > ++Exec=@installed_tests_dir@/@program@
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 4 lines
Quoted 4 lines
     > deleted file mode 100644
     > index e0e64e2c7a..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 7 lines
Quoted 7 lines
     > +++ /dev/null
     > @@ -1,32 +0,0 @@
     > -From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17
    00:00:00 2001
     > -From: Seungha Yang <[email protected]
    <mailto:[email protected]>>
     > -Date: Tue, 15 Sep 2020 00:54:58 +0900
Quoted 8 lines
Quoted 8 lines
     > -Subject: [PATCH] tests: seek: Don't use too strict timeout for
    validation
     > -
     > -Expected segment-done message might not be seen within expected
     > -time if system is not powerful enough.
     > -
     > -Part-of:
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625

Quoted 1 line
Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>>

Quoted 3 lines
Quoted 3 lines
     > -
     > -Upstream-Status: Backport
    [

https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c

Quoted 1 line
Quoted 1 line
    <

https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c

Quoted 28 lines

]

Quoted 27 lines
     > -Signed-off-by: Anuj Mittal <[email protected]
    <mailto:[email protected]>>
     > ----
     > - tests/check/pipelines/seek.c | 2 +-
     > - 1 file changed, 1 insertion(+), 1 deletion(-)
     > -
     > -diff --git a/tests/check/pipelines/seek.c
    b/tests/check/pipelines/seek.c
     > -index 28bb8846d..5f7447bc5 100644
     > ---- a/tests/check/pipelines/seek.c
     > -+++ b/tests/check/pipelines/seek.c
     > -@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
     > -
     > -   GST_INFO ("wait for segment done message");
     > -
     > --  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 *
    GST_SECOND,
     > -+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
     > -       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
     > -   fail_unless (msg, "no message within the timed window");
     > -   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg),
    "segment-done");
     > ---
     > -2.29.2
     > -
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 3 lines
Quoted 3 lines

> similarity index 61%
> rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 2 lines
Quoted 2 lines

> rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 3 lines
Quoted 3 lines
     > index 46813cec3d..10a6dcc619 100644
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 2 lines
Quoted 2 lines
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 40 lines
Quoted 40 lines
     > @@ -1,4 +1,4 @@
     > -From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17
    00:00:00 2001
     > +From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sat, 24 Apr 2021 10:34:47 +0100
     >  Subject: [PATCH 3/4] tests: use a dictionaries for environment
     > @@ -10,29 +10,31 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 19 +++++++++++--------
     > - 1 file changed, 11 insertions(+), 8 deletions(-)
     > + subprojects/gstreamer/tests/check/meson.build | 21
    ++++++++++++-------
     > + 1 file changed, 13 insertions(+), 8 deletions(-)
     >
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index a697a7b06..f64524904 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -161,14 +161,17 @@ foreach t : core_tests
     > +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
     >         install: installed_tests_enabled,
     >       )
     >
     >  -    env = environment()
     > --    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
     > +-    env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root())
     >  -    env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
Quoted 8 lines
Quoted 8 lines
     >  -    env.set('GST_STATE_IGNORE_ELEMENTS', '')
     >  -    env.set('CK_DEFAULT_TIMEOUT', '20')
     >  -    env.set('GST_REGISTRY',
    '@0@/@[email protected]'.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')
     > -+    # environment() can't be passed to configure_file and it

is

Quoted 16 lines
Quoted 16 lines
    needed for installed_tests
     > -+    # use a dictionary as this is simplest solution to install
    the environment
     > ++    # 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.build_root(),
     > ++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
     >  +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
     >  +      'GST_STATE_IGNORE_ELEMENTS': '',
     >  +      'CK_DEFAULT_TIMEOUT': '20',
     > @@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
Quoted 8 lines
Quoted 8 lines
     >       if installed_tests_enabled
     >         test_conf = configuration_data()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 5 lines
Quoted 5 lines
     > new file mode 100644
     > index 0000000000..efa004f8ce
     > --- /dev/null
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 7 lines
Quoted 7 lines
     > @@ -0,0 +1,74 @@
     > +From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17
    00:00:00 2001
     > +From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +Date: Sun, 2 May 2021 01:58:01 +0100
     > +Subject: [PATCH 4/4] tests: add helper script to run the
Quoted 8 lines
Quoted 8 lines

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

Quoted 1 line
Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]

Quoted 5 lines
Quoted 5 lines

> +
> +Signed-off-by: Jose Quaresma <[email protected]
<mailto:[email protected]>>
> +---
> + subprojects/gstreamer/tests/check/meson.build | 17

Quoted 8 lines
Quoted 8 lines
    +++++++++++++++++
     > + .../gstreamer/tests/check/template.sh.in
    <http://template.sh.in>        |  9 +++++++++
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>      |  2 +-
     > + 3 files changed, 27 insertions(+), 1 deletion(-)
     > + create mode 100755
    subprojects/gstreamer/tests/check/template.sh.in <

http://template.sh.in>

Quoted 4 lines
Quoted 4 lines
     > +
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 48ec2532f8..7dc4990d4e 100644
Quoted 8 lines
Quoted 8 lines

> +--- a/subprojects/gstreamer/tests/check/meson.build > ++++ b/subprojects/gstreamer/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

Quoted 35 lines
Quoted 35 lines
     > ++      # we use the home folder ~ for the registry which will
    then expand at runtime.
     > ++      # Using the /tmp/gstreamer-1.0/@[email protected] 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/@[email protected]'.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 <http://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/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
    b/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
     > +new file mode 100755
     > +index 0000000000..cf7d31b0ea
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
     > +@@ -0,0 +1,9 @@
     > ++#!/bin/sh
     > ++
Quoted 8 lines
Quoted 8 lines
     > ++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/subprojects/gstreamer/tests/check/

template.test.in

Quoted 10 lines
Quoted 10 lines
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +index f701627f87..b74ef6ad73 100644
     > +--- a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -1,3 +1,3 @@
     > + [Test]
Quoted 8 lines
Quoted 8 lines
     > + Type=session
     > +-Exec=@installed_tests_dir@/@program@
     > ++Exec=@installed_tests_dir@/@[email protected]
     > +--
     > +2.33.1
     > +
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 1 line
Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 4 lines
Quoted 4 lines
     > deleted file mode 100644
     > index eabe7bcbe1..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 8 lines
Quoted 8 lines
     > +++ /dev/null
     > @@ -1,58 +0,0 @@
     > -From 57d2965e979f886e03eecd7e351bf01812053971 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sun, 2 May 2021 01:58:01 +0100
     > -Subject: [PATCH 4/4] tests: install the environment for
Quoted 8 lines
Quoted 8 lines

installed_tests
> -
> -- adapt the test environment for installed_tests > -- install the test environment for installed_tests > -- run the tests using the installed environment > -
> -Upstream-Status: Submitted
[

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789

Quoted 1 line
Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]

Quoted 31 lines
Quoted 31 lines
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - template.test.in <http://template.test.in>        |  2 +-
     > - tests/check/meson.build | 18 ++++++++++++++++++
     > - 2 files changed, 19 insertions(+), 1 deletion(-)
     > -
     > -diff --git a/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -index f701627f8..9a3fbdd09 100644
     > ---- a/template.test.in <http://template.test.in>
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -1,3 +1,3 @@
     > - [Test]
     > - Type=session
     > --Exec=@installed_tests_dir@/@program@
     > -+Exec=sh -c 'set -aex && source
    @installed_tests_dir@/@[email protected] && exec
    @installed_tests_dir@/@program@'
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index f64524904..a67e0f8dd 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -183,6 +183,24 @@ foreach t : core_tests
     > -         install_dir: installed_tests_metadir,
     > -         configuration: test_conf
     > -       )
     > -+
     > -+      env += {'GST_REGISTRY':
    '~/.cache/gstreamer-1.0/@[email protected]'.format(test_name)}
Quoted 8 lines
Quoted 8 lines

> -+ configure_file(
> -+ output: test_name + '.env',
> -+ install_dir: installed_tests_execdir,
> -+ configuration : env,
> -+ )
> -+ # helper to convert a meson environment dictionay object
exported with configure_file
> -+ # this also remove not needed variables for the

installed

Quoted 9 lines
Quoted 9 lines
    tests
     > -+      meson.add_postconf_script('sed', '-i',
     > -+        '-e', '/^#define/!d',
     > -+        '-e', 's/^#define //g',
     > -+        '-e', '/^GST_PLUGIN_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SYSTEM_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SCANNER_1_0/d',
     > -+        '-e', 's/ /=/',
     > -+        join_paths(meson.current_build_dir(), test_name +

'.env')

Quoted 28 lines
Quoted 28 lines
     > -+      )
     > -     endif
     > -
     > -     test(test_name, exe, env: env, timeout : 3 * 60)
     > ---
     > -2.31.1
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > similarity index 76%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > index 0d82dd338c..243f99fee9 100644
     > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > @@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2
    bison-native flex-native"
     >
     >  inherit meson pkgconfig gettext upstream-version-is-even
Quoted 8 lines
Quoted 8 lines
    gobject-introspection ptest-gnome
     >
     > -LIC_FILES_CHKSUM =
    "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
     > +LIC_FILES_CHKSUM =
    "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
     >

file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"

Quoted 5 lines
Quoted 5 lines
     >
     >  S = "${WORKDIR}/gstreamer-${PV}"
     >
     >  SRC_URI =
    "

https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz

Quoted 1 line
Quoted 1 line
    <

https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$%7BPV%7D.tar.xz

Quoted 5 lines
Quoted 5 lines
    \
     >             file://run-ptest \
     > -

file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \

Quoted 3 lines
Quoted 3 lines
     > -           file://0002-Remove-unused-valgrind-detection.patch \
     > -

file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \

Quoted 8 lines
Quoted 8 lines
     > -
      file://0004-tests-respect-the-idententaion-used-in-meson.patch \
     > -
      file://0005-tests-add-support-for-install-the-tests.patch \
     > -
      file://0006-tests-use-a-dictionaries-for-environment.patch \
     > -

file://0007-tests-install-the-environment-for-installed_tests.patch \

Quoted 2 lines
Quoted 2 lines
     > +

file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3
\

Quoted 2 lines
Quoted 2 lines
     > +

file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \

Quoted 2 lines
Quoted 2 lines
     > +

file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \

Quoted 2 lines
Quoted 2 lines
     > +

file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3
\

Quoted 17 lines
Quoted 17 lines
     >             "
     > -SRC_URI[sha256sum] =
    "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"
     > +SRC_URI[sha256sum] =
    "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"
     >
     >  PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1',
    'tests', '', d)} \
     >                     check \
     > @@ -36,7 +33,7 @@ PACKAGECONFIG[debug] =
    "-Dgst_debug=true,-Dgst_debug=false"
     >  PACKAGECONFIG[tracer-hooks] =
    "-Dtracer_hooks=true,-Dtracer_hooks=false"
     >  PACKAGECONFIG[coretracers] =
    "-Dcoretracers=enabled,-Dcoretracers=disabled"
     >  PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
     > -PACKAGECONFIG[tests] = "-Dtests=enabled
Quoted 8 lines
Quoted 8 lines

-Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
> +PACKAGECONFIG[tests] = "-Dtests=enabled
-Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"
> PACKAGECONFIG[unwind] =
"-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
> PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" > PACKAGECONFIG[bash-completion] =

"-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"

Quoted 33 lines
Quoted 24 lines
     > --
     > 2.35.1
     >
     >
     > -=-=-=-=-=-=-=-=-=-=-=-
     > Links: You receive all messages sent to this group.
     > View/Reply Online (#161427):
    https://lists.openembedded.org/g/openembedded-core/message/161427
    <https://lists.openembedded.org/g/openembedded-core/message/161427

     > Mute This Topic:
    https://lists.openembedded.org/mt/88962313/1686489
    <https://lists.openembedded.org/mt/88962313/1686489>
     > Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
     > Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    <https://lists.openembedded.org/g/openembedded-core/unsub>
    [[email protected] <mailto:[email protected]>]
     > -=-=-=-=-=-=-=-=-=-=-=-
     >
Quoted 4 lines

--
Best regards,

José Quaresma

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]

Signature · 3 lines
Best regards,

José Quaresma
#12 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

Simply send the patch, make sure the commit message explains what it's for, and we'll figure it out. RP regularly has such test-only patches in master-next, or I can run dedicated ptest builds with it.

Alex

Quoted 1,006 lines · Jose Quaresma

Alexander Kanavin <[email protected]> escreveu no dia quarta, 9/02/2022 à(s) 10:34:

Quoted 5 lines

Yes, it seems to be sporadic. Here's a sample fail:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/3083
https://autobuilder.yocto.io/pub/non-release/20220208-14/testresults/qemux86-64-ptest/gstreamer1.0.log

I ask for help upstream but I will try to replicate this with GST_DEBUG enabled.
Which is the best option to send a patch not for merge but only to run on the autobuilder to generate some logs?

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778

Quoted 982 lines

Alex

Quoted 977 lines · Claudius Heine

Hi Jose

Quoted 4 lines · Jose Quaresma

Hi Alexander,

Can you please clarify in what target arch is this happening and I can try to replicate it with qemu?

I think we are hitting:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778

This testcase seems to be flaky and IIUC upstream marked it as such in their test infrastructure.

In my patchset, I added a patch to disable that testcase.

regards,
Claudius

Quoted 948 lines

It works on my side on qemux86-64.

root@qemux86-64:~# /usr/libexec/installed-tests/gstreamer/gst_gstbin.sh
+ CK_DEFAULT_TIMEOUT=20
+ GST_PLUGIN_LOADING_WHITELIST=gstreamer
+ GST_REGISTRY=/home/root/.cache/gstreamer-1.0/gst_gstbin.registry
+ GST_STATE_IGNORE_ELEMENTS=
+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
Running suite(s): GstBin
100%: Checks: 26, Failures: 0, Errors: 0
Check suite gst_bin ran in 6.239s (tests failed: 0)

Alexander Kanavin <[email protected] <mailto:[email protected]>> escreveu no dia terça, 8/02/2022 à(s) 22:01:

    Unfortunately this patchset (which is now in master) does not address
    the ptest fail. Please resolve this as soon as possible.

    + exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
    Running suite(s): GstBin
    Executing: gstreamer/gst_gstbin.test
    Executing: gstreamer/gst_gstbin.test
    ....
    Executing: gstreamer/gst_gstbin.test
    Executing: gstreamer/gst_gstbin.test
    Test timed out after 300 seconds
    FAIL: gstreamer/gst_gstbin.test (Child process killed by signal 9)

    Alex

    On Mon, 7 Feb 2022 at 02:08, Jose Quaresma <[email protected]
    <mailto:[email protected]>> wrote:
     >
     > - License update:
     >   The code actually is LGPLv2.1 but the COPYING file is wrong.
     >
    https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042>
     >
     > - Drop backported patches
     >   0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     >   0002-Remove-unused-valgrind-detection.patch
     >   0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     >
     > - Update submitted patches
     >   0001-tests-respect-the-idententaion-used-in-meson.patch
     >   0002-tests-add-support-for-install-the-tests.patch
     >   0003-tests-use-a-dictionaries-for-environment.patch
     >   0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >
     > Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ---
     >  ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
     >  ...pect-the-idententaion-used-in-meson.patch} |  14 +--
     >  ...002-Remove-unused-valgrind-detection.patch | 112
    ------------------
     >  ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
     >  ...-use-too-strict-timeout-for-validati.patch |  32 -----
     >  ...-use-a-dictionaries-for-environment.patch} |  28 +++--
     >  ...er-script-to-run-the-installed_tests.patch |  74 ++++++++++++
     >  ...-the-environment-for-installed_tests.patch |  58 ---------
     >  ...er1.0_1.18.5.bb <http://er1.0_1.18.5.bb> =>
    gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} |  17 ++-
     >  9 files changed, 136 insertions(+), 335 deletions(-)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch
    => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch
    => 0002-tests-add-support-for-install-the-tests.patch} (65%)
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     >  rename
    meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch
    => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)
     >  create mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >  delete mode 100644
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     >  rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>} (76%)
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     > deleted file mode 100644
     > index 23ebd5c600..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     > +++ /dev/null
     > @@ -1,69 +0,0 @@
     > -From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sat, 10 Oct 2020 19:09:03 +0000
     > -Subject: [PATCH 1/3] gstpluginloader: when env var is set do not
    fall through
     > - to system plugin scanner
     > -
     > -If we set a custom GST_PLUGIN_SCANNER env var, then we probably
    want to use that and only that.
     > -
     > -Falling through to the one installed on the system is
    problamatic in cross-compilation
     > -environemnts, regardless of whether one pointed to by the env
    var succeeded or failed.
     > -
     > -taken from:
     >
    -http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b
    <http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b>
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>>
     > -
     > -Upstream-Status: Backport
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a>]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gstpluginloader.c | 15 +++++++--------
     > - 1 file changed, 7 insertions(+), 8 deletions(-)
     > -
     > -diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
     > -index d1e404d98..c626bf263 100644
     > ---- a/gst/gstpluginloader.c
     > -+++ b/gst/gstpluginloader.c
     > -@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader *
    loader)
     > -   if (loader->child_running)
     > -     return TRUE;
     > -
     > --  /* Find the gst-plugin-scanner: first try the env-var if it
    is set,
     > --   * otherwise use the installed version */
     > -+  /* Find the gst-plugin-scanner */
     > -   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
     > -   if (env == NULL)
     > -     env = g_getenv ("GST_PLUGIN_SCANNER");
     > -
     > -   if (env != NULL && *env != '\0') {
     > -+    /* use the env-var if it is set */
     > -     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
     > -     helper_bin = g_strdup (env);
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > --  }
     > --
     > --  if (!res) {
     > -+  } else {
     > -+    /* use the installed version */
     > -     GST_LOG ("Trying installed plugin scanner");
     > -
     > - #ifdef G_OS_WIN32
     > -@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader *
    loader)
     > - #endif
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > -+  }
     > -
     > --    if (!res) {
     > --      GST_INFO ("No gst-plugin-scanner available, or not working");
     > --    }
     > -+  if (!res) {
     > -+    GST_INFO ("No gst-plugin-scanner available, or not working");
     > -   }
     > -
     > -   return loader->child_running;
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
     > similarity index 71%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
     > index 6f571a12d8..312c04fbfd 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-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 @@
     > -From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17
    00:00:00 2001
     > +From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 1/4] tests: respect the idententaion used in meson
     > @@ -7,13 +7,13 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 10 +++++-----
     > + subprojects/gstreamer/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 a617cf159..b2636714b 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 9c4228b6e4..506606684d 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -146,11 +146,11 @@ foreach t : core_tests
     >
     >     if not skip_test
     > @@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
     >
     >       env = environment()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     > deleted file mode 100644
     > index 5121044734..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
     > +++ /dev/null
     > @@ -1,112 +0,0 @@
     > -From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17
    00:00:00 2001
     > -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]
    <mailto:[email protected]>>
     > -Date: Fri, 14 Aug 2020 16:38:26 +0100
     > -Subject: [PATCH 2/3] Remove unused valgrind detection
     > -
     > -Having this just to log a debug message in case we're
     > -running inside valgrind doesn't seem very useful, and
     > -the code that used to use this no longer exists it seems.
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>>
     > -
     > -Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gst_private.h |  2 --
     > - gst/gstinfo.c     | 39 ---------------------------------------
     > - meson.build       |  1 -
     > - 3 files changed, 42 deletions(-)
     > -
     > -diff --git a/gst/gst_private.h b/gst/gst_private.h
     > -index eefd044..8252ede 100644
     > ---- a/gst/gst_private.h
     > -+++ b/gst/gst_private.h
     > -@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean
    _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
     > -
     > - G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed
    (GstPlugin * plugin);
     > -
     > --G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
     > --
     > - /* init functions called from gst_init(). */
     > - G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
     > - G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize (void);
     > -diff --git a/gst/gstinfo.c b/gst/gstinfo.c
     > -index eea1a21..d3035d6 100644
     > ---- a/gst/gstinfo.c
     > -+++ b/gst/gstinfo.c
     > -@@ -305,36 +305,6 @@ static gboolean pretty_tags =
    PRETTY_TAGS_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON;
     > -
     > --/* FIXME: export this? */
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  static enum
     > --  {
     > --    GST_VG_UNCHECKED,
     > --    GST_VG_NO_VALGRIND,
     > --    GST_VG_INSIDE
     > --  }
     > --  in_valgrind = GST_VG_UNCHECKED;
     > --
     > --  if (in_valgrind == GST_VG_UNCHECKED) {
     > --#ifdef HAVE_VALGRIND_VALGRIND_H
     > --    if (RUNNING_ON_VALGRIND) {
     > --      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside
    valgrind");
     > --      in_valgrind = GST_VG_INSIDE;
     > --    } else {
     > --      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind
    stuff");
     > --      in_valgrind = GST_VG_NO_VALGRIND;
     > --    }
     > --#else
     > --    in_valgrind = GST_VG_NO_VALGRIND;
     > --#endif
     > --    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
     > --        in_valgrind == GST_VG_INSIDE);
     > --  }
     > --  return (in_valgrind == GST_VG_INSIDE);
     > --}
     > --
     > - static gchar *
     > - _replace_pattern_in_gst_debug_file_name (gchar * name, const
    char *token,
     > -     guint val)
     > -@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
     > -   _priv_GST_CAT_PROTECTION =
     > -       _gst_debug_category_new ("GST_PROTECTION", 0, "protection");
     > -
     > --  /* print out the valgrind message if we're in valgrind */
     > --  _priv_gst_in_valgrind ();
     > --
     > -   env = g_getenv ("GST_DEBUG_OPTIONS");
     > -   if (env != NULL) {
     > -     if (strstr (env, "full_tags") || strstr (env, "full-tags"))
     > -@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint
    colorinfo)
     > -   return 0;
     > - }
     > -
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  return FALSE;
     > --}
     > --
     > - void
     > - _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
     > -     const gchar * func, gint line, GObject * obj, const gchar *
    msg,
     > -diff --git a/meson.build b/meson.build
     > -index 82a1728..42ae617 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -200,7 +200,6 @@ check_headers = [
     > -   'sys/wait.h',
     > -   'ucontext.h',
     > -   'unistd.h',
     > --  'valgrind/valgrind.h',
     > -   'sys/resource.h',
     > -   'sys/uio.h',
     > - ]
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
     > similarity index 65%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
     > index b77fb5797f..d18c19c397 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-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 @@
     > -From c9e93c7a3e4d2773abef4f5e1464af24f36700b3 Mon Sep 17
    00:00:00 2001
     > +From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 2/4] tests: add support for install the tests
     > @@ -11,54 +11,44 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - meson.build             |  5 +++++
     > - meson_options.txt       |  1 +
     > - template.test.in <http://template.test.in>        |  3 +++
     > - tests/check/meson.build | 22 +++++++++++++++++++++-
     > - 4 files changed, 30 insertions(+), 1 deletion(-)
     > - create mode 100644 template.test.in <http://template.test.in>
     > + subprojects/gstreamer/meson.build             |  4 ++++
     > + subprojects/gstreamer/meson_options.txt       |  1 +
     > + subprojects/gstreamer/tests/check/meson.build | 22
    ++++++++++++++++++-
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>    |  3 +++
     > + 4 files changed, 29 insertions(+), 1 deletion(-)
     > + create mode 100644
    subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     >
     > -diff --git a/meson.build b/meson.build
     > -index c4e8774f5..1abf4eb26 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -562,6 +562,11 @@ if bashcomp_dep.found()
     > +diff --git a/subprojects/gstreamer/meson.build
    b/subprojects/gstreamer/meson.build
     > +index d20fe0040f..b595d8f990 100644
     > +--- a/subprojects/gstreamer/meson.build
     > ++++ b/subprojects/gstreamer/meson.build
     > +@@ -562,6 +562,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())
     > -+installed_tests_enabled = get_option('installed-tests')
     > -+installed_tests_template = files('template.test.in
    <http://template.test.in>')
     >  +
     >   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 c8cee3762..b5da40eaa 100644
     > ---- a/meson_options.txt
     > -+++ b/meson_options.txt
     > +diff --git a/subprojects/gstreamer/meson_options.txt
    b/subprojects/gstreamer/meson_options.txt
     > +index 7363bdb7a1..a34ba37dad 100644
     > +--- a/subprojects/gstreamer/meson_options.txt
     > ++++ b/subprojects/gstreamer/meson_options.txt
     >  @@ -15,6 +15,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')
     > ++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/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -new file mode 100644
     > -index 000000000..f701627f8
     > ---- /dev/null
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -0,0 +1,3 @@
     > -+[Test]
     > -+Type=session
     > -+Exec=@installed_tests_dir@/@program@
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index b2636714b..a697a7b06 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 506606684d..00a138a568 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -124,10 +124,16 @@ test_defines = [
     >     '-UG_DISABLE_ASSERT',
     >     '-UG_DISABLE_CAST_CHECKS',
     > @@ -95,7 +85,7 @@ index b2636714b..a697a7b06 100644
     >  +      test_conf.set('installed_tests_dir', join_paths(prefix,
    installed_tests_execdir))
     >  +      test_conf.set('program', test_name)
     >  +      configure_file(
     > -+        input: installed_tests_template,
     > ++        input: 'template.test.in <http://template.test.in>',
     >  +        output: test_name + '.test',
     >  +        install_dir: installed_tests_metadir,
     >  +        configuration: test_conf
     > @@ -105,6 +95,15 @@ index b2636714b..a697a7b06 100644
     >       test(test_name, exe, env: env, timeout : 3 * 60)
     >     endif
     >   endforeach
     > +diff --git a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +new file mode 100644
     > +index 0000000000..f701627f87
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -0,0 +1,3 @@
     > ++[Test]
     > ++Type=session
     > ++Exec=@installed_tests_dir@/@program@
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     > deleted file mode 100644
     > index e0e64e2c7a..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     > +++ /dev/null
     > @@ -1,32 +0,0 @@
     > -From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17
    00:00:00 2001
     > -From: Seungha Yang <[email protected]
    <mailto:[email protected]>>
     > -Date: Tue, 15 Sep 2020 00:54:58 +0900
     > -Subject: [PATCH] tests: seek: Don't use too strict timeout for
    validation
     > -
     > -Expected segment-done message might not be seen within expected
     > -time if system is not powerful enough.
     > -
     > -Part-of:
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>>
     > -
     > -Upstream-Status: Backport
    [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c
    <https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c>]
     > -Signed-off-by: Anuj Mittal <[email protected]
    <mailto:[email protected]>>
     > ----
     > - tests/check/pipelines/seek.c | 2 +-
     > - 1 file changed, 1 insertion(+), 1 deletion(-)
     > -
     > -diff --git a/tests/check/pipelines/seek.c
    b/tests/check/pipelines/seek.c
     > -index 28bb8846d..5f7447bc5 100644
     > ---- a/tests/check/pipelines/seek.c
     > -+++ b/tests/check/pipelines/seek.c
     > -@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
     > -
     > -   GST_INFO ("wait for segment done message");
     > -
     > --  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 *
    GST_SECOND,
     > -+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
     > -       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
     > -   fail_unless (msg, "no message within the timed window");
     > -   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg),
    "segment-done");
     > ---
     > -2.29.2
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
     > similarity index 61%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
     > index 46813cec3d..10a6dcc619 100644
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-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 @@
     > -From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17
    00:00:00 2001
     > +From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sat, 24 Apr 2021 10:34:47 +0100
     >  Subject: [PATCH 3/4] tests: use a dictionaries for environment
     > @@ -10,29 +10,31 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 19 +++++++++++--------
     > - 1 file changed, 11 insertions(+), 8 deletions(-)
     > + subprojects/gstreamer/tests/check/meson.build | 21
    ++++++++++++-------
     > + 1 file changed, 13 insertions(+), 8 deletions(-)
     >
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index a697a7b06..f64524904 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -161,14 +161,17 @@ foreach t : core_tests
     > +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
     >         install: installed_tests_enabled,
     >       )
     >
     >  -    env = environment()
     > --    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
     > +-    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@/@[email protected]'.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')
     > -+    # 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
     > ++    # 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.build_root(),
     > ++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
     >  +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
     >  +      'GST_STATE_IGNORE_ELEMENTS': '',
     >  +      'CK_DEFAULT_TIMEOUT': '20',
     > @@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
     >       if installed_tests_enabled
     >         test_conf = configuration_data()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > 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
     > new file mode 100644
     > index 0000000000..efa004f8ce
     > --- /dev/null
     > +++
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
     > @@ -0,0 +1,74 @@
     > +From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17
    00:00:00 2001
     > +From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +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
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]
     > +
     > +Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +---
     > + subprojects/gstreamer/tests/check/meson.build   | 17
    +++++++++++++++++
     > + .../gstreamer/tests/check/template.sh.in
    <http://template.sh.in>        |  9 +++++++++
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>      |  2 +-
     > + 3 files changed, 27 insertions(+), 1 deletion(-)
     > + create mode 100755
    subprojects/gstreamer/tests/check/template.sh.in <http://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
     > +@@ -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/@[email protected] 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/@[email protected]'.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 <http://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/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
    b/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
     > +new file mode 100755
     > +index 0000000000..cf7d31b0ea
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.sh.in
    <http://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/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +index f701627f87..b74ef6ad73 100644
     > +--- a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -1,3 +1,3 @@
     > + [Test]
     > + Type=session
     > +-Exec=@installed_tests_dir@/@program@
     > ++Exec=@installed_tests_dir@/@[email protected]
     > +--
     > +2.33.1
     > +
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     > deleted file mode 100644
     > index eabe7bcbe1..0000000000
     > ---
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
     > +++ /dev/null
     > @@ -1,58 +0,0 @@
     > -From 57d2965e979f886e03eecd7e351bf01812053971 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sun, 2 May 2021 01:58:01 +0100
     > -Subject: [PATCH 4/4] tests: install the environment for
    installed_tests
     > -
     > -- adapt the test environment for installed_tests
     > -- install the test environment for installed_tests
     > -- run the tests using the installed environment
     > -
     > -Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - template.test.in <http://template.test.in>        |  2 +-
     > - tests/check/meson.build | 18 ++++++++++++++++++
     > - 2 files changed, 19 insertions(+), 1 deletion(-)
     > -
     > -diff --git a/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -index f701627f8..9a3fbdd09 100644
     > ---- a/template.test.in <http://template.test.in>
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -1,3 +1,3 @@
     > - [Test]
     > - Type=session
     > --Exec=@installed_tests_dir@/@program@
     > -+Exec=sh -c 'set -aex && source
    @installed_tests_dir@/@[email protected] && exec
    @installed_tests_dir@/@program@'
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index f64524904..a67e0f8dd 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -183,6 +183,24 @@ foreach t : core_tests
     > -         install_dir: installed_tests_metadir,
     > -         configuration: test_conf
     > -       )
     > -+
     > -+      env += {'GST_REGISTRY':
    '~/.cache/gstreamer-1.0/@[email protected]'.format(test_name)}
     > -+      configure_file(
     > -+        output: test_name + '.env',
     > -+        install_dir: installed_tests_execdir,
     > -+        configuration : env,
     > -+      )
     > -+      # helper to convert a meson environment dictionay object
    exported with configure_file
     > -+      # this also remove not needed variables for the installed
    tests
     > -+      meson.add_postconf_script('sed', '-i',
     > -+        '-e', '/^#define/!d',
     > -+        '-e', 's/^#define //g',
     > -+        '-e', '/^GST_PLUGIN_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SYSTEM_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SCANNER_1_0/d',
     > -+        '-e', 's/ /=/',
     > -+        join_paths(meson.current_build_dir(), test_name + '.env')
     > -+      )
     > -     endif
     > -
     > -     test(test_name, exe, env: env, timeout : 3 * 60)
     > ---
     > -2.31.1
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > similarity index 76%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > index 0d82dd338c..243f99fee9 100644
     > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > @@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2
    bison-native flex-native"
     >
     >  inherit meson pkgconfig gettext upstream-version-is-even
    gobject-introspection ptest-gnome
     >
     > -LIC_FILES_CHKSUM =
    "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
     > +LIC_FILES_CHKSUM =
    "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
     >
    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
     >
     >  S = "${WORKDIR}/gstreamer-${PV}"
     >
     >  SRC_URI =
    "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz
    <https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$%7BPV%7D.tar.xz>
    \
     >             file://run-ptest \
     > -
      file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
     > -           file://0002-Remove-unused-valgrind-detection.patch \
     > -
      file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \
     > -
      file://0004-tests-respect-the-idententaion-used-in-meson.patch \
     > -
      file://0005-tests-add-support-for-install-the-tests.patch \
     > -
      file://0006-tests-use-a-dictionaries-for-environment.patch \
     > -
      file://0007-tests-install-the-environment-for-installed_tests.patch \
     > +
      file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3 \
     > +
      file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \
     > +
      file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
     > +
      file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
     >             "
     > -SRC_URI[sha256sum] =
    "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"
     > +SRC_URI[sha256sum] =
    "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"
     >
     >  PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1',
    'tests', '', d)} \
     >                     check \
     > @@ -36,7 +33,7 @@ PACKAGECONFIG[debug] =
    "-Dgst_debug=true,-Dgst_debug=false"
     >  PACKAGECONFIG[tracer-hooks] =
    "-Dtracer_hooks=true,-Dtracer_hooks=false"
     >  PACKAGECONFIG[coretracers] =
    "-Dcoretracers=enabled,-Dcoretracers=disabled"
     >  PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
     > -PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
     > +PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"
     >  PACKAGECONFIG[unwind] =
    "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
     >  PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
     >  PACKAGECONFIG[bash-completion] =
    "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
     > --
     > 2.35.1
     >
     >
     > -=-=-=-=-=-=-=-=-=-=-=-
     > Links: You receive all messages sent to this group.
     > View/Reply Online (#161427):
    https://lists.openembedded.org/g/openembedded-core/message/161427
    <https://lists.openembedded.org/g/openembedded-core/message/161427>
     > Mute This Topic:
    https://lists.openembedded.org/mt/88962313/1686489
    <https://lists.openembedded.org/mt/88962313/1686489>
     > Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
     > Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    <https://lists.openembedded.org/g/openembedded-core/unsub>
    [[email protected] <mailto:[email protected]>]
     > -=-=-=-=-=-=-=-=-=-=-=-
     >
Quoted 4 lines

--
Best regards,

José Quaresma

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]

--
Best regards,

José Quaresma

#13 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

In reply to Claudius Heine

Claudius Heine <[email protected]> escreveu no dia quarta, 9/02/2022 à(s) 09:30:

Quoted 8 lines

Hi Jose

Quoted 4 lines · Jose Quaresma

Hi Alexander,

Can you please clarify in what target arch is this happening and I can try to replicate it with qemu?

Quoted 8 lines

I think we are hitting:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778

This testcase seems to be flaky and IIUC upstream marked it as such in their test infrastructure.

In my patchset, I added a patch to disable that testcase.

Hi Claudius,

Your patch Is a possible solution but I think we need to investigate the root cause
of the test failure and send a fix for that if possible.

Quoted 1,047 lines

regards,
Claudius

Quoted 31 lines

It works on my side on qemux86-64.

root@qemux86-64:~# /usr/libexec/installed-tests/gstreamer/gst_gstbin.sh
+ CK_DEFAULT_TIMEOUT=20
+ GST_PLUGIN_LOADING_WHITELIST=gstreamer
+ GST_REGISTRY=/home/root/.cache/gstreamer-1.0/gst_gstbin.registry
+ GST_STATE_IGNORE_ELEMENTS=
+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin
Running suite(s): GstBin
100%: Checks: 26, Failures: 0, Errors: 0
Check suite gst_bin ran in 6.239s (tests failed: 0)

Alexander Kanavin <[email protected] <mailto:[email protected]>> escreveu no dia terça, 8/02/2022 à(s) 22:01:

Unfortunately this patchset (which is now in master) does not address the ptest fail. Please resolve this as soon as possible.

+ exec /usr/libexec/installed-tests/gstreamer/gst_gstbin Running suite(s): GstBin
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
....
Executing: gstreamer/gst_gstbin.test
Executing: gstreamer/gst_gstbin.test
Test timed out after 300 seconds
FAIL: gstreamer/gst_gstbin.test (Child process killed by signal 9)

Quoted 9 lines

Alex

On Mon, 7 Feb 2022 at 02:08, Jose Quaresma <[email protected] <mailto:[email protected]>> wrote:
>
> - License update:
> The code actually is LGPLv2.1 but the COPYING file is wrong.
>

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

Quoted 21 lines
     >
     > - Drop backported patches
     >   0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
     >   0002-Remove-unused-valgrind-detection.patch
     >   0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
     >
     > - Update submitted patches
     >   0001-tests-respect-the-idententaion-used-in-meson.patch
     >   0002-tests-add-support-for-install-the-tests.patch
     >   0003-tests-use-a-dictionaries-for-environment.patch
     >   0004-tests-add-helper-script-to-run-the-installed_tests.patch
     >
     > Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ---
     >  ...der.c-when-env-var-is-set-do-not-fal.patch |  69 -----------
     >  ...pect-the-idententaion-used-in-meson.patch} |  14 +--
     >  ...002-Remove-unused-valgrind-detection.patch | 112
    ------------------
     >  ...s-add-support-for-install-the-tests.patch} |  67 ++++++-----
Quoted 9 lines
     >  ...-use-too-strict-timeout-for-validati.patch |  32 -----
     >  ...-use-a-dictionaries-for-environment.patch} |  28 +++--
     >  ...er-script-to-run-the-installed_tests.patch |  74 ++++++++++++
     >  ...-the-environment-for-installed_tests.patch |  58 ---------
     >  ...er1.0_1.18.5.bb <http://er1.0_1.18.5.bb> =>
    gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} |  17 ++-
     >  9 files changed, 136 insertions(+), 335 deletions(-)
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 2 lines

> rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 3 lines
    => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%)
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 2 lines

> rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch

Quoted 3 lines
    => 0002-tests-add-support-for-install-the-tests.patch} (65%)
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 2 lines

> rename

meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch

Quoted 3 lines
    => 0003-tests-use-a-dictionaries-for-environment.patch} (61%)
     >  create mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 2 lines
     >  delete mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 6 lines
     >  rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>} (76%)
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 4 lines
     > deleted file mode 100644
     > index 23ebd5c600..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch

Quoted 14 lines

> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17
00:00:00 2001
> -From: Jose Quaresma <[email protected]
<mailto:[email protected]>>
> -Date: Sat, 10 Oct 2020 19:09:03 +0000
> -Subject: [PATCH 1/3] gstpluginloader: when env var is set do not
fall through
> - to system plugin scanner
> -
> -If we set a custom GST_PLUGIN_SCANNER env var, then we probably
want to use that and only that.
> -

Quoted 8 lines

> -Falling through to the one installed on the system is
problamatic in cross-compilation
> -environemnts, regardless of whether one pointed to by the env
var succeeded or failed.
> -
> -taken from:
>
-

http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b

Quoted 1 line
    <

http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b

Quoted 4 lines
     > -
     > -Part-of:
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669

Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669>>

Quoted 3 lines
     > -
     > -Upstream-Status: Backport
    [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a

Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a

Quoted 40 lines

]

     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gstpluginloader.c | 15 +++++++--------
     > - 1 file changed, 7 insertions(+), 8 deletions(-)
     > -
     > -diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
     > -index d1e404d98..c626bf263 100644
     > ---- a/gst/gstpluginloader.c
     > -+++ b/gst/gstpluginloader.c
     > -@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader *
    loader)
     > -   if (loader->child_running)
     > -     return TRUE;
     > -
     > --  /* Find the gst-plugin-scanner: first try the env-var if it
    is set,
     > --   * otherwise use the installed version */
     > -+  /* Find the gst-plugin-scanner */
     > -   env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
     > -   if (env == NULL)
     > -     env = g_getenv ("GST_PLUGIN_SCANNER");
     > -
     > -   if (env != NULL && *env != '\0') {
     > -+    /* use the env-var if it is set */
     > -     GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
     > -     helper_bin = g_strdup (env);
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > --  }
     > --
     > --  if (!res) {
     > -+  } else {
     > -+    /* use the installed version */
     > -     GST_LOG ("Trying installed plugin scanner");
     > -
     > - #ifdef G_OS_WIN32
     > -@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader *
Quoted 8 lines
    loader)
     > - #endif
     > -     res = gst_plugin_loader_try_helper (loader, helper_bin);
     > -     g_free (helper_bin);
     > -+  }
     > -
     > --    if (!res) {
     > --      GST_INFO ("No gst-plugin-scanner available, or not

working");

Quoted 3 lines
     > --    }
     > -+  if (!res) {
     > -+    GST_INFO ("No gst-plugin-scanner available, or not

working");

Quoted 8 lines
     > -   }
     > -
     > -   return loader->child_running;
     > ---
     > -2.29.2
     > -
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 3 lines

> similarity index 71%
> rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 2 lines

> rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 3 lines
     > index 6f571a12d8..312c04fbfd 100644
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch

Quoted 2 lines
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch

Quoted 9 lines
     > @@ -1,4 +1,4 @@
     > -From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17
    00:00:00 2001
     > +From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 1/4] tests: respect the idententaion used in

meson

Quoted 23 lines
     > @@ -7,13 +7,13 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 10 +++++-----
     > + subprojects/gstreamer/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 a617cf159..b2636714b 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 9c4228b6e4..506606684d 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -146,11 +146,11 @@ foreach t : core_tests
     >
     >     if not skip_test
Quoted 9 lines
     > @@ -32,5 +32,5 @@ index a617cf159..b2636714b 100644
     >
     >       env = environment()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 4 lines
     > deleted file mode 100644
     > index 5121044734..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch

Quoted 7 lines
     > +++ /dev/null
     > @@ -1,112 +0,0 @@
     > -From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17
    00:00:00 2001
     > -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]
    <mailto:[email protected]>>
     > -Date: Fri, 14 Aug 2020 16:38:26 +0100
Quoted 8 lines
     > -Subject: [PATCH 2/3] Remove unused valgrind detection
     > -
     > -Having this just to log a debug message in case we're
     > -running inside valgrind doesn't seem very useful, and
     > -the code that used to use this no longer exists it seems.
     > -
     > -Part-of:
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595

Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>>

Quoted 2 lines

> -
> -Upstream-Status: Backport

[a2cbf75523cdf8a4df1baa7007d86ef455972245]

Quoted 23 lines
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - gst/gst_private.h |  2 --
     > - gst/gstinfo.c     | 39 ---------------------------------------
     > - meson.build       |  1 -
     > - 3 files changed, 42 deletions(-)
     > -
     > -diff --git a/gst/gst_private.h b/gst/gst_private.h
     > -index eefd044..8252ede 100644
     > ---- a/gst/gst_private.h
     > -+++ b/gst/gst_private.h
     > -@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean
    _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
     > -
     > - G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed
    (GstPlugin * plugin);
     > -
     > --G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
     > --
     > - /* init functions called from gst_init(). */
     > - G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
Quoted 8 lines
     > - G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize (void);
     > -diff --git a/gst/gstinfo.c b/gst/gstinfo.c
     > -index eea1a21..d3035d6 100644
     > ---- a/gst/gstinfo.c
     > -+++ b/gst/gstinfo.c
     > -@@ -305,36 +305,6 @@ static gboolean pretty_tags =
    PRETTY_TAGS_DEFAULT;
     > - static gint G_GNUC_MAY_ALIAS __default_level =

GST_LEVEL_DEFAULT;

Quoted 1 line

> - static gint G_GNUC_MAY_ALIAS __use_color =

GST_DEBUG_COLOR_MODE_ON;

Quoted 32 lines
     > -
     > --/* FIXME: export this? */
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  static enum
     > --  {
     > --    GST_VG_UNCHECKED,
     > --    GST_VG_NO_VALGRIND,
     > --    GST_VG_INSIDE
     > --  }
     > --  in_valgrind = GST_VG_UNCHECKED;
     > --
     > --  if (in_valgrind == GST_VG_UNCHECKED) {
     > --#ifdef HAVE_VALGRIND_VALGRIND_H
     > --    if (RUNNING_ON_VALGRIND) {
     > --      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside
    valgrind");
     > --      in_valgrind = GST_VG_INSIDE;
     > --    } else {
     > --      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind
    stuff");
     > --      in_valgrind = GST_VG_NO_VALGRIND;
     > --    }
     > --#else
     > --    in_valgrind = GST_VG_NO_VALGRIND;
     > --#endif
     > --    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
     > --        in_valgrind == GST_VG_INSIDE);
     > --  }
     > --  return (in_valgrind == GST_VG_INSIDE);
     > --}
Quoted 8 lines
     > --
     > - static gchar *
     > - _replace_pattern_in_gst_debug_file_name (gchar * name, const
    char *token,
     > -     guint val)
     > -@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
     > -   _priv_GST_CAT_PROTECTION =
     > -       _gst_debug_category_new ("GST_PROTECTION", 0,

"protection");

Quoted 30 lines
     > -
     > --  /* print out the valgrind message if we're in valgrind */
     > --  _priv_gst_in_valgrind ();
     > --
     > -   env = g_getenv ("GST_DEBUG_OPTIONS");
     > -   if (env != NULL) {
     > -     if (strstr (env, "full_tags") || strstr (env, "full-tags"))
     > -@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint
    colorinfo)
     > -   return 0;
     > - }
     > -
     > --gboolean
     > --_priv_gst_in_valgrind (void)
     > --{
     > --  return FALSE;
     > --}
     > --
     > - void
     > - _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
     > -     const gchar * func, gint line, GObject * obj, const gchar *
    msg,
     > -diff --git a/meson.build b/meson.build
     > -index 82a1728..42ae617 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -200,7 +200,6 @@ check_headers = [
     > -   'sys/wait.h',
     > -   'ucontext.h',
     > -   'unistd.h',
Quoted 9 lines
     > --  'valgrind/valgrind.h',
     > -   'sys/resource.h',
     > -   'sys/uio.h',
     > - ]
     > ---
     > -2.29.2
     > -
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 3 lines

> similarity index 65%
> rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 2 lines

> rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 3 lines
     > index b77fb5797f..d18c19c397 100644
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch

Quoted 2 lines
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch

Quoted 129 lines
     > @@ -1,4 +1,4 @@
     > -From c9e93c7a3e4d2773abef4f5e1464af24f36700b3 Mon Sep 17
    00:00:00 2001
     > +From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sun, 11 Apr 2021 19:48:13 +0100
     >  Subject: [PATCH 2/4] tests: add support for install the tests
     > @@ -11,54 +11,44 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - meson.build             |  5 +++++
     > - meson_options.txt       |  1 +
     > - template.test.in <http://template.test.in>        |  3 +++
     > - tests/check/meson.build | 22 +++++++++++++++++++++-
     > - 4 files changed, 30 insertions(+), 1 deletion(-)
     > - create mode 100644 template.test.in <http://template.test.in>
     > + subprojects/gstreamer/meson.build             |  4 ++++
     > + subprojects/gstreamer/meson_options.txt       |  1 +
     > + subprojects/gstreamer/tests/check/meson.build | 22
    ++++++++++++++++++-
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>    |  3 +++
     > + 4 files changed, 29 insertions(+), 1 deletion(-)
     > + create mode 100644
    subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     >
     > -diff --git a/meson.build b/meson.build
     > -index c4e8774f5..1abf4eb26 100644
     > ---- a/meson.build
     > -+++ b/meson.build
     > -@@ -562,6 +562,11 @@ if bashcomp_dep.found()
     > +diff --git a/subprojects/gstreamer/meson.build
    b/subprojects/gstreamer/meson.build
     > +index d20fe0040f..b595d8f990 100644
     > +--- a/subprojects/gstreamer/meson.build
     > ++++ b/subprojects/gstreamer/meson.build
     > +@@ -562,6 +562,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())
     > -+installed_tests_enabled = get_option('installed-tests')
     > -+installed_tests_template = files('template.test.in
    <http://template.test.in>')
     >  +
     >   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 c8cee3762..b5da40eaa 100644
     > ---- a/meson_options.txt
     > -+++ b/meson_options.txt
     > +diff --git a/subprojects/gstreamer/meson_options.txt
    b/subprojects/gstreamer/meson_options.txt
     > +index 7363bdb7a1..a34ba37dad 100644
     > +--- a/subprojects/gstreamer/meson_options.txt
     > ++++ b/subprojects/gstreamer/meson_options.txt
     >  @@ -15,6 +15,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')
     > ++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/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -new file mode 100644
     > -index 000000000..f701627f8
     > ---- /dev/null
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -0,0 +1,3 @@
     > -+[Test]
     > -+Type=session
     > -+Exec=@installed_tests_dir@/@program@
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index b2636714b..a697a7b06 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > +diff --git a/subprojects/gstreamer/tests/check/meson.build
    b/subprojects/gstreamer/tests/check/meson.build
     > +index 506606684d..00a138a568 100644
     > +--- a/subprojects/gstreamer/tests/check/meson.build
     > ++++ b/subprojects/gstreamer/tests/check/meson.build
     >  @@ -124,10 +124,16 @@ test_defines = [
     >     '-UG_DISABLE_ASSERT',
     >     '-UG_DISABLE_CAST_CHECKS',
     > @@ -95,7 +85,7 @@ index b2636714b..a697a7b06 100644
     >  +      test_conf.set('installed_tests_dir', join_paths(prefix,
    installed_tests_execdir))
     >  +      test_conf.set('program', test_name)
     >  +      configure_file(
     > -+        input: installed_tests_template,
     > ++        input: 'template.test.in <http://template.test.in>',
     >  +        output: test_name + '.test',
     >  +        install_dir: installed_tests_metadir,
     >  +        configuration: test_conf
     > @@ -105,6 +95,15 @@ index b2636714b..a697a7b06 100644
     >       test(test_name, exe, env: env, timeout : 3 * 60)
     >     endif
     >   endforeach
     > +diff --git a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +new file mode 100644
     > +index 0000000000..f701627f87
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -0,0 +1,3 @@
Quoted 9 lines
     > ++[Test]
     > ++Type=session
     > ++Exec=@installed_tests_dir@/@program@
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 4 lines
     > deleted file mode 100644
     > index e0e64e2c7a..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

Quoted 7 lines
     > +++ /dev/null
     > @@ -1,32 +0,0 @@
     > -From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17
    00:00:00 2001
     > -From: Seungha Yang <[email protected]
    <mailto:[email protected]>>
     > -Date: Tue, 15 Sep 2020 00:54:58 +0900
Quoted 8 lines
     > -Subject: [PATCH] tests: seek: Don't use too strict timeout for
    validation
     > -
     > -Expected segment-done message might not be seen within expected
     > -time if system is not powerful enough.
     > -
     > -Part-of:
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625

Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>>

Quoted 3 lines
     > -
     > -Upstream-Status: Backport
    [

https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c

Quoted 1 line
    <

https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c

Quoted 19 lines

]

     > -Signed-off-by: Anuj Mittal <[email protected]
    <mailto:[email protected]>>
     > ----
     > - tests/check/pipelines/seek.c | 2 +-
     > - 1 file changed, 1 insertion(+), 1 deletion(-)
     > -
     > -diff --git a/tests/check/pipelines/seek.c
    b/tests/check/pipelines/seek.c
     > -index 28bb8846d..5f7447bc5 100644
     > ---- a/tests/check/pipelines/seek.c
     > -+++ b/tests/check/pipelines/seek.c
     > -@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
     > -
     > -   GST_INFO ("wait for segment done message");
     > -
     > --  msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 *
    GST_SECOND,
     > -+  msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
Quoted 9 lines
     > -       GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
     > -   fail_unless (msg, "no message within the timed window");
     > -   fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg),
    "segment-done");
     > ---
     > -2.29.2
     > -
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 3 lines

> similarity index 61%
> rename from

meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 2 lines

> rename to

meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 3 lines
     > index 46813cec3d..10a6dcc619 100644
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch

Quoted 2 lines
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch

Quoted 63 lines
     > @@ -1,4 +1,4 @@
     > -From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17
    00:00:00 2001
     > +From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17
    00:00:00 2001
     >  From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  Date: Sat, 24 Apr 2021 10:34:47 +0100
     >  Subject: [PATCH 3/4] tests: use a dictionaries for environment
     > @@ -10,29 +10,31 @@ Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
    <https://gitlab.freedesktop.org/gstreamer/gstreamer/->
     >
     >  Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     >  ---
     > - tests/check/meson.build | 19 +++++++++++--------
     > - 1 file changed, 11 insertions(+), 8 deletions(-)
     > + subprojects/gstreamer/tests/check/meson.build | 21
    ++++++++++++-------
     > + 1 file changed, 13 insertions(+), 8 deletions(-)
     >
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index a697a7b06..f64524904 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -161,14 +161,17 @@ foreach t : core_tests
     > +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
     >         install: installed_tests_enabled,
     >       )
     >
     >  -    env = environment()
     > --    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
     > +-    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@/@[email protected]'.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')
     > -+    # 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
     > ++    # 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.build_root(),
     > ++      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
     >  +      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
     >  +      'GST_STATE_IGNORE_ELEMENTS': '',
     >  +      'CK_DEFAULT_TIMEOUT': '20',
Quoted 9 lines
     > @@ -44,5 +46,5 @@ index a697a7b06..f64524904 100644
     >       if installed_tests_enabled
     >         test_conf = configuration_data()
     >  --
     > -2.31.1
     > +2.33.1
     >
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 5 lines
     > new file mode 100644
     > index 0000000000..efa004f8ce
     > --- /dev/null
     > +++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch

Quoted 7 lines
     > @@ -0,0 +1,74 @@
     > +From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17
    00:00:00 2001
     > +From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +Date: Sun, 2 May 2021 01:58:01 +0100
     > +Subject: [PATCH 4/4] tests: add helper script to run the
Quoted 8 lines
    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

Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]

Quoted 5 lines
     > +
     > +Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > +---
     > + subprojects/gstreamer/tests/check/meson.build   | 17
Quoted 8 lines
    +++++++++++++++++
     > + .../gstreamer/tests/check/template.sh.in
    <http://template.sh.in>        |  9 +++++++++
     > + .../gstreamer/tests/check/template.test.in
    <http://template.test.in>      |  2 +-
     > + 3 files changed, 27 insertions(+), 1 deletion(-)
     > + create mode 100755
    subprojects/gstreamer/tests/check/template.sh.in <

http://template.sh.in>

Quoted 64 lines
     > +
     > +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
     > +@@ -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/@[email protected] 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/@[email protected]'.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 <http://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/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
    b/subprojects/gstreamer/tests/check/template.sh.in
    <http://template.sh.in>
     > +new file mode 100755
     > +index 0000000000..cf7d31b0ea
     > +--- /dev/null
     > ++++ b/subprojects/gstreamer/tests/check/template.sh.in
    <http://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/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
    b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +index f701627f87..b74ef6ad73 100644
     > +--- a/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > ++++ b/subprojects/gstreamer/tests/check/template.test.in
    <http://template.test.in>
     > +@@ -1,3 +1,3 @@
Quoted 9 lines
     > + [Test]
     > + Type=session
     > +-Exec=@installed_tests_dir@/@program@
     > ++Exec=@installed_tests_dir@/@[email protected]
     > +--
     > +2.33.1
     > +
     > diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 1 line

b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 4 lines
     > deleted file mode 100644
     > index eabe7bcbe1..0000000000
     > ---

a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch

Quoted 8 lines
     > +++ /dev/null
     > @@ -1,58 +0,0 @@
     > -From 57d2965e979f886e03eecd7e351bf01812053971 Mon Sep 17
    00:00:00 2001
     > -From: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > -Date: Sun, 2 May 2021 01:58:01 +0100
     > -Subject: [PATCH 4/4] tests: install the environment for
Quoted 8 lines
    installed_tests
     > -
     > -- adapt the test environment for installed_tests
     > -- install the test environment for installed_tests
     > -- run the tests using the installed environment
     > -
     > -Upstream-Status: Submitted
    [

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789

Quoted 1 line
    <

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789>]

Quoted 40 lines
     > -
     > -Signed-off-by: Jose Quaresma <[email protected]
    <mailto:[email protected]>>
     > ----
     > - template.test.in <http://template.test.in>        |  2 +-
     > - tests/check/meson.build | 18 ++++++++++++++++++
     > - 2 files changed, 19 insertions(+), 1 deletion(-)
     > -
     > -diff --git a/template.test.in <http://template.test.in>
    b/template.test.in <http://template.test.in>
     > -index f701627f8..9a3fbdd09 100644
     > ---- a/template.test.in <http://template.test.in>
     > -+++ b/template.test.in <http://template.test.in>
     > -@@ -1,3 +1,3 @@
     > - [Test]
     > - Type=session
     > --Exec=@installed_tests_dir@/@program@
     > -+Exec=sh -c 'set -aex && source
    @installed_tests_dir@/@[email protected] && exec
    @installed_tests_dir@/@program@'
     > -diff --git a/tests/check/meson.build b/tests/check/meson.build
     > -index f64524904..a67e0f8dd 100644
     > ---- a/tests/check/meson.build
     > -+++ b/tests/check/meson.build
     > -@@ -183,6 +183,24 @@ foreach t : core_tests
     > -         install_dir: installed_tests_metadir,
     > -         configuration: test_conf
     > -       )
     > -+
     > -+      env += {'GST_REGISTRY':
    '~/.cache/gstreamer-1.0/@[email protected]'.format(test_name)}
     > -+      configure_file(
     > -+        output: test_name + '.env',
     > -+        install_dir: installed_tests_execdir,
     > -+        configuration : env,
     > -+      )
     > -+      # helper to convert a meson environment dictionay object
    exported with configure_file
     > -+      # this also remove not needed variables for the installed
    tests
Quoted 8 lines
     > -+      meson.add_postconf_script('sed', '-i',
     > -+        '-e', '/^#define/!d',
     > -+        '-e', 's/^#define //g',
     > -+        '-e', '/^GST_PLUGIN_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SYSTEM_PATH_1_0/d',
     > -+        '-e', '/^GST_PLUGIN_SCANNER_1_0/d',
     > -+        '-e', 's/ /=/',
     > -+        join_paths(meson.current_build_dir(), test_name +

'.env')

Quoted 27 lines
     > -+      )
     > -     endif
     > -
     > -     test(test_name, exe, env: env, timeout : 3 * 60)
     > ---
     > -2.31.1
     > -
     > diff --git
    a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
    b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > similarity index 76%
     > rename from
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > rename to
    meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > index 0d82dd338c..243f99fee9 100644
     > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb
    <http://gstreamer1.0_1.18.5.bb>
     > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
    <http://gstreamer1.0_1.20.0.bb>
     > @@ -10,22 +10,19 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2
    bison-native flex-native"
     >
Quoted 9 lines
     >  inherit meson pkgconfig gettext upstream-version-is-even
    gobject-introspection ptest-gnome
     >
     > -LIC_FILES_CHKSUM =
    "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
     > +LIC_FILES_CHKSUM =
    "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
     >

file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"

Quoted 5 lines
     >
     >  S = "${WORKDIR}/gstreamer-${PV}"
     >
     >  SRC_URI =
    "

https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz

Quoted 1 line
    <

https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$%7BPV%7D.tar.xz

Quoted 5 lines
    \
     >             file://run-ptest \
     > -

file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \

Quoted 3 lines
     > -           file://0002-Remove-unused-valgrind-detection.patch \
     > -

file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \

Quoted 8 lines
     > -
      file://0004-tests-respect-the-idententaion-used-in-meson.patch \
     > -
      file://0005-tests-add-support-for-install-the-tests.patch \
     > -
      file://0006-tests-use-a-dictionaries-for-environment.patch \
     > -

file://0007-tests-install-the-environment-for-installed_tests.patch \

Quoted 2 lines
     > +

file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3
\

Quoted 2 lines
     > +

file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \

Quoted 2 lines
     > +

file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \

Quoted 2 lines
     > +

file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3
\

Quoted 16 lines
     >             "
     > -SRC_URI[sha256sum] =
    "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a"
     > +SRC_URI[sha256sum] =
    "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7"
     >
     >  PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1',
    'tests', '', d)} \
     >                     check \
     > @@ -36,7 +33,7 @@ PACKAGECONFIG[debug] =
    "-Dgst_debug=true,-Dgst_debug=false"
     >  PACKAGECONFIG[tracer-hooks] =
    "-Dtracer_hooks=true,-Dtracer_hooks=false"
     >  PACKAGECONFIG[coretracers] =
    "-Dcoretracers=enabled,-Dcoretracers=disabled"
     >  PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
Quoted 9 lines
     > -PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
     > +PACKAGECONFIG[tests] = "-Dtests=enabled
    -Dinstalled_tests=true,-Dtests=disabled -Dinstalled_tests=false"
     >  PACKAGECONFIG[unwind] =
    "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
     >  PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
     >  PACKAGECONFIG[bash-completion] =

"-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"

Quoted 23 lines
     > --
     > 2.35.1
     >
     >
     > -=-=-=-=-=-=-=-=-=-=-=-
     > Links: You receive all messages sent to this group.
     > View/Reply Online (#161427):
    https://lists.openembedded.org/g/openembedded-core/message/161427
    <https://lists.openembedded.org/g/openembedded-core/message/161427>
     > Mute This Topic:
    https://lists.openembedded.org/mt/88962313/1686489
    <https://lists.openembedded.org/mt/88962313/1686489>
     > Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
     > Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    <https://lists.openembedded.org/g/openembedded-core/unsub>
    [[email protected] <mailto:[email protected]>]
     > -=-=-=-=-=-=-=-=-=-=-=-
     >
Quoted 4 lines

--
Best regards,

José Quaresma

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]

Signature · 3 lines
Best regards,

José Quaresma
#14 lore raw

RE: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma
Quoted 11 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Jose Quaresma
Sent: den 7 februari 2022 02:08
To: [email protected]
Cc: Jose Quaresma <[email protected]>
Subject: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

Since the COPYING file for the GStreamer sub-projects now states that the used license is LGPL-2.1, shouldn't the LICENSE for these recipes be updated to say "LGPL-2.1-or-later"?

As for -bad and -ugly, they should really have individual LICENSE:foo for each generated package, so that only the packages that are affected by the GPL license includes it, and the others only specify LGPL.

//Peter

#15 lore raw

Re: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

Peter Kjellerstedt <[email protected]> escreveu no dia quarta, 9/02/2022 à(s) 19:09:

Quoted 17 lines
Quoted 11 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Jose Quaresma
Sent: den 7 februari 2022 02:08
To: [email protected]
Cc: Jose Quaresma <[email protected]>
Subject: [OE-core] [PATCH 07/17] gstreamer1.0: upgrade 1.18.5 -> 1.20.0

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042

Since the COPYING file for the GStreamer sub-projects now states that the used license is LGPL-2.1, shouldn't the LICENSE for these recipes be updated to say "LGPL-2.1-or-later"?

Quoted 7 lines

As for -bad and -ugly, they should really have individual LICENSE:foo for each generated package, so that only the packages that are affected by the GPL license includes it, and the others only specify LGPL.

//Peter

I have sent a patch for that with your suggestion. I change the LICENSE_FLAGS based on the new gpl as well.
https://patchwork.yoctoproject.org/project/oe-core/patch/[email protected]/

Jose

Signature · 3 lines
Best regards,

José Quaresma
#16 lore raw

PATCH 8/17 gstreamer1.0-plugins-base: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/e5382fe84ccaa17cad3569f2fd061ac0b499329c

- Drop unneed patches
0004-glimagesink-Downrank-to-marginal.patch

- Add new meson options
qt5 is needed to build some tests
tests/examples/gl/qt/meson.build
tests/examples/overlay/meson.build

---
 ...004-glimagesink-Downrank-to-marginal.patch | 32 -------------------
 ...bb => gstreamer1.0-plugins-base_1.20.0.bb} |  8 ++---
 2 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.18.5.bb => gstreamer1.0-plugins-base_1.20.0.bb} (93%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch deleted +0 -32
deleted file mode 100644
index f45ea65ef3..0000000000
@@ -1,32 +0,0 @@
-From 79841a02ee754eba736cb32aaf2ed2b2fc0483d4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Thu, 24 Sep 2015 19:47:32 +0300
-Subject: [PATCH 4/4] glimagesink: Downrank to marginal
-
-On desktop, where there is good OpenGL, xvimagesink will come up first,
-on other platforms, OpenGL can't be trusted because it's either software (like
-in a VM) or broken (like on embedded)., so let ximagesink come above.
-
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684]
-
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- ext/gl/gstopengl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
-index 302e845..463be9c 100644
---- a/ext/gl/gstopengl.c
-+++ b/ext/gl/gstopengl.c
-@@ -127,7 +127,7 @@ plugin_init (GstPlugin * plugin)
- #endif
- 
-   if (!gst_element_register (plugin, "glimagesink",
--          GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
-+          GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
-     return FALSE;
-   }
- 
--- 
-2.28.0
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb +4 -4
similarity index 93%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.bb
index 180241828f..455c9fc480 100644
@@ -3,16 +3,15 @@ require gstreamer1.0-plugins-common.inc
 DESCRIPTION = "'Base' GStreamer plugins and helper libraries"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
 BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues"
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
            file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
            file://0003-viv-fb-Make-sure-config.h-is-included.patch \
            file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
-           file://0004-glimagesink-Downrank-to-marginal.patch \
            "
-SRC_URI[sha256sum] = "960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3"
+SRC_URI[sha256sum] = "4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c"
 
 S = "${WORKDIR}/gst-plugins-base-${PV}"
 
@@ -49,6 +48,7 @@ PACKAGECONFIG[ogg]          = "-Dogg=enabled,-Dogg=disabled,libogg"
 PACKAGECONFIG[opus]         = "-Dopus=enabled,-Dopus=disabled,libopus"
 PACKAGECONFIG[pango]        = "-Dpango=enabled,-Dpango=disabled,pango"
 PACKAGECONFIG[png]          = "-Dgl-png=enabled,-Dgl-png=disabled,libpng"
+PACKAGECONFIG[qt5]          = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native"
 PACKAGECONFIG[theora]       = "-Dtheora=enabled,-Dtheora=disabled,libtheora"
 PACKAGECONFIG[tremor]       = "-Dtremor=enabled,-Dtremor=disabled,tremor"
 PACKAGECONFIG[visual]       = "-Dlibvisual=enabled,-Dlibvisual=disabled,libvisual"
Signature · 1 line
2.35.1
#17 lore raw

PATCH 9/17 gstreamer1.0-plugins-good: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma
---
 ...ugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.20.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.20.0.bb} (97%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb +1 -1
similarity index 97%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.bb
index ade935df9e..da4d4a8ccb 100644
@@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go
            file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
            "
 
-SRC_URI[sha256sum] = "3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b"
+SRC_URI[sha256sum] = "2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c"
 
 S = "${WORKDIR}/gst-plugins-good-${PV}"
 
Signature · 1 line
2.35.1
#18 lore raw

PATCH 10/17 gstreamer1.0-plugins-bad: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- Remove meson options
libmms
ofa

- Add new meson options
gpl: Allow build plugins that have GPL-licensed dependencies
faad: Free AAC audio decoder plugin (GPL - only built if gpl option is also enabled!)
resindvd: Resin DVD playback plugin (GPL - only built if gpl option is also enabled!)
x265: HEVC/H.265 video encoder plugin (GPL - only built if gpl option is also enabled!)

- Add new meson options
Feature options for plugins without external deps
codecalpha
aes: AES encryption/decryption plugin

Feature options for plugins that need external deps
asio: Steinberg Audio Streaming Input Output (ASIO) plugin
gs: Google Cloud Storage source and sink plugin
ldac: LDAC bluetooth audio codec plugin
openaptx: Open Source implementation of Audio Processing Technology codec (aptX) plugin
qroverlay: new elements that allow overlaying data on top of video in the form of a QR code
onnx: ONNX neural network plugin

---
 ...ialized-warnings-when-compiling-with.patch |  8 ++--
 ...-avoid-including-sys-poll.h-directly.patch | 12 +++---
 ...-sentinals-for-gst_structure_get-etc.patch | 22 +++++-----
 ...issing-opencv-data-dir-in-yocto-buil.patch | 42 ++++++-------------
 .../0005-msdk-fix-includedir-path.patch       | 41 +++++++++++-------
 ....bb => gstreamer1.0-plugins-bad_1.20.0.bb} | 23 ++++++----
 6 files changed, 70 insertions(+), 78 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.20.0.bb} (95%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +3 -5
index 13a673cd50..4b3451d321 100644
@@ -1,11 +1,12 @@
-From f08ab3ac2ce43ac91d3bf65b26f26436690f499b Mon Sep 17 00:00:00 2001
+From 6c3eeaf6435608f744303c17d52245f926cd28ac Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Tue, 26 Jan 2016 15:16:01 -0800
-Subject: [PATCH 1/4] fix maybe-uninitialized warnings when compiling with -Os
+Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
 
 Upstream-Status: Pending
 
 Signed-off-by: Andre McCurdy <[email protected]>
+
 ---
  gst-libs/gst/codecparsers/gstvc1parser.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -23,6 +24,3 @@ index 2c60ced..e8226d8 100644
    guint8 structA[8] = { 0, };
    guint8 structB[12] = { 0, };
    GstBitReader br;
--- 
-2.28.0
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +5 -7
index ead6897f67..e3e5d9fb60 100644
@@ -1,22 +1,23 @@
-From 3b05e91720c10fcf6e0e408595b7217f6fa145c2 Mon Sep 17 00:00:00 2001
+From 701255c5797f222f0c47ace6437d213607b98d1e Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Wed, 3 Feb 2016 18:05:41 -0800
-Subject: [PATCH 2/4] avoid including <sys/poll.h> directly
+Subject: [PATCH] avoid including <sys/poll.h> directly
 
 musl libc generates warnings if <sys/poll.h> is included directly.
 
 Upstream-Status: Pending
 
 Signed-off-by: Andre McCurdy <[email protected]>
+
 ---
  sys/dvb/gstdvbsrc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
-index ca6b92a..b2772db 100644
+index 92c918c..5e27871 100644
 --- a/sys/dvb/gstdvbsrc.c
 +++ b/sys/dvb/gstdvbsrc.c
-@@ -97,7 +97,7 @@
+@@ -98,7 +98,7 @@
  #include <gst/gst.h>
  #include <gst/glib-compat-private.h>
  #include <sys/ioctl.h>
@@ -25,6 +26,3 @@ index ca6b92a..b2772db 100644
  #include <fcntl.h>
  #include <errno.h>
  #include <stdio.h>
--- 
-2.28.0
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch +10 -12
index 88fbc40dcd..280cbf984a 100644
@@ -1,7 +1,7 @@
-From 5ed27de9f662fe063b8b3d5d4335aa64cd4718c9 Mon Sep 17 00:00:00 2001
+From 001fa08542dd5fc79571f7c803b2d3dd59c04a06 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Tue, 9 Feb 2016 14:00:00 -0800
-Subject: [PATCH 3/4] ensure valid sentinals for gst_structure_get() etc
+Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc
 
 For GStreamer functions declared with G_GNUC_NULL_TERMINATED,
 ie __attribute__((__sentinel__)), gcc will generate a warning if the
@@ -17,6 +17,7 @@ without an explicit cast to a pointer type.
 Upstream-Status: Pending
 
 Signed-off-by: Andre McCurdy <[email protected]>
+
 ---
  sys/decklink/gstdecklink.cpp          | 10 +++++-----
  sys/decklink/gstdecklinkaudiosrc.cpp  |  2 +-
@@ -24,10 +25,10 @@ Signed-off-by: Andre McCurdy <[email protected]>
  3 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
-index 4dac7e1..43762ce 100644
+index 3f79deb..96600c6 100644
 --- a/sys/decklink/gstdecklink.cpp
 +++ b/sys/decklink/gstdecklink.cpp
-@@ -674,7 +674,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e)
+@@ -680,7 +680,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e)
        "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
        "interlace-mode", G_TYPE_STRING,
        mode->interlaced ? "interleaved" : "progressive",
@@ -36,7 +37,7 @@ index 4dac7e1..43762ce 100644
  
    return s;
  }
-@@ -699,16 +699,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
+@@ -705,16 +705,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
      case bmdFormat8BitYUV:     /* '2vuy' */
        gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
            "colorimetry", G_TYPE_STRING, mode->colorimetry,
@@ -58,10 +59,10 @@ index 4dac7e1..43762ce 100644
      case bmdFormat10BitRGB:    /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */
      case bmdFormat12BitRGB:    /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
 diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
-index 2fef934..c47229a 100644
+index 50ad5cc..d209180 100644
 --- a/sys/decklink/gstdecklinkaudiosrc.cpp
 +++ b/sys/decklink/gstdecklinkaudiosrc.cpp
-@@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self)
+@@ -388,7 +388,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self)
        g_mutex_unlock (&self->input->lock);
  
        if (videosrc) {
@@ -71,10 +72,10 @@ index 2fef934..c47229a 100644
  
          switch (vconn) {
 diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
-index e3a6775..f1a5aae 100644
+index a64c046..07a09e8 100644
 --- a/sys/decklink/gstdecklinkvideosink.cpp
 +++ b/sys/decklink/gstdecklinkvideosink.cpp
-@@ -286,7 +286,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
+@@ -288,7 +288,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
      gpointer user_data)
  {
    gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
@@ -83,6 +84,3 @@ index e3a6775..f1a5aae 100644
  
    return TRUE;
  }
--- 
-2.28.0
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +13 -29

59 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +25 -16

53 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +14 -9
similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb
index f90dff693d..915d4ec744 100644
@@ -11,17 +11,13 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
            file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
            file://0005-msdk-fix-includedir-path.patch \
            "
-SRC_URI[sha256sum] = "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e"
+SRC_URI[sha256sum] = "015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d"
 
 S = "${WORKDIR}/gst-plugins-bad-${PV}"
 
 LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-# remove at next version upgrade or when output changes
-PR = "r1"
-HASHEQUIV_HASH_VERSION .= ".1"
-
 DEPENDS += "gstreamer1.0-plugins-base"
 
 inherit gobject-introspection
@@ -48,7 +44,6 @@ PACKAGECONFIG[dc1394]          = "-Ddc1394=enabled,-Ddc1394=disabled,libdc1394"
 PACKAGECONFIG[directfb]        = "-Ddirectfb=enabled,-Ddirectfb=disabled,directfb"
 PACKAGECONFIG[dtls]            = "-Ddtls=enabled,-Ddtls=disabled,openssl"
 PACKAGECONFIG[faac]            = "-Dfaac=enabled,-Dfaac=disabled,faac"
-PACKAGECONFIG[faad]            = "-Dfaad=enabled,-Dfaad=disabled,faad2"
 PACKAGECONFIG[fluidsynth]      = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth"
 PACKAGECONFIG[hls]             = "-Dhls=enabled,-Dhls=disabled,"
 # Pick atleast one crypto backend below when enabling hls
@@ -61,7 +56,6 @@ PACKAGECONFIG[gcrypt]          = "-Dhls-crypto=libgcrypt,,libgcrypt"
 PACKAGECONFIG[gl]              = "-Dgl=enabled,-Dgl=disabled,"
 PACKAGECONFIG[kms]             = "-Dkms=enabled,-Dkms=disabled,libdrm"
 PACKAGECONFIG[libde265]        = "-Dlibde265=enabled,-Dlibde265=disabled,libde265"
-PACKAGECONFIG[libmms]          = "-Dlibmms=enabled,-Dlibmms=disabled,libmms"
 PACKAGECONFIG[libssh2]         = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2"
 PACKAGECONFIG[lcms2]           = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms"
 PACKAGECONFIG[modplug]         = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug"
@@ -75,7 +69,6 @@ PACKAGECONFIG[openmpt]         = "-Dopenmpt=enabled,-Dopenmpt=disabled,libopenmp
 # the opus encoder/decoder elements are now in the -base package,
 # but the opus parser remains in -bad
 PACKAGECONFIG[opusparse]       = "-Dopus=enabled,-Dopus=disabled,libopus"
-PACKAGECONFIG[resindvd]        = "-Dresindvd=enabled,-Dresindvd=disabled,libdvdread libdvdnav"
 PACKAGECONFIG[rsvg]            = "-Drsvg=enabled,-Drsvg=disabled,librsvg"
 PACKAGECONFIG[rtmp]            = "-Drtmp=enabled,-Drtmp=disabled,rtmpdump"
 PACKAGECONFIG[sbc]             = "-Dsbc=enabled,-Dsbc=disabled,sbc"
@@ -98,10 +91,17 @@ PACKAGECONFIG[webrtc]          = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice"
 PACKAGECONFIG[webrtcdsp]       = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing"
 PACKAGECONFIG[zbar]            = "-Dzbar=enabled,-Dzbar=disabled,zbar"
 PACKAGECONFIG[x11]             = "-Dx11=enabled,-Dx11=disabled,libxcb libxkbcommon"
+
+# GPL - only built if gpl option is also enabled!
+PACKAGECONFIG[gpl]             = "-Dgpl=enabled,-Dgpl=disabled"
+PACKAGECONFIG[faad]            = "-Dfaad=enabled,-Dfaad=disabled,faad2"
+PACKAGECONFIG[resindvd]        = "-Dresindvd=enabled,-Dresindvd=disabled,libdvdread libdvdnav"
 PACKAGECONFIG[x265]            = "-Dx265=enabled,-Dx265=disabled,x265"
 
 EXTRA_OEMESON += " \
     -Ddoc=disabled \
+    -Daes=enabled \
+    -Dcodecalpha=enabled \
     -Ddecklink=enabled \
     -Ddvb=enabled \
     -Dfbdev=enabled \
@@ -110,6 +110,7 @@ EXTRA_OEMESON += " \
     -Dtranscode=enabled \
     -Dandroidmedia=disabled \
     -Dapplemedia=disabled \
+    -Dasio=disabled \
     -Davtp=disabled \
     -Dbs2b=disabled \
     -Dchromaprint=disabled \
@@ -120,10 +121,12 @@ EXTRA_OEMESON += " \
     -Dfdkaac=disabled \
     -Dflite=disabled \
     -Dgme=disabled \
+    -Dgs=disabled \
     -Dgsm=disabled \
     -Diqa=disabled \
     -Dkate=disabled \
     -Dladspa=disabled \
+    -Dldac=disabled \
     -Dlv2=disabled \
     -Dmagicleap=disabled \
     -Dmediafoundation=disabled \
@@ -132,10 +135,12 @@ EXTRA_OEMESON += " \
     -Dmplex=disabled \
     -Dmusepack=disabled \
     -Dnvcodec=disabled \
-    -Dofa=disabled \
     -Dopenexr=disabled \
     -Dopenni2=disabled \
+    -Dopenaptx=disabled \
     -Dopensles=disabled \
+    -Donnx=disabled \
+    -Dqroverlay=disabled \
     -Dsoundtouch=disabled \
     -Dspandsp=disabled \
     -Dsvthevcenc=disabled \
Signature · 1 line
2.35.1
#19 lore raw

PATCH 11/17 gstreamer1.0-plugins-ugly: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- Add new meson options
gpl: Allow build plugins that have GPL-licensed dependencies
a52dec: Dolby Digital (AC-3) audio decoder plugin based on liba52 (GPL - only built if gpl option is also enabled!)
cdio: CD audio source plugin based on libcdio (GPL - only built if gpl option is also enabled!)
dvdread: DVD video source plugin based on libdvdread (GPL - only built if gpl option is also enabled!)
mpeg2dec: MPEG 2 video decoder plugin based on libmpeg2 (GPL - only built if gpl option is also enabled!)
x264: H.264 video encoder plugin based on libx264 (GPL - only built if gpl option is also enabled!)

---
 ...gly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.20.0.bb} | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.20.0.bb} (87%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +6 -3
similarity index 87%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.0.bb
index 9777aaee19..8128104319 100644
@@ -13,7 +13,7 @@ LICENSE_FLAGS = "commercial"
 SRC_URI = " \
             https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
             "
-SRC_URI[sha256sum] = "df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9"
+SRC_URI[sha256sum] = "4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e"
 
 S = "${WORKDIR}/gst-plugins-ugly-${PV}"
 
@@ -23,13 +23,16 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0"
 
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
-    a52dec mpeg2dec \
+    gpl a52dec mpeg2dec \
 "
 
-PACKAGECONFIG[a52dec]   = "-Da52dec=enabled,-Da52dec=disabled,liba52"
 PACKAGECONFIG[amrnb]    = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
 PACKAGECONFIG[amrwb]    = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr"
+
+# GPL - only built if gpl option is also enabled!
+PACKAGECONFIG[gpl]      = "-Dgpl=enabled,-Dgpl=disabled"
 PACKAGECONFIG[cdio]     = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
+PACKAGECONFIG[a52dec]   = "-Da52dec=enabled,-Da52dec=disabled,liba52"
 PACKAGECONFIG[dvdread]  = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
 PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
 PACKAGECONFIG[x264]     = "-Dx264=enabled,-Dx264=disabled,x264"
Signature · 1 line
2.35.1
#20 lore raw

PATCH 12/17 gstreamer1.0-rtsp-server: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.
https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70

---
 ...sp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.20.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.20.0.bb} (82%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb +2 -2
similarity index 82%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.0.bb
index 50426ad46d..66764f0880 100644
@@ -2,7 +2,7 @@ SUMMARY = "A library on top of GStreamer for building an RTSP server"
 HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/"
 SECTION = "multimedia"
 LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
 
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f"
+SRC_URI[sha256sum] = "c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843"
 
 S = "${WORKDIR}/${PNREAL}-${PV}"
 
Signature · 1 line
2.35.1
#21 lore raw

PATCH 13/17 gstreamer1.0-libav: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- License update:
The code actually is LGPLv2.1 but the COPYING file is wrong.
https://gitlab.freedesktop.org/gstreamer/gst-libav/-/commit/678773bb6468e815c180ff82a09d863451e89ba8

- Drop backported patches 0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch

- Add new meson options

---
 ...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------
 ...1.18.5.bb => gstreamer1.0-libav_1.20.0.bb} |  12 +-
 2 files changed, 7 insertions(+), 351 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.18.5.bb => gstreamer1.0-libav_1.20.0.bb} (75%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch deleted +0 -346
deleted file mode 100644
index 022ff9af29..0000000000
@@ -1,346 +0,0 @@
-From 38d10ee800e42afeacc6bee714216e4c974c11f5 Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <[email protected]>
-Date: Mon, 17 Jan 2022 01:33:47 +0800
-Subject: [PATCH] gst-libav: fix build with ffmpeg-5.0.0
-
-Latest ffmpeg has removed avcodec_get_context_defaults(), and its
-documentation says a new AVCodecContext should be allocated for this
-purpose.  The pointer returned by avcodec_find_decoder() is now
-const-qualified so we also need to adjust for it.  And, AVCOL_RANGE_MPEG
-is now rejected with strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1531>
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- ext/libav/gstavauddec.c   | 22 ++++++++-------------
- ext/libav/gstavaudenc.c   | 40 +++++++++++++++++++--------------------
- ext/libav/gstavcodecmap.c |  7 ++++---
- ext/libav/gstavutils.c    |  2 +-
- ext/libav/gstavviddec.c   | 28 +++++++++++----------------
- ext/libav/gstavvidenc.c   | 21 ++++++++++----------
- 6 files changed, 54 insertions(+), 66 deletions(-)
-
-diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c
-index baf7aa5..b03a724 100644
---- a/ext/libav/gstavauddec.c
-+++ b/ext/libav/gstavauddec.c
-@@ -168,12 +168,7 @@ gst_ffmpegauddec_finalize (GObject * object)
-   GstFFMpegAudDec *ffmpegdec = (GstFFMpegAudDec *) object;
- 
-   av_frame_free (&ffmpegdec->frame);
--
--  if (ffmpegdec->context != NULL) {
--    gst_ffmpeg_avcodec_close (ffmpegdec->context);
--    av_free (ffmpegdec->context);
--    ffmpegdec->context = NULL;
--  }
-+  avcodec_free_context (&ffmpegdec->context);
- 
-   G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -193,14 +188,12 @@ gst_ffmpegauddec_close (GstFFMpegAudDec * ffmpegdec, gboolean reset)
-   gst_ffmpeg_avcodec_close (ffmpegdec->context);
-   ffmpegdec->opened = FALSE;
- 
--  if (ffmpegdec->context->extradata) {
--    av_free (ffmpegdec->context->extradata);
--    ffmpegdec->context->extradata = NULL;
--  }
-+  av_freep (&ffmpegdec->context->extradata);
- 
-   if (reset) {
--    if (avcodec_get_context_defaults3 (ffmpegdec->context,
--            oclass->in_plugin) < 0) {
-+    avcodec_free_context (&ffmpegdec->context);
-+    ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegdec->context == NULL) {
-       GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
-       return FALSE;
-     }
-@@ -219,8 +212,9 @@ gst_ffmpegauddec_start (GstAudioDecoder * decoder)
-   oclass = (GstFFMpegAudDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
- 
-   GST_OBJECT_LOCK (ffmpegdec);
--  gst_ffmpeg_avcodec_close (ffmpegdec->context);
--  if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) {
-+  avcodec_free_context (&ffmpegdec->context);
-+  ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+  if (ffmpegdec->context == NULL) {
-     GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
-     GST_OBJECT_UNLOCK (ffmpegdec);
-     return FALSE;
-diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c
-index 3ff6432..689982f 100644
---- a/ext/libav/gstavaudenc.c
-+++ b/ext/libav/gstavaudenc.c
-@@ -175,10 +175,8 @@ gst_ffmpegaudenc_finalize (GObject * object)
- 
-   /* clean up remaining allocated data */
-   av_frame_free (&ffmpegaudenc->frame);
--  gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
--  gst_ffmpeg_avcodec_close (ffmpegaudenc->refcontext);
--  av_free (ffmpegaudenc->context);
--  av_free (ffmpegaudenc->refcontext);
-+  avcodec_free_context (&ffmpegaudenc->context);
-+  avcodec_free_context (&ffmpegaudenc->refcontext);
- 
-   G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -193,9 +191,9 @@ gst_ffmpegaudenc_start (GstAudioEncoder * encoder)
-   ffmpegaudenc->opened = FALSE;
-   ffmpegaudenc->need_reopen = FALSE;
- 
--  gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
--  if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
--          oclass->in_plugin) < 0) {
-+  avcodec_free_context (&ffmpegaudenc->context);
-+  ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+  if (ffmpegaudenc->context == NULL) {
-     GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
-     return FALSE;
-   }
-@@ -241,10 +239,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
- 
-   /* close old session */
-   if (ffmpegaudenc->opened) {
--    gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+    avcodec_free_context (&ffmpegaudenc->context);
-     ffmpegaudenc->opened = FALSE;
--    if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
--            oclass->in_plugin) < 0) {
-+    ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegaudenc->context == NULL) {
-       GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
-       return FALSE;
-     }
-@@ -286,11 +284,11 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
-   /* open codec */
-   if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) {
-     gst_caps_unref (allowed_caps);
--    gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+    avcodec_free_context (&ffmpegaudenc->context);
-     GST_DEBUG_OBJECT (ffmpegaudenc, "avenc_%s: Failed to open FFMPEG codec",
-         oclass->in_plugin->name);
--    if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
--            oclass->in_plugin) < 0)
-+    ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegaudenc->context == NULL)
-       GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
- 
-     if ((oclass->in_plugin->capabilities & AV_CODEC_CAP_EXPERIMENTAL) &&
-@@ -312,10 +310,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
- 
-   if (!other_caps) {
-     gst_caps_unref (allowed_caps);
--    gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+    avcodec_free_context (&ffmpegaudenc->context);
-     GST_DEBUG ("Unsupported codec - no caps found");
--    if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
--            oclass->in_plugin) < 0)
-+    ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegaudenc->context == NULL)
-       GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
-     return FALSE;
-   }
-@@ -331,10 +329,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
- 
-   if (!gst_audio_encoder_set_output_format (GST_AUDIO_ENCODER (ffmpegaudenc),
-           icaps)) {
--    gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+    avcodec_free_context (&ffmpegaudenc->context);
-     gst_caps_unref (icaps);
--    if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
--            oclass->in_plugin) < 0)
-+    ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegaudenc->context == NULL)
-       GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
-     return FALSE;
-   }
-@@ -403,8 +401,8 @@ buffer_info_free (void *opaque, guint8 * data)
-     gst_buffer_unmap (info->buffer, &info->map);
-     gst_buffer_unref (info->buffer);
-   } else {
--    av_free (info->ext_data);
--    av_free (info->ext_data_array);
-+    av_freep (&info->ext_data);
-+    av_freep (&info->ext_data_array);
-   }
-   g_slice_free (BufferInfo, info);
- }
-diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
-index f58633d..e2a3641 100644
---- a/ext/libav/gstavcodecmap.c
-+++ b/ext/libav/gstavcodecmap.c
-@@ -2331,7 +2331,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
-   }
- 
-   if (buildcaps) {
--    AVCodec *codec;
-+    const AVCodec *codec;
- 
-     if ((codec = avcodec_find_decoder (codec_id)) ||
-         (codec = avcodec_find_encoder (codec_id))) {
-@@ -2975,6 +2975,7 @@ gst_ffmpeg_videoinfo_to_context (GstVideoInfo * info, AVCodecContext * context)
-     context->color_range = AVCOL_RANGE_JPEG;
-   } else {
-     context->color_range = AVCOL_RANGE_MPEG;
-+    context->strict_std_compliance = FF_COMPLIANCE_UNOFFICIAL;
-   }
- }
- 
-@@ -4330,7 +4331,7 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
-     audio = TRUE;
-   } else if (!strncmp (mimetype, "audio/x-gst-av-", 15)) {
-     gchar ext[16];
--    AVCodec *codec;
-+    const AVCodec *codec;
- 
-     if (strlen (mimetype) <= 30 &&
-         sscanf (mimetype, "audio/x-gst-av-%s", ext) == 1) {
-@@ -4342,7 +4343,7 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
-     }
-   } else if (!strncmp (mimetype, "video/x-gst-av-", 15)) {
-     gchar ext[16];
--    AVCodec *codec;
-+    const AVCodec *codec;
- 
-     if (strlen (mimetype) <= 30 &&
-         sscanf (mimetype, "video/x-gst-av-%s", ext) == 1) {
-diff --git a/ext/libav/gstavutils.c b/ext/libav/gstavutils.c
-index 3780cff..f3878c3 100644
---- a/ext/libav/gstavutils.c
-+++ b/ext/libav/gstavutils.c
-@@ -36,7 +36,7 @@
- const gchar *
- gst_ffmpeg_get_codecid_longname (enum AVCodecID codec_id)
- {
--  AVCodec *codec;
-+  const AVCodec *codec;
-   /* Let's use what ffmpeg can provide us */
- 
-   if ((codec = avcodec_find_decoder (codec_id)) ||
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index 7ec5766..5dd207e 100644
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -320,12 +320,7 @@ gst_ffmpegviddec_finalize (GObject * object)
-   GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) object;
- 
-   av_frame_free (&ffmpegdec->picture);
--
--  if (ffmpegdec->context != NULL) {
--    gst_ffmpeg_avcodec_close (ffmpegdec->context);
--    av_free (ffmpegdec->context);
--    ffmpegdec->context = NULL;
--  }
-+  avcodec_free_context (&ffmpegdec->context);
- 
-   G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -363,13 +358,11 @@ gst_ffmpegviddec_close (GstFFMpegVidDec * ffmpegdec, gboolean reset)
- 
-   gst_buffer_replace (&ffmpegdec->palette, NULL);
- 
--  if (ffmpegdec->context->extradata) {
--    av_free (ffmpegdec->context->extradata);
--    ffmpegdec->context->extradata = NULL;
--  }
-+  av_freep (&ffmpegdec->context->extradata);
-   if (reset) {
--    if (avcodec_get_context_defaults3 (ffmpegdec->context,
--            oclass->in_plugin) < 0) {
-+    avcodec_free_context (&ffmpegdec->context);
-+    ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegdec->context == NULL) {
-       GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
-       return FALSE;
-     }
-@@ -1704,7 +1697,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
-     if (side_data) {
-       GST_LOG_OBJECT (ffmpegdec,
-           "Found CC side data of type AV_FRAME_DATA_A53_CC, size %d",
--          side_data->size);
-+          (int) side_data->size);
-       GST_MEMDUMP ("A53 CC", side_data->data, side_data->size);
- 
-       /* do not add closed caption meta if it already exists */
-@@ -1966,8 +1959,9 @@ gst_ffmpegviddec_start (GstVideoDecoder * decoder)
-   oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
- 
-   GST_OBJECT_LOCK (ffmpegdec);
--  gst_ffmpeg_avcodec_close (ffmpegdec->context);
--  if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) {
-+  avcodec_free_context (&ffmpegdec->context);
-+  ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+  if (ffmpegdec->context == NULL) {
-     GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
-     GST_OBJECT_UNLOCK (ffmpegdec);
-     return FALSE;
-@@ -2261,10 +2255,10 @@ gst_ffmpegviddec_get_property (GObject * object,
- 
-   switch (prop_id) {
-     case PROP_LOWRES:
--      g_value_set_enum (value, ffmpegdec->context->lowres);
-+      g_value_set_enum (value, ffmpegdec->lowres);
-       break;
-     case PROP_SKIPFRAME:
--      g_value_set_enum (value, ffmpegdec->context->skip_frame);
-+      g_value_set_enum (value, ffmpegdec->skip_frame);
-       break;
-     case PROP_DIRECT_RENDERING:
-       g_value_set_boolean (value, ffmpegdec->direct_rendering);
-diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
-index 0468d88..2ed9e5a 100644
---- a/ext/libav/gstavvidenc.c
-+++ b/ext/libav/gstavvidenc.c
-@@ -224,8 +224,8 @@ gst_ffmpegvidenc_finalize (GObject * object)
-   av_frame_free (&ffmpegenc->picture);
-   gst_ffmpeg_avcodec_close (ffmpegenc->context);
-   gst_ffmpeg_avcodec_close (ffmpegenc->refcontext);
--  av_free (ffmpegenc->context);
--  av_free (ffmpegenc->refcontext);
-+  av_freep (&ffmpegenc->context);
-+  av_freep (&ffmpegenc->refcontext);
- 
-   G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -247,10 +247,10 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder,
- 
-   /* close old session */
-   if (ffmpegenc->opened) {
--    gst_ffmpeg_avcodec_close (ffmpegenc->context);
-+    avcodec_free_context (&ffmpegenc->context);
-     ffmpegenc->opened = FALSE;
--    if (avcodec_get_context_defaults3 (ffmpegenc->context,
--            oclass->in_plugin) < 0) {
-+    ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegenc->context == NULL) {
-       GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults");
-       return FALSE;
-     }
-@@ -454,9 +454,9 @@ bad_input_fmt:
-   }
- close_codec:
-   {
--    gst_ffmpeg_avcodec_close (ffmpegenc->context);
--    if (avcodec_get_context_defaults3 (ffmpegenc->context,
--            oclass->in_plugin) < 0)
-+    avcodec_free_context (&ffmpegenc->context);
-+    ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+    if (ffmpegenc->context == NULL)
-       GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults");
-     goto cleanup_stats_in;
-   }
-@@ -896,8 +896,9 @@ gst_ffmpegvidenc_start (GstVideoEncoder * encoder)
-   ffmpegenc->need_reopen = FALSE;
- 
-   /* close old session */
--  gst_ffmpeg_avcodec_close (ffmpegenc->context);
--  if (avcodec_get_context_defaults3 (ffmpegenc->context, oclass->in_plugin) < 0) {
-+  avcodec_free_context (&ffmpegenc->context);
-+  ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+  if (ffmpegenc->context == NULL) {
-     GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults");
-     return FALSE;
-   }
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb +7 -5
similarity index 75%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.0.bb
index 64b8bcdb52..98b2650bb0 100644
@@ -7,14 +7,12 @@ SECTION = "multimedia"
 # ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency
 LICENSE_FLAGS = "commercial"
 LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                     file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
                     "
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
-           file://0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch \
-           "
-SRC_URI[sha256sum] = "822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
+SRC_URI[sha256sum] = "5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17"
 
 S = "${WORKDIR}/gst-libav-${PV}"
 
@@ -22,5 +20,9 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
 
 inherit meson pkgconfig upstream-version-is-even
 
+EXTRA_OEMESON += " \
+    -Dtests=disabled \
+"
+
 FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
 FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
Signature · 1 line
2.35.1
#22 lore raw

PATCH 14/17 gstreamer1.0-vaapi: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma
---
 ...streamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} (95%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb +1 -1
similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.0.bb
index 9a68a3fadf..ce7fbde0df 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b"
+SRC_URI[sha256sum] = "f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32"
 
 S = "${WORKDIR}/${REALPN}-${PV}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
Signature · 1 line
2.35.1
#23 lore raw

PATCH 15/17 gstreamer1.0-omx: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma
---
 .../{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} (95%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb +1 -1
similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.0.bb
index b2c1eb3ea0..15f19e349e 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42"
+SRC_URI[sha256sum] = "c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd"
 
 S = "${WORKDIR}/gst-omx-${PV}"
 
Signature · 1 line
2.35.1
#24 lore raw

PATCH 16/17 gstreamer1.0-python: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- Add new meson options

---
 ...1.0-python_1.18.5.bb => gstreamer1.0-python_1.20.0.bb} | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.20.0.bb} (82%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb +6 -2
similarity index 82%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.0.bb
index 1dd7d0d09a..3399b6f9d7 100644
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52"
+SRC_URI[sha256sum] = "8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
@@ -17,7 +17,11 @@ PNREAL = "gst-python"
 
 S = "${WORKDIR}/${PNREAL}-${PV}"
 
-EXTRA_OEMESON += "-Dlibpython-dir=${libdir}"
+EXTRA_OEMESON += "\
+    -Dtests=disabled \
+    -Dplugin=enabled \
+    -Dlibpython-dir=${libdir} \
+"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
Signature · 1 line
2.35.1
#25 lore raw

PATCH 17/17 gst-devtools: upgrade 1.18.5 -> 1.20.0

In reply to Jose Quaresma

- Add new meson options

---
 .../{gst-devtools_1.18.5.bb => gst-devtools_1.20.0.bb}       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.20.0.bb} (90%)
meta/recipes-multimedia/gstreamer/gst-devtools_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb +4 -1
similarity index 90%
rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.20.0.bb
index 1b46b89cb9..7a27d27b2e 100644
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}
            file://0001-connect-has-a-different-signature-on-musl.patch \
            "
 
-SRC_URI[sha256sum] = "fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079"
+SRC_URI[sha256sum] = "69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d"
 
 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS:${PN} = "git"
@@ -30,6 +30,9 @@ def gettext_oemeson(d):
         return '-Dnls=disabled'
     return '-Dnls=enabled'
 
+# Build GstValidateVideo
+PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
+
 EXTRA_OEMESON += " \
     -Ddoc=disabled \
     -Ddebug_viewer=disabled \
Signature · 1 line
2.35.1