From patchwork Wed Jan 26 10:28:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2954 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 283F2C63684 for ; Wed, 26 Jan 2022 10:28:36 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.10914.1643192914396609213 for ; Wed, 26 Jan 2022 02:28:35 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=OLGnRxrk; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id D99A2801CF; Wed, 26 Jan 2022 11:28:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192912; bh=v/6GKLY9Fzt/xxbET92lAgfFg0tygiPtmQEcggzgyoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OLGnRxrkpUQPm0GleQnJlsHmJzJ5GMYb8lvwQG6Z/3hWan/zJCo4k5uP3lBLvj7yK ZpsbxSM3Xwf69O5baKlf6gIVERdDCRSl3oZ3telr0AwDpJetIwylw+3fsEcKn+Umrh sOVPWeqCZK2/mxumAB5QFe1XFXB3yN8A/uSvTswCc6KGPbP02DwYHV7IgK722woBsv gp2xRXWg4fuxoPRuVJLW+81dYifT9NGU1I/9LLylXfc0sdhCoz86rgClYZBB0XT/sH gbwKEpRJviBjDQOOVAbZEeuQuB7E+uaC0tZ5gXs5nC01GmNkQS9tOhNE58H++yO3Rw pJDp64WAmniHA== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 01/12] gstreamer1.0: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:03 +0100 Message-Id: <20220126102814.4173943-2-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160967 Gstreamer moved to a monorepo structure, this commit changed to use one SRC_URI defined in gstreamer1.0-source.inc, which all recipes use and set their own `S`ource path to their subproject path. Backported patches where remove and the other, which still apply where updated. Signed-off-by: Claudius Heine --- .../gstreamer/gstreamer1.0-source.inc | 5 + ...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 | 72 +++++++++++ ...-the-environment-for-installed_tests.patch | 58 --------- ...er1.0_1.18.5.bb => gstreamer1.0_1.20.0.bb} | 25 ++-- 10 files changed, 140 insertions(+), 342 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc 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} (72%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc new file mode 100644 index 0000000000..ca38322576 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc @@ -0,0 +1,5 @@ +REVISION = "4f7e881fcc2e6df3ce04584cf5edb07b2682891a" + +SRC_BASE = "${WORKDIR}/gstreamer-${REVISION}" +SRC_URI = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/archive/${REVISION}/gstreamer-${REVISION}.tar.gz" +SRC_URI[sha256sum] = "bc9f6b9402d7575d8a7490f0aae347e6b524741cc459cb7aa25040fb55fcb606" 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 -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: - -Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a] - -Signed-off-by: Jose Quaresma ---- - 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..112968e15a 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,19 +1,17 @@ -From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17 00:00:00 2001 +From 16e2b48c97386ddc8330575bcfb56a5915385813 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 11 Apr 2021 19:48:13 +0100 Subject: [PATCH 1/4] tests: respect the idententaion used in meson Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] - -Signed-off-by: Jose Quaresma --- - 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 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?= -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: - -Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245] - -Signed-off-by: Jose Quaresma ---- - 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..82b57df627 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 6f3a4e2dc26c8a1ec145b9a364b0b0f61c9ffba2 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 11 Apr 2021 19:48:13 +0100 Subject: [PATCH 2/4] tests: add support for install the tests @@ -8,57 +8,45 @@ This will provide to run the tests using the gnome-desktop-testing [1] [1] https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] - -Signed-off-by: Jose Quaresma --- - 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 5bb5ccb3e6..f031a1c33f 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 +83,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 +93,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 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 -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: - -Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c] -Signed-off-by: Anuj Mittal ---- - 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..0931f3165a 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 da6b9ee334de4cce37b1e83ec380e1a28d8ab797 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 24 Apr 2021 10:34:47 +0100 Subject: [PATCH 3/4] tests: use a dictionaries for environment @@ -7,32 +7,32 @@ meson environment() can't be passed to configure_file and it is needed for insta use a dictionary as this is simplest solution to install the environment. Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] - -Signed-off-by: Jose Quaresma --- - 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@/@1@.registry'.format(meson.current_build_dir(), test_name)) - env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') - env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') -+ # 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', 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..3dc5cb9686 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch @@ -0,0 +1,72 @@ +From 0dbd1a6fee745baab4d08d1f97d9eb858c8f6781 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma +Date: Sun, 2 May 2021 01:58:01 +0100 +Subject: [PATCH 4/4] tests: add helper script to run the installed_tests + +- 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] +--- + 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/@0@.registry can be problematic as it mostly ++ # is mounted using tmpfs and if the machine crash from some reason we can lost the registry ++ # that is useful for debug propose of the tests itself. ++ env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@.registry'.format(test_name)} ++ ++ # Set the full path for the test it self. ++ env += {'TEST': '@0@/@1@'.format(join_paths(prefix, installed_tests_execdir), test_name)} ++ ++ configure_file( ++ input : 'template.sh.in', ++ output: test_name + '.sh', ++ install_dir: installed_tests_execdir, ++ configuration : env, ++ ) + endif + + test(test_name, exe, env: env, timeout : 3 * 60) +diff --git a/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@/@program@.sh +-- +2.31.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 -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 ---- - 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@/@program@.env && 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/@0@.registry'.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 b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb similarity index 72% 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..7458b158b1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/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}" +require gstreamer1.0-source.inc -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 \ - " -SRC_URI[sha256sum] = "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a" +S = "${SRC_BASE}/subprojects/gstreamer" + +SRC_URI += "file://run-ptest \ + file://0001-tests-respect-the-idententaion-used-in-meson.patch;patchdir=${SRC_BASE} \ + file://0002-tests-add-support-for-install-the-tests.patch;patchdir=${SRC_BASE} \ + file://0003-tests-use-a-dictionaries-for-environment.patch;patchdir=${SRC_BASE} \ + file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;patchdir=${SRC_BASE} \ + " 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" From patchwork Wed Jan 26 10:28:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25E66C28CF5 for ; Wed, 26 Jan 2022 10:28:36 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.11068.1643192914752692474 for ; Wed, 26 Jan 2022 02:28:35 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=XztdCE4i; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 217E28193A; Wed, 26 Jan 2022 11:28:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192913; bh=FLnBUIZamQo2cUz0ZXrtCXa35bv9yUzIv01chhFNL7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XztdCE4izKCmI71VvdNDi6emyw/iGk2mE0QoyWcG+4ZoP2FXLBuZASk4adylXWvhk j9I/ByYS6g10qvU5JvfcQGTnyNlrjV1p4XrNI6AXIWXY90QaJacu+vQ/R6LIt0QKBT ycLnAIXgP+xzwgHs37d+AdN4C/4rd9fdjR/V4OSTa4rKoriv45jWUII83XPJrn7psD G7Sxsax9NzUIn+n5lrnl398Id1TQmdUz3U+N818/32Xy8RAF67mfFR3niLl23aXFkg uafHS3kTfVcPD5PuamUTIINB48zONn155fPBZIOkM3gXtqx/qv9lpzp/ZXHsVyg5Tq oYzbXdy/eZieQ== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 02/12] gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:04 +0100 Message-Id: <20220126102814.4173943-3-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160966 Signed-off-by: Claudius Heine --- ...et-caps-from-src-pad-when-query-caps.patch | 10 +++--- ...parse-enhance-SSA-text-lines-parsing.patch | 10 +++--- ...iv-fb-Make-sure-config.h-is-included.patch | 8 ++--- ...004-glimagesink-Downrank-to-marginal.patch | 32 ------------------- ...bb => gstreamer1.0-plugins-base_1.20.0.bb} | 17 +++++----- 5 files changed, 22 insertions(+), 55 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} (85%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch index d5d9838372..bbc24b3e84 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch @@ -9,16 +9,16 @@ Upstream-Status: Pending Signed-off-by: zhouming --- - gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ + subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) - mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c + mode change 100644 => 100755 subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c -diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c +diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c b/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c old mode 100644 new mode 100755 index f545857..62d10ef ---- a/gst-libs/gst/tag/gsttagdemux.c -+++ b/gst-libs/gst/tag/gsttagdemux.c +--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c ++++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c @@ -1777,6 +1777,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) } break; diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch index e453a500c9..c6babd4ec9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch @@ -10,16 +10,16 @@ Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] Signed-off-by: Mingke Wang --- - gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++---- + subprojects/gst-plugins-base/gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++---- 1 file changed, 134 insertions(+), 16 deletions(-) - mode change 100644 => 100755 gst/subparse/gstssaparse.c + mode change 100644 => 100755 subprojects/gst-plugins-base/gst/subparse/gstssaparse.c -diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c +diff --git a/subprojects/gst-plugins-base/gst/subparse/gstssaparse.c b/subprojects/gst-plugins-base/gst/subparse/gstssaparse.c old mode 100644 new mode 100755 index c849c08..4b9636c ---- a/gst/subparse/gstssaparse.c -+++ b/gst/subparse/gstssaparse.c +--- a/subprojects/gst-plugins-base/gst/subparse/gstssaparse.c ++++ b/subprojects/gst-plugins-base/gst/subparse/gstssaparse.c @@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) * gst_ssa_parse_push_line: * @parse: caller element diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch index 2af83ff8b9..1bf21c2e4d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch @@ -9,13 +9,13 @@ Upstream-Status: Pending Signed-off-by: Carlos Rafael Giani --- - gst-libs/gst/gl/gl-prelude.h | 4 ++++ + subprojects/gst-plugins-base/gst-libs/gst/gl/gl-prelude.h | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h +diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gl-prelude.h b/subprojects/gst-plugins-base/gst-libs/gst/gl/gl-prelude.h index 05e1f62..96ce5e6 100644 ---- a/gst-libs/gst/gl/gl-prelude.h -+++ b/gst-libs/gst/gl/gl-prelude.h +--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gl-prelude.h ++++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gl-prelude.h @@ -22,6 +22,10 @@ #ifndef __GST_GL_PRELUDE_H__ #define __GST_GL_PRELUDE_H__ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch deleted file mode 100644 index f45ea65ef3..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 79841a02ee754eba736cb32aaf2ed2b2fc0483d4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 ---- - 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 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.bb similarity index 85% 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..79ec8cde60 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.bb @@ -4,17 +4,16 @@ 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" +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" +require gstreamer1.0-source.inc -S = "${WORKDIR}/gst-plugins-base-${PV}" +S = "${SRC_BASE}/subprojects/gst-plugins-base" + +SRC_URI += "file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch;patchdir=${SRC_BASE} \ + file://0003-viv-fb-Make-sure-config.h-is-included.patch;patchdir=${SRC_BASE} \ + file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch;patchdir=${SRC_BASE} \ + " DEPENDS += "iso-codes util-linux zlib" From patchwork Wed Jan 26 10:28:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2955 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21261C63697 for ; Wed, 26 Jan 2022 10:28:38 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web12.10705.1643192915897749864 for ; Wed, 26 Jan 2022 02:28:37 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=w7Jg6DnH; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 4EA7C82849; Wed, 26 Jan 2022 11:28:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192914; bh=Nusl0X+exvhtdZi9zm26yJiJlTSUJQUpYmi+/TrIJmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w7Jg6DnHMJOahm9QBKXri373EhJicpSqKzPWxJg1FTzn3SxI/dNRhkUit4dqQQfnt Fy2f6c36/Mwrf8PaE9/uasXeWa4et5bfa0nMXdOnidPul9FCJSvM+5cYo6uoK7Lv+S GCQUkfYvtzs3h+7q2BySgkCMpluN+R1HVX+R6T8f07JP9jZbFWomSobdkU1IYRqElz k14lWYZCDLZFhDboTuUf98qKLbsxYKc0tfleLlu5e8clVnf1SyjcZM+FcBNfsrroMx mkr8xElm5iA3knywPOjEW5ch+/P1yvSvLXZe0nmvrQBmyoem9chZS/XX+nlYV7cmgX Vptd+vUniYLSQ== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 03/12] gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:05 +0100 Message-Id: <20220126102814.4173943-4-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160968 Signed-off-by: Claudius Heine --- ...e-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 12 ++++++------ ...1.18.5.bb => gstreamer1.0-plugins-good_1.20.0.bb} | 9 ++++----- 2 files changed, 10 insertions(+), 11 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.20.0.bb} (91%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch index 788d752058..11f0deba97 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch @@ -25,10 +25,10 @@ Signed-off-by: Khem Raj ext/qt/qtwindow.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc +diff --git a/subprojects/gst-plugins-good/ext/qt/gstqsgtexture.cc b/subprojects/gst-plugins-good/ext/qt/gstqsgtexture.cc index a05d26e..4cc9fc6 100644 ---- a/ext/qt/gstqsgtexture.cc -+++ b/ext/qt/gstqsgtexture.cc +--- a/subprojects/gst-plugins-good/ext/qt/gstqsgtexture.cc ++++ b/subprojects/gst-plugins-good/ext/qt/gstqsgtexture.cc @@ -27,7 +27,7 @@ #include @@ -38,10 +38,10 @@ index a05d26e..4cc9fc6 100644 #include "gstqsgtexture.h" #define GST_CAT_DEFAULT gst_qsg_texture_debug -diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc +diff --git a/subprojects/gst-plugins-good/ext/qt/qtwindow.cc b/subprojects/gst-plugins-good/ext/qt/qtwindow.cc index 9360c33..0dfd3f1 100644 ---- a/ext/qt/qtwindow.cc -+++ b/ext/qt/qtwindow.cc +--- a/subprojects/gst-plugins-good/ext/qt/qtwindow.cc ++++ b/subprojects/gst-plugins-good/ext/qt/qtwindow.cc @@ -25,7 +25,7 @@ #include diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.bb similarity index 91% 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..baba628df4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.bb @@ -4,13 +4,12 @@ DESCRIPTION = "'Good' GStreamer plugins" HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ - file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ - " +require gstreamer1.0-source.inc -SRC_URI[sha256sum] = "3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b" +S = "${SRC_BASE}/subprojects/gst-plugins-good" -S = "${WORKDIR}/gst-plugins-good-${PV}" +SRC_URI += "file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch;patchdir=${SRC_BASE} \ + " LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ From patchwork Wed Jan 26 10:28:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2958 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ADF3C63682 for ; Wed, 26 Jan 2022 10:28:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.11070.1643192917182218606 for ; Wed, 26 Jan 2022 02:28:37 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=epWGIFgL; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 68B638069C; Wed, 26 Jan 2022 11:28:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192915; bh=heYtq4JgbNC9K6Cji4I1zVMsax4hFuI0D2lbL4ER5Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=epWGIFgLATpVAZ9YRvp+A/x059F27PQU5FMYiG4GzMIPI5AR3PaOFCmguckeqELTd BgH0ViSbsnWBqJFVTKHzaeXc9EEL6b4B58M1UtrkXXRgYLLdpMfcZJ2B+WRSACRAQ2 10DFrx14iMwdvE89RYlxggkMFFr1VN11o1vV4aT8/CpPkc3KXIOIjKPYajtAAeyw2B q0bjSAY9pal/2sbJzK7a1RtMDTeliU7gwql6rjFDcDlggo7yMpR/9kl65f7U9c8No+ UcNEOu2B7/F9SGInhDEtXIPx0ntkVTcashU9QY6o5idmCy42yvu3+atXik7BMf3g51 Thugycm/KOFMg== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 04/12] gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:06 +0100 Message-Id: <20220126102814.4173943-5-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160969 Feature `ofa` and `libmms` are no longer available and where removed. Signed-off-by: Claudius Heine --- ...ialized-warnings-when-compiling-with.patch | 8 +++--- ...-avoid-including-sys-poll.h-directly.patch | 8 +++--- ...-sentinals-for-gst_structure_get-etc.patch | 24 ++++++++--------- ...issing-opencv-data-dir-in-yocto-buil.patch | 25 +++++++++--------- .../0005-msdk-fix-includedir-path.patch | 26 +++++++++---------- ....bb => gstreamer1.0-plugins-bad_1.20.0.bb} | 20 +++++++------- 6 files changed, 54 insertions(+), 57 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.20.0.bb} (91%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch index 13a673cd50..ae8af094cb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch @@ -7,13 +7,13 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy --- - gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- + subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c +diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c index 2c60ced..e8226d8 100644 ---- a/gst-libs/gst/codecparsers/gstvc1parser.c -+++ b/gst-libs/gst/codecparsers/gstvc1parser.c +--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c ++++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c @@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size, GstVC1SeqLayer * seqlayer) { diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch index ead6897f67..b1aaff864b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch @@ -9,13 +9,13 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy --- - sys/dvb/gstdvbsrc.c | 2 +- + subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c +diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c index ca6b92a..b2772db 100644 ---- a/sys/dvb/gstdvbsrc.c -+++ b/sys/dvb/gstdvbsrc.c +--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c ++++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c @@ -97,7 +97,7 @@ #include #include diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch index 88fbc40dcd..a53a840e98 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch @@ -18,15 +18,15 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy --- - sys/decklink/gstdecklink.cpp | 10 +++++----- - sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- - sys/decklink/gstdecklinkvideosink.cpp | 2 +- + subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp | 10 +++++----- + subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- + subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp +diff --git a/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp b/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp index 4dac7e1..43762ce 100644 ---- a/sys/decklink/gstdecklink.cpp -+++ b/sys/decklink/gstdecklink.cpp +--- a/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp ++++ b/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp @@ -674,7 +674,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, @@ -57,10 +57,10 @@ index 4dac7e1..43762ce 100644 break; 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 +diff --git a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp index 2fef934..c47229a 100644 ---- a/sys/decklink/gstdecklinkaudiosrc.cpp -+++ b/sys/decklink/gstdecklinkaudiosrc.cpp +--- a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp ++++ b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp @@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self) g_mutex_unlock (&self->input->lock); @@ -70,10 +70,10 @@ index 2fef934..c47229a 100644 gst_object_unref (videosrc); switch (vconn) { -diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp +diff --git a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp index e3a6775..f1a5aae 100644 ---- a/sys/decklink/gstdecklinkvideosink.cpp -+++ b/sys/decklink/gstdecklinkvideosink.cpp +--- a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp ++++ b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp @@ -286,7 +286,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, gpointer user_data) { diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch index b816709066..47dbb4b54d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -12,38 +12,37 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Andrey Zhizhikin --- - ext/opencv/meson.build | 7 ++++--- + subprojects/gst-plugins-bad/ext/opencv/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +diff --git a/subprojects/gst-plugins-bad/ext/opencv/meson.build b/subprojects/gst-plugins-bad/ext/opencv/meson.build index 0b0b3fc..0ed3344 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -78,20 +78,21 @@ else +--- a/subprojects/gst-plugins-bad/ext/opencv/meson.build ++++ b/subprojects/gst-plugins-bad/ext/opencv/meson.build +@@ -84,20 +84,21 @@ if not opencv_found endif if opencv_found + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() - opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + opencv_prefix = opencv_dep.get_variable('prefix') gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] # Check the data dir used by opencv for its xml data files # Use prefix from pkg-config to be compatible with cross-compilation -- r = run_command('test', '-d', opencv_prefix + '/share/opencv') -+ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') +- r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv', check: false) if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' else -- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') -+ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV', check: false) ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV', check: false) if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' else -- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') -+ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4', check: false) ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4', check: false) if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' else -- 2.28.0 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch index cb3bb7d361..5cda092353 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch @@ -9,23 +9,23 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Naveen Saini --- - sys/msdk/meson.build | 2 ++ + subprojects/gst-plugins-bad/sys/msdk/meson.build | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build +diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build index 6346c9451..068f38548 100644 ---- a/sys/msdk/meson.build -+++ b/sys/msdk/meson.build -@@ -40,7 +40,9 @@ endif +--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build ++++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build +@@ -46,7 +46,9 @@ if mfx_api != 'oneVPL' + mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) - mfx_dep = dependency('libmfx', required: false) - if mfx_dep.found() -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() - mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') -+ mfx_incdir = pkgconf_sysroot + mfx_incdir - mfx_inc = [] - else - # Old versions of MediaSDK don't provide a pkg-config file + if mfx_dep.found() ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + mfx_incdir = mfx_dep.get_variable('includedir') ++ mfx_incdir = pkgconf_sysroot + mfx_incdir + mfx_inc = [] + use_msdk = true + else -- 2.17.1 diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb similarity index 91% 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..2e5627cfea 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb @@ -4,16 +4,16 @@ DESCRIPTION = "'Bad' GStreamer plugins and helper libraries " HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues" -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ - file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ - file://0002-avoid-including-sys-poll.h-directly.patch \ - file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ - file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ - file://0005-msdk-fix-includedir-path.patch \ - " -SRC_URI[sha256sum] = "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" +require gstreamer1.0-source.inc -S = "${WORKDIR}/gst-plugins-bad-${PV}" +S = "${SRC_BASE}/subprojects/gst-plugins-bad" + +SRC_URI += "file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch;patchdir=${SRC_BASE} \ + file://0002-avoid-including-sys-poll.h-directly.patch;patchdir=${SRC_BASE} \ + file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch;patchdir=${SRC_BASE} \ + file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch;patchdir=${SRC_BASE} \ + file://0005-msdk-fix-includedir-path.patch;patchdir=${SRC_BASE} \ + " LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" @@ -61,7 +61,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" @@ -132,7 +131,6 @@ EXTRA_OEMESON += " \ -Dmplex=disabled \ -Dmusepack=disabled \ -Dnvcodec=disabled \ - -Dofa=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dopensles=disabled \ From patchwork Wed Jan 26 10:28:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2957 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AE24C63684 for ; Wed, 26 Jan 2022 10:28:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.10916.1643192918301018161 for ; Wed, 26 Jan 2022 02:28:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=gSSNbj6c; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 87768801CF; Wed, 26 Jan 2022 11:28:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192916; bh=dbYiiu49dA50KRv+vBC8/2fj+476tio/v2ed8yRKpAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gSSNbj6c/tvxN1Kpm8n5zHLELFwPxQ6wDbDxzRlrSHVKtrF08Gc4Av1J+/8nRkSN9 jgyg4Wj43rpQPmgN+ANd3agq/0w29ab7Cq/vjamU602EE0PBDgerYgImW7hnazHYkA jx88DhgqmuPRBeeJZcI8En0ojy0clZyhVrImFNBgMHUUZNY4Ye4z4PIS5h5m8quOPp tM8XDgh4tpmlpByeNKTTkkKsY/VKyBpQ/FTSBgZ0fvb5NAe2sVVKvdoeb4aF+7vfAJ qjW6QafpTje3mBB9/OlhT92EvzSMfggIyRush9awjzg1vrkADT55NU9I5iAd782wrN b96sMpaT5GlrA== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 05/12] gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:07 +0100 Message-Id: <20220126102814.4173943-6-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160970 Feature `gpl` was added, since it is required to be enabled for gpl licensed codecs. Signed-off-by: Claudius Heine --- ...y_1.18.5.bb => gstreamer1.0-plugins-ugly_1.20.0.bb} | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.20.0.bb} (82%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.0.bb similarity index 82% 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..c3b2066ca3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.0.bb @@ -10,12 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" LICENSE_FLAGS = "commercial" -SRC_URI = " \ - https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ - " -SRC_URI[sha256sum] = "df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9" +require gstreamer1.0-source.inc -S = "${WORKDIR}/gst-plugins-ugly-${PV}" +S = "${SRC_BASE}/subprojects/gst-plugins-ugly" DEPENDS += "gstreamer1.0-plugins-base" @@ -23,7 +20,7 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ - a52dec mpeg2dec \ + a52dec mpeg2dec gpl \ " PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52" @@ -33,6 +30,7 @@ PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio" PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread" PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec" PACKAGECONFIG[x264] = "-Dx264=enabled,-Dx264=disabled,x264" +PACKAGECONFIG[gpl] = "-Dgpl=enabled,-Dgpl=disabled" EXTRA_OEMESON += " \ -Ddoc=disabled \ From patchwork Wed Jan 26 10:28:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2961 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FFB8C63686 for ; Wed, 26 Jan 2022 10:28:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.11073.1643192919211958651 for ; Wed, 26 Jan 2022 02:28:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=v8ZNzoQN; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 90BD682849; Wed, 26 Jan 2022 11:28:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192917; bh=AieRrFj0FrzXRPRNFGwjQLXRr0MY23MajKlcC/WFcYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v8ZNzoQNKqUQMb8YzriRnB46jc4HARkSx08FLnoOxoVEgwUmTKjlZZAeK2mBUQOtc 8v4wkaJQfJhfrgaL81pfu+2rj5Tr59km0GhrUBxbDCRw9vzU6+Drz8q2bWT4jyxuLC tcrweeUn/gJMLjH6IdqCz2M6U19nhuzjVrjFdYBQsgJ2HQdPTgjOAOshFHq5D57XHR 7vvSCah9tdUb4/3tiorWiPRAQkXOQLemPsKK3pA9ocPFPG+BAB7nQs6BXnNWBeIEAR vxXwoQAOps72tgFEP/YwgRu1s8bdi8jX0iU3W3mov+OtKM1aR2Tsv+JyNw9UHymliA J2E6RQn90G1wQ== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 06/12] gstreamer1.0-libav: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:08 +0100 Message-Id: <20220126102814.4173943-7-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160971 Signed-off-by: Claudius Heine --- ...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------ ...1.18.5.bb => gstreamer1.0-libav_1.20.0.bb} | 9 +- 2 files changed, 3 insertions(+), 352 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} (66%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch deleted file mode 100644 index 022ff9af29..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch +++ /dev/null @@ -1,346 +0,0 @@ -From 38d10ee800e42afeacc6bee714216e4c974c11f5 Mon Sep 17 00:00:00 2001 -From: Xi Ruoyao -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: -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - 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; - } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.0.bb similarity index 66% 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..4296172044 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.0.bb @@ -7,16 +7,13 @@ 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" +require gstreamer1.0-source.inc -S = "${WORKDIR}/gst-libav-${PV}" +S = "${SRC_BASE}/subprojects/gst-libav" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg" From patchwork Wed Jan 26 10:28:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15FABC2BA4C for ; Wed, 26 Jan 2022 10:28:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.11074.1643192920374461633 for ; Wed, 26 Jan 2022 02:28:40 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=hIQ1lfTj; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 9C1FF830CE; Wed, 26 Jan 2022 11:28:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192918; bh=5tLlC+LJWNOomySa3bdMstrmGPGtSNdPDoQuakWUgAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hIQ1lfTj3hyJzh0JeXwmSAnjSqOJafGWF/CceYQY02/1NX7uE6L9UDHnpwvWbe7wy +KEaRE2RMiH5hFfixLFvu0OYe9sMjEEUQ2nnULnN6Flws0eXgZD86wEr5DSBEpXPW5 XDbr3Syz1oMzPKJ71gEwlUQoZMxUFfFpgmYKW3wBU9jg/jnhw6Ja2Gjppr/btoy81E tBUamYFQMRi125QXodtoZEFs2PwdDN7p4lJei91squpnqyTsPhFAgOb/OuJwrr49KF Xvp3eS6SoROlBqQQkSBryyHw3PhhFDJPa6pNrRLmMxDza2zTAqrIoDppHlhCDYSEGk Wi0KnI6w2KrUw== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 07/12] gstreamer1.0-python: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:09 +0100 Message-Id: <20220126102814.4173943-8-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160972 Signed-off-by: Claudius Heine --- ...r1.0-python_1.18.5.bb => gstreamer1.0-python_1.20.0.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.20.0.bb} (79%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.0.bb similarity index 79% 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..eaba1e23bc 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.0.bb @@ -7,16 +7,15 @@ SECTION = "multimedia" 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" +require gstreamer1.0-source.inc + +S = "${SRC_BASE}/subprojects/gst-python" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" PNREAL = "gst-python" -S = "${WORKDIR}/${PNREAL}-${PV}" - EXTRA_OEMESON += "-Dlibpython-dir=${libdir}" # gobject-introspection is mandatory and cannot be configured From patchwork Wed Jan 26 10:28:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2960 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16AA0C63684 for ; Wed, 26 Jan 2022 10:28:42 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web12.10706.1643192921402734740 for ; Wed, 26 Jan 2022 02:28:41 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=PV35C19I; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id BD480801CF; Wed, 26 Jan 2022 11:28:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192919; bh=TM+S8qfYWCGHVyf8WbSq1woaDjBhFt8hNIENMxd9eLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PV35C19IeIKaLTAjNwabuEUHgy9AiBxGyAvkUZ4Smt6BG51rSw7ubGBrRAunGnDij s/l9f+5zpUnNgtdHj/GTS4KpixM8RCpgfRbg+4AycaOtKVlerzUCgYzefRTJUbLkZ7 SC1fygCVjX+igmjgHUljXg1LOaxCO6WYE3jqhjyw74lcbYXJhspcX5JK7JW8GMmv22 4bTdxCwgvLnWdI8APrh42/Uf4D0v849NCbJfvcxGlc3MIgh4eZfGtDVf00SHnmzhhj 7b+pEE+ZIr0PHmkWhfnH0EwXeK3LrfIPHUXOUssQHZN14fNb8jiCXpXjQ21Ndeaxbi zn1p8kVvcHyBw== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 08/12] gstreamer1.0-omx: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:10 +0100 Message-Id: <20220126102814.4173943-9-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160973 Signed-off-by: Claudius Heine --- ...streamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} (89%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.0.bb similarity index 89% 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..1ff5bf6f74 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.0.bb @@ -8,11 +8,9 @@ LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" +require gstreamer1.0-source.inc -SRC_URI[sha256sum] = "2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42" - -S = "${WORKDIR}/gst-omx-${PV}" +S = "${SRC_BASE}/subprojects/gst-omx" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad virtual/libomxil" From patchwork Wed Jan 26 10:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2962 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 166C1C63682 for ; Wed, 26 Jan 2022 10:28:43 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.10917.1643192922423373721 for ; Wed, 26 Jan 2022 02:28:42 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=rMTnyLL8; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id C6C1C83217; Wed, 26 Jan 2022 11:28:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192920; bh=He+1P5D8BsNd6kGPACsC5Mr2wTReiKm4KGLkw5Mc+uo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rMTnyLL8pnidQn9GP6wg6FyDEb9lnyhAHFDka9y1pVdZZdsc6VWln2TkeyJ1Dz2AH 0sgx0Lb927DRmUfKVMxZVWNP+zUpQI2R3iEDVBwbdMM9729+CUlzq0pSGirBhZ/0+I 80EtqWiu2WRNOE4yCU4jsEmvqHbbwFQ0e/q0eM5Q4BPXmX4jhtqL67WTeakKNJR3sV /7jPi3nUiBEacU0wUmKwWY7SPE4UvxNDS6xO/wcaJyie7mQ+N4ZZ2aBpeZTjrROERG Lgb+fECyeIAYkYH94JZb1TsO3bU99p0oxJrIFh7CKtHFz6nn5nsU4OQFyninMZAO1t n7rkZD0Xjj7yg== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 09/12] gstreamer1.0-vaapi: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:11 +0100 Message-Id: <20220126102814.4173943-10-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160974 Signed-off-by: Claudius Heine --- ...eamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} (90%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.0.bb similarity index 90% 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..49e9d93837 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.0.bb @@ -9,11 +9,10 @@ REALPN = "gstreamer-vaapi" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" +require gstreamer1.0-source.inc -SRC_URI[sha256sum] = "4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b" +S = "${SRC_BASE}/subprojects/gstreamer-vaapi" -S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" inherit meson pkgconfig features_check upstream-version-is-even From patchwork Wed Jan 26 10:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2963 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 172F2C2BA4C for ; Wed, 26 Jan 2022 10:28:45 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.10918.1643192923520431803 for ; Wed, 26 Jan 2022 02:28:43 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=T9MHLdBF; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id E0B6983381; Wed, 26 Jan 2022 11:28:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192922; bh=EGWKaQ5VJQroJH50SRKtUcZzQ1t1gB4Ll/vc23TIHaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T9MHLdBFpvW10LSevasJcXE2sgEVvsxrdUuOOD7kAop2/ORfq8BkO+Y4O89J9ic+y /n+sOjZ8Cjw63+ysX2FZs4KyDoji/XfPGbKy1Mdq2SYztM+1lL9ewMKFm+Kq0d95Fn k36Gok6FBndoV8ROFM4eyYZZGuRDdzY8Fh7svXTmCBCfdnJC3WuSAPSbXBLWbm1k3b KCTBEGvhlgn63mM06YIYxhRcFPg5Rj5DIzsvSAcsgL1wRj6qax7oWaN0jw9sF6J2Xe jNUwdgJhnQQVIpiWgoziE/Sl4JXQvdrCdEUOGLCCDiET5Cde8NbfpahACyJPnVjE5l 4W/YWO0V0bVTA== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 10/12] gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:12 +0100 Message-Id: <20220126102814.4173943-11-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160975 Signed-off-by: Claudius Heine --- ...erver_1.18.5.bb => gstreamer1.0-rtsp-server_1.20.0.bb} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.20.0.bb} (70%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.0.bb similarity index 70% 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..a8cc8f0a09 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.0.bb @@ -2,17 +2,15 @@ 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" PNREAL = "gst-rtsp-server" -SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" +require gstreamer1.0-source.inc -SRC_URI[sha256sum] = "04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f" - -S = "${WORKDIR}/${PNREAL}-${PV}" +S = "${SRC_BASE}/subprojects/gst-rtsp-server" inherit meson pkgconfig upstream-version-is-even gobject-introspection From patchwork Wed Jan 26 10:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2964 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EAA9C28CF5 for ; Wed, 26 Jan 2022 10:28:46 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.11075.1643192924550948992 for ; Wed, 26 Jan 2022 02:28:45 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=h+2pjkjP; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id E82EB8304C; Wed, 26 Jan 2022 11:28:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192923; bh=M4gbpDpPPvSQ4s5zP33OkL3lFuwitkgtHdD+vhp1wBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h+2pjkjPV/mucRBQVCqD0M+PDmSTy86KeXrNj5q8WXERTr2iQKYLDfxj8OLiTPTrz dUkr7AyxSOOAwCA0pShotAVFT3oQvHtDEEgvygNGDJISqYdvj2VUPXyPG0k3IZM+nq 5GHigkQpqneor1MTSOcRLXPg3McCD8KkTM9ipmlGoMWMFW4EqQMeYtz31E/hsDEP2J NiCGhieO5GgU+bGUEyAJGlNwbrXWIuQ5kxaEd4mjNFSOncm0CKHMXnl4eeb5ikIm18 1spXewc6GZG8+pTujQotj1zcTUlMA0OhTtW2wgquawN6B7yACQFT+NZ5Cwfw+K4i7R XqZoyZxflr/GQ== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 11/12] gst-examples: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:13 +0100 Message-Id: <20220126102814.4173943-12-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160976 Signed-off-by: Claudius Heine --- ...001-Make-player-examples-installable.patch | 22 +++++++++---------- ...mples_1.18.5.bb => gst-examples_1.20.0.bb} | 11 +++++----- 2 files changed, 16 insertions(+), 17 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.20.0.bb} (82%) diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch b/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch index ab93c13244..96baab2415 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch +++ b/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch @@ -9,29 +9,29 @@ Upstream-Status: Denied [Upstream considers these code examples, for now a least https://bugzilla.gnome.org/show_bug.cgi?id=777827 --- - playback/player/gst-play/meson.build | 1 + - playback/player/gtk/meson.build | 1 + + subprojects/gst-examples/playback/player/gst-play/meson.build | 1 + + subprojects/gst-examples/playback/player/gtk/meson.build | 1 + 2 files changed, 2 insertions(+) -diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build +diff --git a/subprojects/gst-examples/playback/player/gst-play/meson.build b/subprojects/gst-examples/playback/player/gst-play/meson.build index 8ec021d..977cc5c 100644 ---- a/playback/player/gst-play/meson.build -+++ b/playback/player/gst-play/meson.build +--- a/subprojects/gst-examples/playback/player/gst-play/meson.build ++++ b/subprojects/gst-examples/playback/player/gst-play/meson.build @@ -2,5 +2,6 @@ executable('gst-play', ['gst-play.c', 'gst-play-kb.c', 'gst-play-kb.h'], + install: true, - dependencies : [gst_dep, gstplayer_dep, m_dep]) + dependencies : [gst_dep, dependency('gstreamer-play-1.0'), m_dep]) -diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build +diff --git a/subprojects/gst-examples/playback/player/gtk/meson.build b/subprojects/gst-examples/playback/player/gtk/meson.build index f7a7419..6281130 100644 ---- a/playback/player/gtk/meson.build -+++ b/playback/player/gtk/meson.build +--- a/subprojects/gst-examples/playback/player/gtk/meson.build ++++ b/subprojects/gst-examples/playback/player/gtk/meson.build @@ -13,5 +13,6 @@ if gtk_dep.found() gtk_play_resources, 'gtk-video-renderer.h', 'gtk-video-renderer.c'], -+ install: true, - dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep]) ++ install: true, + dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep]) endif diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.20.0.bb similarity index 82% rename from meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gst-examples_1.20.0.bb index a720bb73ff..ef1b457882 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.20.0.bb @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20 DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 libsoup-2.4 json-glib glib-2.0-native" -SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=1.18 \ - file://0001-Make-player-examples-installable.patch \ - file://gst-player.desktop \ - " +require gstreamer1.0-source.inc -SRCREV = "fe9a365dc0f1ff632abcfe3322ac5527a2cf30a0" +S = "${SRC_BASE}/subprojects/gst-examples" -S = "${WORKDIR}/git" +SRC_URI += "file://0001-Make-player-examples-installable.patch;patchdir=${SRC_BASE} \ + file://gst-player.desktop \ + " inherit meson pkgconfig features_check From patchwork Wed Jan 26 10:28:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 2965 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B637C2BA4C for ; Wed, 26 Jan 2022 10:28:47 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web09.10817.1643192925630085499 for ; Wed, 26 Jan 2022 02:28:46 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=hllGzB2x; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-038.002.205.pools.vodafone-ip.de [2.205.233.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 026B6830D9; Wed, 26 Jan 2022 11:28:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643192924; bh=8OpkBr7KD/sEd9FTvzxr1fDcz0M9FyXMwR3T3wWAab4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hllGzB2xNhv9IRKguq+9n5hcJPGicXRMKrSY/z9ngISQU+SOODGLIjiB1peJpXOKs /HaB92HKVOQLgY5EQlo6X3W6vSs8wKE7HcZAZjfiXRBR4BjfjnjqzZCMyP3K1KLtoC QPI2H6rUbHPh3zmOpUbVX50SXPOFgIv6KNvVyITzXAM4x7ehBWskPAYArRw8E0HuEN X3aSimy++SRwi9T65ac8NfaSzVyptk6VUDOUw8oiM0SjSINEtCrn6HEofDxsSPbo70 fBHPvSX+rNkZvj/YJh0xBfEcw1vT/NVZDKbv/2+hMgS57RENtpNQNqIakZrbQPSC34 9GuTfFJDZF0Gw== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Marek Vasut , Jose Quaresma , Richard Purdie , Claudius Heine Subject: [OE-core][RFC PATCH 12/12] gst-devtools: 1.18.5 -> 1.20.0 Date: Wed, 26 Jan 2022 11:28:14 +0100 Message-Id: <20220126102814.4173943-13-ch@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126102814.4173943-1-ch@denx.de> References: <20220126102814.4173943-1-ch@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jan 2022 10:28:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160977 Signed-off-by: Claudius Heine --- .../0001-connect-has-a-different-signature-on-musl.patch | 8 ++++---- .../{gst-devtools_1.18.5.bb => gst-devtools_1.20.0.bb} | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.20.0.bb} (83%) diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch index c0e4581358..ed0a6d387b 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +++ b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch @@ -12,13 +12,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - validate/plugins/fault_injection/socket_interposer.c | 7 ++++++- + subprojects/gst-devtools/validate/plugins/fault_injection/socket_interposer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/validate/plugins/fault_injection/socket_interposer.c b/validate/plugins/fault_injection/socket_interposer.c +diff --git a/subprojects/gst-devtools/validate/plugins/fault_injection/socket_interposer.c b/subprojects/gst-devtools/validate/plugins/fault_injection/socket_interposer.c index 53c1ebb..ad7adf8 100644 ---- a/validate/plugins/fault_injection/socket_interposer.c -+++ b/validate/plugins/fault_injection/socket_interposer.c +--- a/subprojects/gst-devtools/validate/plugins/fault_injection/socket_interposer.c ++++ b/subprojects/gst-devtools/validate/plugins/fault_injection/socket_interposer.c @@ -100,10 +100,15 @@ socket_interposer_set_callback (struct sockaddr_in *addrin, } diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.0.bb similarity index 83% 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..a8954a577b 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.0.bb @@ -6,13 +6,12 @@ SECTION = "multimedia" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -#S = "${WORKDIR}/gst-devtools-${PV}" +require gstreamer1.0-source.inc -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}.tar.xz \ - file://0001-connect-has-a-different-signature-on-musl.patch \ - " +S = "${SRC_BASE}/subprojects/gst-devtools" -SRC_URI[sha256sum] = "fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079" +SRC_URI += "file://0001-connect-has-a-different-signature-on-musl.patch;patchdir=${SRC_BASE} \ + " DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS:${PN} = "git"