Update to gstreamer 1.20 for kirkstone
cover Update to gstreamer 1.20 for kirkstone
Hi,
since the release of gstreamer 1.20 is getting close, and it might make sense to include it into the kirkstone release. I prepared preliminary update patchset for it.
Gstreamer changed to use monorepos with 1.20 so I went ahead I changed all recipes to use one SRC_URI from gstreamer1.0-source.inc. Currently I just use a tarball from a unrelease commit id, but that will be changed to the correct one, after gstreamer is released.
I have some ideas which could be implemented with this change, but I wanted feedback for this first:
- remove the version from the filename, and define the PV in the gstreamer1.0-source.inc, this might make future updates easier.
- put all recipes together into one recipe, which provides packages for all subprojects, this improves build time and makes maintenance easier, but also breaks downstream bbappends.
Any feedback on this is welcome.
kind regards,
Claudius
Claudius Heine (12):
gstreamer1.0: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0
gstreamer1.0-libav: 1.18.5 -> 1.20.0
gstreamer1.0-python: 1.18.5 -> 1.20.0
gstreamer1.0-omx: 1.18.5 -> 1.20.0
gstreamer1.0-vaapi: 1.18.5 -> 1.20.0
gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0
gst-examples: 1.18.5 -> 1.20.0
gst-devtools: 1.18.5 -> 1.20.0
...ct-has-a-different-signature-on-musl.patch | 8 +-
...tools_1.18.5.bb => gst-devtools_1.20.0.bb} | 9 +-
...001-Make-player-examples-installable.patch | 22 +-
...mples_1.18.5.bb => gst-examples_1.20.0.bb} | 11 +-
...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------
...1.18.5.bb => gstreamer1.0-libav_1.20.0.bb} | 9 +-
...x_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} | 6 +-
...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 +-
...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 +-
...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 12 +-
...bb => gstreamer1.0-plugins-good_1.20.0.bb} | 9 +-
...bb => gstreamer1.0-plugins-ugly_1.20.0.bb} | 10 +-
....18.5.bb => gstreamer1.0-python_1.20.0.bb} | 7 +-
....bb => gstreamer1.0-rtsp-server_1.20.0.bb} | 8 +-
.../gstreamer/gstreamer1.0-source.inc | 5 +
...1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} | 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 +-
34 files changed, 267 insertions(+), 865 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.20.0.bb} (83%)
rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.20.0.bb} (82%)
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%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} (89%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.20.0.bb} (91%)
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%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.20.0.bb} (91%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.20.0.bb} (82%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.20.0.bb} (79%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.20.0.bb} (70%)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} (90%)
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%)base-commit: a179485351a0563d12a2fef3e49971122255ed80
Signature · 1 line
2.34.1
RFC PATCH 1/12 gstreamer1.0: 1.18.5 -> 1.20.0
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 Source path to their subproject path.
Backported patches where remove and the other, which still apply where updated.
---
.../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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc new file +5 -0
@@ -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"
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -69
69 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch +6 -8
@@ -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 <[email protected]> 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 <[email protected]> --- - tests/check/meson.build | 10 +++++----- + subprojects/gstreamer/tests/check/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/tests/check/meson.build b/tests/check/meson.build -index a617cf159..b2636714b 100644 ---- a/tests/check/meson.build -+++ b/tests/check/meson.build +diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build +index 9c4228b6e4..506606684d 100644 +--- a/subprojects/gstreamer/tests/check/meson.build ++++ b/subprojects/gstreamer/tests/check/meson.build @@ -146,11 +146,11 @@ foreach t : core_tests if not skip_test
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -112
112 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +32 -35
106 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17 00:00:00 2001 -From: Seungha Yang <[email protected]> -Date: Tue, 15 Sep 2020 00:54:58 +0900 -Subject: [PATCH] tests: seek: Don't use too strict timeout for validation - -Expected segment-done message might not be seen within expected -time if system is not powerful enough. - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625> - -Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c] -Signed-off-by: Anuj Mittal <[email protected]> ---- - tests/check/pipelines/seek.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/check/pipelines/seek.c b/tests/check/pipelines/seek.c -index 28bb8846d..5f7447bc5 100644 ---- a/tests/check/pipelines/seek.c -+++ b/tests/check/pipelines/seek.c -@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2) - - GST_INFO ("wait for segment done message"); - -- msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 * GST_SECOND, -+ msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE, - GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR); - fail_unless (msg, "no message within the timed window"); - fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg), "segment-done"); --- -2.29.2 -
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch +14 -14
@@ -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 <[email protected]> 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 <[email protected]> --- - tests/check/meson.build | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) + subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++------- + 1 file changed, 13 insertions(+), 8 deletions(-) -diff --git a/tests/check/meson.build b/tests/check/meson.build -index a697a7b06..f64524904 100644 ---- a/tests/check/meson.build -+++ b/tests/check/meson.build -@@ -161,14 +161,17 @@ foreach t : core_tests +diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build +index 00a138a568..48ec2532f8 100644 +--- a/subprojects/gstreamer/tests/check/meson.build ++++ b/subprojects/gstreamer/tests/check/meson.build +@@ -161,14 +161,19 @@ foreach t : core_tests install: installed_tests_enabled, ) - env = environment() -- env.set('GST_PLUGIN_PATH_1_0', meson.build_root()) +- env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root()) - env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') - env.set('GST_STATE_IGNORE_ELEMENTS', '') - env.set('CK_DEFAULT_TIMEOUT', '20') - env.set('GST_REGISTRY', '@0@/@[email protected]'.format(meson.current_build_dir(), test_name)) - env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') - env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') -+ # environment() can't be passed to configure_file and it is needed for installed_tests -+ # use a dictionary as this is simplest solution to install the environment ++ # meson environment object can't be passed to configure_file and ++ # installed tests uses configure_file to install the environment. ++ # use a dictionary as this is the simplest solution ++ # to install the environment. + env = { -+ 'GST_PLUGIN_PATH_1_0': meson.build_root(), ++ 'GST_PLUGIN_PATH_1_0': meson.project_build_root(), + 'GST_PLUGIN_SYSTEM_PATH_1_0': '', + 'GST_STATE_IGNORE_ELEMENTS': '', + 'CK_DEFAULT_TIMEOUT': '20',
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +72 -0
72 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch deleted +0 -58
58 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +11 -14
@@ -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"
Signature · 1 line
2.34.1
Re: [OE-core][RFC PATCH 01/12] gstreamer1.0: 1.18.5 -> 1.20.0
On 1/26/22 11:28, Claudius Heine wrote:
[...]
meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc line 5
Quoted 11 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc new file +5
-0@@ -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"
Would it make sense to fetch gstreamer sources from git instead of tarballs ?
Then you just set SRCREV to point to specific commit .
Git also seems to make development a bit easier .
[...]
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb
Quoted 1 line
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +0
-0
Maybe the filename should be 1.19.90 until 1.20 is out ?
[...]
RFC PATCH 2/12 gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch +5 -5
@@ -9,16 +9,16 @@ Upstream-Status: Pending Signed-off-by: zhouming <[email protected]> --- - 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;
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch +5 -5
@@ -10,16 +10,16 @@ Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] Signed-off-by: Mingke Wang <[email protected]> --- - 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
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch +4 -4
@@ -9,13 +9,13 @@ Upstream-Status: Pending Signed-off-by: Carlos Rafael Giani <[email protected]> --- - 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__
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 79841a02ee754eba736cb32aaf2ed2b2fc0483d4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Thu, 24 Sep 2015 19:47:32 +0300 -Subject: [PATCH 4/4] glimagesink: Downrank to marginal - -On desktop, where there is good OpenGL, xvimagesink will come up first, -on other platforms, OpenGL can't be trusted because it's either software (like -in a VM) or broken (like on embedded)., so let ximagesink come above. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684] - -Signed-off-by: Alexander Kanavin <[email protected]> ---- - ext/gl/gstopengl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c -index 302e845..463be9c 100644 ---- a/ext/gl/gstopengl.c -+++ b/ext/gl/gstopengl.c -@@ -127,7 +127,7 @@ plugin_init (GstPlugin * plugin) - #endif - - if (!gst_element_register (plugin, "glimagesink", -- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { -+ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { - return FALSE; - } - --- -2.28.0 -
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb +8 -9
@@ -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"
Signature · 1 line
2.34.1
RFC PATCH 3/12 gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch +6 -6
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <[email protected]> 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 <gst/video/video.h>
@@ -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 <stdio.h>
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb +4 -5
@@ -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 \
Signature · 1 line
2.34.1
RFC PATCH 4/12 gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0
In reply to Claudius HeineFeature ofa and libmms are no longer available and where removed.
---
...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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +4 -4
@@ -7,13 +7,13 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> --- - 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) {
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +4 -4
@@ -9,13 +9,13 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> --- - 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 <gst/gst.h> #include <gst/glib-compat-private.h>
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch +12 -12
@@ -18,15 +18,15 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> --- - 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) {
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +12 -13
@@ -12,38 +12,37 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Andrey Zhizhikin <[email protected]> --- - 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 -
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +13 -13
@@ -9,23 +9,23 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Naveen Saini <[email protected]> --- - 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
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +9 -11
@@ -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 \
Signature · 1 line
2.34.1
RFC PATCH 5/12 gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0
In reply to Claudius HeineFeature gpl was added, since it is required to be enabled for gpl licensed codecs.
---
...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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +4 -6
@@ -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 \
Signature · 1 line
2.34.1
RFC PATCH 6/12 gstreamer1.0-libav: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch deleted +0 -346
@@ -1,346 +0,0 @@ -From 38d10ee800e42afeacc6bee714216e4c974c11f5 Mon Sep 17 00:00:00 2001 -From: Xi Ruoyao <[email protected]> -Date: Mon, 17 Jan 2022 01:33:47 +0800 -Subject: [PATCH] gst-libav: fix build with ffmpeg-5.0.0 - -Latest ffmpeg has removed avcodec_get_context_defaults(), and its -documentation says a new AVCodecContext should be allocated for this -purpose. The pointer returned by avcodec_find_decoder() is now -const-qualified so we also need to adjust for it. And, AVCOL_RANGE_MPEG -is now rejected with strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL. - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1531> -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <[email protected]> ---- - ext/libav/gstavauddec.c | 22 ++++++++------------- - ext/libav/gstavaudenc.c | 40 +++++++++++++++++++-------------------- - ext/libav/gstavcodecmap.c | 7 ++++--- - ext/libav/gstavutils.c | 2 +- - ext/libav/gstavviddec.c | 28 +++++++++++---------------- - ext/libav/gstavvidenc.c | 21 ++++++++++---------- - 6 files changed, 54 insertions(+), 66 deletions(-) - -diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c -index baf7aa5..b03a724 100644 ---- a/ext/libav/gstavauddec.c -+++ b/ext/libav/gstavauddec.c -@@ -168,12 +168,7 @@ gst_ffmpegauddec_finalize (GObject * object) - GstFFMpegAudDec *ffmpegdec = (GstFFMpegAudDec *) object; - - av_frame_free (&ffmpegdec->frame); -- -- if (ffmpegdec->context != NULL) { -- gst_ffmpeg_avcodec_close (ffmpegdec->context); -- av_free (ffmpegdec->context); -- ffmpegdec->context = NULL; -- } -+ avcodec_free_context (&ffmpegdec->context); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -193,14 +188,12 @@ gst_ffmpegauddec_close (GstFFMpegAudDec * ffmpegdec, gboolean reset) - gst_ffmpeg_avcodec_close (ffmpegdec->context); - ffmpegdec->opened = FALSE; - -- if (ffmpegdec->context->extradata) { -- av_free (ffmpegdec->context->extradata); -- ffmpegdec->context->extradata = NULL; -- } -+ av_freep (&ffmpegdec->context->extradata); - - if (reset) { -- if (avcodec_get_context_defaults3 (ffmpegdec->context, -- oclass->in_plugin) < 0) { -+ avcodec_free_context (&ffmpegdec->context); -+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegdec->context == NULL) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - return FALSE; - } -@@ -219,8 +212,9 @@ gst_ffmpegauddec_start (GstAudioDecoder * decoder) - oclass = (GstFFMpegAudDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); - - GST_OBJECT_LOCK (ffmpegdec); -- gst_ffmpeg_avcodec_close (ffmpegdec->context); -- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { -+ avcodec_free_context (&ffmpegdec->context); -+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegdec->context == NULL) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - GST_OBJECT_UNLOCK (ffmpegdec); - return FALSE; -diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c -index 3ff6432..689982f 100644 ---- a/ext/libav/gstavaudenc.c -+++ b/ext/libav/gstavaudenc.c -@@ -175,10 +175,8 @@ gst_ffmpegaudenc_finalize (GObject * object) - - /* clean up remaining allocated data */ - av_frame_free (&ffmpegaudenc->frame); -- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -- gst_ffmpeg_avcodec_close (ffmpegaudenc->refcontext); -- av_free (ffmpegaudenc->context); -- av_free (ffmpegaudenc->refcontext); -+ avcodec_free_context (&ffmpegaudenc->context); -+ avcodec_free_context (&ffmpegaudenc->refcontext); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -193,9 +191,9 @@ gst_ffmpegaudenc_start (GstAudioEncoder * encoder) - ffmpegaudenc->opened = FALSE; - ffmpegaudenc->need_reopen = FALSE; - -- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) { -+ avcodec_free_context (&ffmpegaudenc->context); -+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegaudenc->context == NULL) { - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -241,10 +239,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - - /* close old session */ - if (ffmpegaudenc->opened) { -- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -+ avcodec_free_context (&ffmpegaudenc->context); - ffmpegaudenc->opened = FALSE; -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) { -+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegaudenc->context == NULL) { - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -286,11 +284,11 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - /* open codec */ - if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) { - gst_caps_unref (allowed_caps); -- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -+ avcodec_free_context (&ffmpegaudenc->context); - GST_DEBUG_OBJECT (ffmpegaudenc, "avenc_%s: Failed to open FFMPEG codec", - oclass->in_plugin->name); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) -+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegaudenc->context == NULL) - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - - if ((oclass->in_plugin->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && -@@ -312,10 +310,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - - if (!other_caps) { - gst_caps_unref (allowed_caps); -- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -+ avcodec_free_context (&ffmpegaudenc->context); - GST_DEBUG ("Unsupported codec - no caps found"); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) -+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegaudenc->context == NULL) - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -331,10 +329,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - - if (!gst_audio_encoder_set_output_format (GST_AUDIO_ENCODER (ffmpegaudenc), - icaps)) { -- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -+ avcodec_free_context (&ffmpegaudenc->context); - gst_caps_unref (icaps); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) -+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegaudenc->context == NULL) - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -403,8 +401,8 @@ buffer_info_free (void *opaque, guint8 * data) - gst_buffer_unmap (info->buffer, &info->map); - gst_buffer_unref (info->buffer); - } else { -- av_free (info->ext_data); -- av_free (info->ext_data_array); -+ av_freep (&info->ext_data); -+ av_freep (&info->ext_data_array); - } - g_slice_free (BufferInfo, info); - } -diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c -index f58633d..e2a3641 100644 ---- a/ext/libav/gstavcodecmap.c -+++ b/ext/libav/gstavcodecmap.c -@@ -2331,7 +2331,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id, - } - - if (buildcaps) { -- AVCodec *codec; -+ const AVCodec *codec; - - if ((codec = avcodec_find_decoder (codec_id)) || - (codec = avcodec_find_encoder (codec_id))) { -@@ -2975,6 +2975,7 @@ gst_ffmpeg_videoinfo_to_context (GstVideoInfo * info, AVCodecContext * context) - context->color_range = AVCOL_RANGE_JPEG; - } else { - context->color_range = AVCOL_RANGE_MPEG; -+ context->strict_std_compliance = FF_COMPLIANCE_UNOFFICIAL; - } - } - -@@ -4330,7 +4331,7 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) - audio = TRUE; - } else if (!strncmp (mimetype, "audio/x-gst-av-", 15)) { - gchar ext[16]; -- AVCodec *codec; -+ const AVCodec *codec; - - if (strlen (mimetype) <= 30 && - sscanf (mimetype, "audio/x-gst-av-%s", ext) == 1) { -@@ -4342,7 +4343,7 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) - } - } else if (!strncmp (mimetype, "video/x-gst-av-", 15)) { - gchar ext[16]; -- AVCodec *codec; -+ const AVCodec *codec; - - if (strlen (mimetype) <= 30 && - sscanf (mimetype, "video/x-gst-av-%s", ext) == 1) { -diff --git a/ext/libav/gstavutils.c b/ext/libav/gstavutils.c -index 3780cff..f3878c3 100644 ---- a/ext/libav/gstavutils.c -+++ b/ext/libav/gstavutils.c -@@ -36,7 +36,7 @@ - const gchar * - gst_ffmpeg_get_codecid_longname (enum AVCodecID codec_id) - { -- AVCodec *codec; -+ const AVCodec *codec; - /* Let's use what ffmpeg can provide us */ - - if ((codec = avcodec_find_decoder (codec_id)) || -diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c -index 7ec5766..5dd207e 100644 ---- a/ext/libav/gstavviddec.c -+++ b/ext/libav/gstavviddec.c -@@ -320,12 +320,7 @@ gst_ffmpegviddec_finalize (GObject * object) - GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) object; - - av_frame_free (&ffmpegdec->picture); -- -- if (ffmpegdec->context != NULL) { -- gst_ffmpeg_avcodec_close (ffmpegdec->context); -- av_free (ffmpegdec->context); -- ffmpegdec->context = NULL; -- } -+ avcodec_free_context (&ffmpegdec->context); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -363,13 +358,11 @@ gst_ffmpegviddec_close (GstFFMpegVidDec * ffmpegdec, gboolean reset) - - gst_buffer_replace (&ffmpegdec->palette, NULL); - -- if (ffmpegdec->context->extradata) { -- av_free (ffmpegdec->context->extradata); -- ffmpegdec->context->extradata = NULL; -- } -+ av_freep (&ffmpegdec->context->extradata); - if (reset) { -- if (avcodec_get_context_defaults3 (ffmpegdec->context, -- oclass->in_plugin) < 0) { -+ avcodec_free_context (&ffmpegdec->context); -+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegdec->context == NULL) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - return FALSE; - } -@@ -1704,7 +1697,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec, - if (side_data) { - GST_LOG_OBJECT (ffmpegdec, - "Found CC side data of type AV_FRAME_DATA_A53_CC, size %d", -- side_data->size); -+ (int) side_data->size); - GST_MEMDUMP ("A53 CC", side_data->data, side_data->size); - - /* do not add closed caption meta if it already exists */ -@@ -1966,8 +1959,9 @@ gst_ffmpegviddec_start (GstVideoDecoder * decoder) - oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); - - GST_OBJECT_LOCK (ffmpegdec); -- gst_ffmpeg_avcodec_close (ffmpegdec->context); -- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { -+ avcodec_free_context (&ffmpegdec->context); -+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegdec->context == NULL) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - GST_OBJECT_UNLOCK (ffmpegdec); - return FALSE; -@@ -2261,10 +2255,10 @@ gst_ffmpegviddec_get_property (GObject * object, - - switch (prop_id) { - case PROP_LOWRES: -- g_value_set_enum (value, ffmpegdec->context->lowres); -+ g_value_set_enum (value, ffmpegdec->lowres); - break; - case PROP_SKIPFRAME: -- g_value_set_enum (value, ffmpegdec->context->skip_frame); -+ g_value_set_enum (value, ffmpegdec->skip_frame); - break; - case PROP_DIRECT_RENDERING: - g_value_set_boolean (value, ffmpegdec->direct_rendering); -diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c -index 0468d88..2ed9e5a 100644 ---- a/ext/libav/gstavvidenc.c -+++ b/ext/libav/gstavvidenc.c -@@ -224,8 +224,8 @@ gst_ffmpegvidenc_finalize (GObject * object) - av_frame_free (&ffmpegenc->picture); - gst_ffmpeg_avcodec_close (ffmpegenc->context); - gst_ffmpeg_avcodec_close (ffmpegenc->refcontext); -- av_free (ffmpegenc->context); -- av_free (ffmpegenc->refcontext); -+ av_freep (&ffmpegenc->context); -+ av_freep (&ffmpegenc->refcontext); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -247,10 +247,10 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, - - /* close old session */ - if (ffmpegenc->opened) { -- gst_ffmpeg_avcodec_close (ffmpegenc->context); -+ avcodec_free_context (&ffmpegenc->context); - ffmpegenc->opened = FALSE; -- if (avcodec_get_context_defaults3 (ffmpegenc->context, -- oclass->in_plugin) < 0) { -+ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegenc->context == NULL) { - GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); - return FALSE; - } -@@ -454,9 +454,9 @@ bad_input_fmt: - } - close_codec: - { -- gst_ffmpeg_avcodec_close (ffmpegenc->context); -- if (avcodec_get_context_defaults3 (ffmpegenc->context, -- oclass->in_plugin) < 0) -+ avcodec_free_context (&ffmpegenc->context); -+ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegenc->context == NULL) - GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); - goto cleanup_stats_in; - } -@@ -896,8 +896,9 @@ gst_ffmpegvidenc_start (GstVideoEncoder * encoder) - ffmpegenc->need_reopen = FALSE; - - /* close old session */ -- gst_ffmpeg_avcodec_close (ffmpegenc->context); -- if (avcodec_get_context_defaults3 (ffmpegenc->context, oclass->in_plugin) < 0) { -+ avcodec_free_context (&ffmpegenc->context); -+ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin); -+ if (ffmpegenc->context == NULL) { - GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); - return FALSE; - }
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb +3 -6
@@ -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"
Signature · 1 line
2.34.1
RFC PATCH 7/12 gstreamer1.0-python: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb +3 -4
@@ -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
Signature · 1 line
2.34.1
RFC PATCH 8/12 gstreamer1.0-omx: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb +2 -4
@@ -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"
Signature · 1 line
2.34.1
RFC PATCH 9/12 gstreamer1.0-vaapi: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb +2 -3
@@ -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
Signature · 1 line
2.34.1
RFC PATCH 10/12 gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb +3 -5
@@ -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
Signature · 1 line
2.34.1
RFC PATCH 11/12 gst-examples: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch +11 -11
@@ -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
meta/recipes-multimedia/gstreamer/gst-examples_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb +5 -6
@@ -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
Signature · 1 line
2.34.1
RFC PATCH 12/12 gst-devtools: 1.18.5 -> 1.20.0
In reply to 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%)meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +4 -4
@@ -12,13 +12,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> --- - 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, }
meta/recipes-multimedia/gstreamer/gst-devtools_1.20.0.bb renamed from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb +4 -5
@@ -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"
Signature · 1 line
2.34.1
Hi Claudius,
I think we can do that switch for the monorepo in a follow up patch after the 1.20 integration.
I have an internal update with most ready for 19.3 that misses some of the existing downstream patches that we have.
The gstreamer project will provide the archives for different components as they had done so far,
so we don't need to change the monorepo to integrate the gstreamer 1.20 for now.
Cheers,
Jose
Claudius Heine <[email protected]> escreveu no dia quarta, 26/01/2022 à(s) 10:28:
Quoted 140 lines
Hi,
since the release of gstreamer 1.20 is getting close, and it might make sense to
include it into the kirkstone release. I prepared preliminary update patchset
for it.Gstreamer changed to use monorepos with 1.20 so I went ahead I changed all recipes to use one
SRC_URIfromgstreamer1.0-source.inc. Currently I just use
a tarball from a unrelease commit id, but that will be changed to the correct
one, after gstreamer is released.I have some ideas which could be implemented with this change, but I wanted feedback for this first:
- remove the version from the filename, and define the PV in thegstreamer1.0-source.inc, this might make future updates easier.
- put all recipes together into one recipe, which provides packages for
all
subprojects, this improves build time and makes maintenance easier, but
also
breaks downstream bbappends.Any feedback on this is welcome.
kind regards,
ClaudiusClaudius Heine (12):
gstreamer1.0: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0
gstreamer1.0-libav: 1.18.5 -> 1.20.0
gstreamer1.0-python: 1.18.5 -> 1.20.0
gstreamer1.0-omx: 1.18.5 -> 1.20.0
gstreamer1.0-vaapi: 1.18.5 -> 1.20.0
gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0
gst-examples: 1.18.5 -> 1.20.0
gst-devtools: 1.18.5 -> 1.20.0...ct-has-a-different-signature-on-musl.patch | 8 +- ...tools_1.18.5.bb => gst-devtools_1.20.0.bb} | 9 +- ...001-Make-player-examples-installable.patch | 22 +- ...mples_1.18.5.bb => gst-examples_1.20.0.bb} | 11 +- ...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------ ...1.18.5.bb => gstreamer1.0-libav_1.20.0.bb} | 9 +- ...x_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} | 6 +- ...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 +- ...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 +- ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 12 +- ...bb => gstreamer1.0-plugins-good_1.20.0.bb} | 9 +- ...bb => gstreamer1.0-plugins-ugly_1.20.0.bb} | 10 +- ....18.5.bb => gstreamer1.0-python_1.20.0.bb} | 7 +- ....bb => gstreamer1.0-rtsp-server_1.20.0.bb} | 8 +- .../gstreamer/gstreamer1.0-source.inc | 5 + ...1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} | 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 +- 34 files changed, 267 insertions(+), 865 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.20.0.bb} (83%) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.20.0.bb} (82%) 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%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} (89%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.20.0.bb} (91%) 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%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.20.0.bb} (91%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.20.0.bb} (82%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.20.0.bb} (79%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.20.0.bb} (70%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} (90%) delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
renamemeta/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
renamemeta/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
renamemeta/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%)
base-commit:
a179485351a0563d12a2fef3e49971122255ed80--
2.34.1
Signature · 3 lines
Best regards, José Quaresma
Thanks, I guess RP or I should spin this on the autobuilder so you can see where the issues are?
Alex
Quoted 176 lines · Jose Quaresma
Hi Claudius,
I think we can do that switch for the monorepo in a follow up patch after the 1.20 integration.
I have an internal update with most ready for 19.3 that misses some of the existing downstream patches that we have.The gstreamer project will provide the archives for different components as they had done so far,
so we don't need to change the monorepo to integrate the gstreamer 1.20 for now.Cheers,
JoseClaudius Heine <[email protected]> escreveu no dia quarta, 26/01/2022 à(s) 10:28:
Quoted 133 lines
Hi,
since the release of gstreamer 1.20 is getting close, and it might make sense to
include it into the kirkstone release. I prepared preliminary update patchset
for it.Gstreamer changed to use monorepos with 1.20 so I went ahead I changed all recipes to use one
SRC_URIfromgstreamer1.0-source.inc. Currently I just use
a tarball from a unrelease commit id, but that will be changed to the correct
one, after gstreamer is released.I have some ideas which could be implemented with this change, but I wanted
feedback for this first:
- remove the version from the filename, and define the PV in thegstreamer1.0-source.inc, this might make future updates easier.
- put all recipes together into one recipe, which provides packages for
all
subprojects, this improves build time and makes maintenance easier,
but also
breaks downstream bbappends.Any feedback on this is welcome.
kind regards,
ClaudiusClaudius Heine (12):
gstreamer1.0: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0
gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0
gstreamer1.0-libav: 1.18.5 -> 1.20.0
gstreamer1.0-python: 1.18.5 -> 1.20.0
gstreamer1.0-omx: 1.18.5 -> 1.20.0
gstreamer1.0-vaapi: 1.18.5 -> 1.20.0
gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0
gst-examples: 1.18.5 -> 1.20.0
gst-devtools: 1.18.5 -> 1.20.0...ct-has-a-different-signature-on-musl.patch | 8 +- ...tools_1.18.5.bb => gst-devtools_1.20.0.bb} | 9 +- ...001-Make-player-examples-installable.patch | 22 +- ...mples_1.18.5.bb => gst-examples_1.20.0.bb} | 11 +- ...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------ ...1.18.5.bb => gstreamer1.0-libav_1.20.0.bb} | 9 +- ...x_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} | 6 +- ...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 +- ...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 +- ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 12 +- ...bb => gstreamer1.0-plugins-good_1.20.0.bb} | 9 +- ...bb => gstreamer1.0-plugins-ugly_1.20.0.bb} | 10 +- ....18.5.bb => gstreamer1.0-python_1.20.0.bb} | 7 +- ....bb => gstreamer1.0-rtsp-server_1.20.0.bb} | 8 +- .../gstreamer/gstreamer1.0-source.inc | 5 + ...1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} | 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 +- 34 files changed, 267 insertions(+), 865 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.20.0.bb} (83%) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.20.0.bb} (82%) 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%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.20.0.bb} (89%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.20.0.bb} (91%) 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%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.20.0.bb} (91%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.20.0.bb} (82%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.20.0.bb} (79%) rename meta/recipes-multimedia/gstreamer/{ gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.20.0.bb} (70%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.20.0.bb} (90%) delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
renamemeta/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
renamemeta/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
renamemeta/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 =>Quoted 8 lines
gstreamer1.0_1.20.0.bb} (72%)
base-commit:
a179485351a0563d12a2fef3e49971122255ed80--
2.34.1--
Best regards,José Quaresma
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#160979):
https://lists.openembedded.org/g/openembedded-core/message/160979
Mute This Topic: https://lists.openembedded.org/mt/88693639/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Alex,
Quoted 1 line · Alexander Kanavin
Thanks, I guess RP or I should spin this on the autobuilder so you can see where the issues are?
Sure that sounds good.
Thanks!
Quoted 232 lines
Alex
On Wed, 26 Jan 2022 at 11:52, Jose Quaresma <[email protected] <mailto:[email protected]>> wrote:
Hi Claudius, I think we can do that switch for the monorepo in a follow up patch after the 1.20 integration. I have an internal update with most ready for 19.3 that misses some of the existing downstream patches that we have. The gstreamer project will provide the archives for different components as they had done so far, so we don't need to change the monorepo to integrate the gstreamer 1.20 for now. Cheers, Jose Claudius Heine <[email protected] <mailto:[email protected]>> escreveu no dia quarta, 26/01/2022 à(s) 10:28: Hi, since the release of gstreamer 1.20 is getting close, and it might make sense to include it into the kirkstone release. I prepared preliminary update patchset for it. Gstreamer changed to use monorepos with 1.20 so I went ahead I changed all recipes to use one SRC_URI from `gstreamer1.0-source.inc`. Currently I just use a tarball from a unrelease commit id, but that will be changed to the correct one, after gstreamer is released. I have some ideas which could be implemented with this change, but I wanted feedback for this first: - remove the version from the filename, and define the PV in the `gstreamer1.0-source.inc`, this might make future updates easier. - put all recipes together into one recipe, which provides packages for all subprojects, this improves build time and makes maintenance easier, but also breaks downstream bbappends. Any feedback on this is welcome. kind regards, Claudius Claudius Heine (12): gstreamer1.0: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0 gstreamer1.0-libav: 1.18.5 -> 1.20.0 gstreamer1.0-python: 1.18.5 -> 1.20.0 gstreamer1.0-omx: 1.18.5 -> 1.20.0 gstreamer1.0-vaapi: 1.18.5 -> 1.20.0 gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0 gst-examples: 1.18.5 -> 1.20.0 gst-devtools: 1.18.5 -> 1.20.0 ...ct-has-a-different-signature-on-musl.patch | 8 +- ...tools_1.18.5.bb <http://tools_1.18.5.bb> => gst-devtools_1.20.0.bb <http://gst-devtools_1.20.0.bb>} | 9 +- ...001-Make-player-examples-installable.patch | 22 +- ...mples_1.18.5.bb <http://mples_1.18.5.bb> => gst-examples_1.20.0.bb <http://gst-examples_1.20.0.bb>} | 11 +- ...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------ ...1.18.5.bb <http://1.18.5.bb> => gstreamer1.0-libav_1.20.0.bb <http://gstreamer1.0-libav_1.20.0.bb>} | 9 +- ...x_1.18.5.bb <http://x_1.18.5.bb> => gstreamer1.0-omx_1.20.0.bb <http://gstreamer1.0-omx_1.20.0.bb>} | 6 +- ...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 <http://gstreamer1.0-plugins-bad_1.20.0.bb>} | 20 +- ...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 <http://gstreamer1.0-plugins-base_1.20.0.bb>} | 17 +- ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 12 +- ...bb => gstreamer1.0-plugins-good_1.20.0.bb <http://gstreamer1.0-plugins-good_1.20.0.bb>} | 9 +- ...bb => gstreamer1.0-plugins-ugly_1.20.0.bb <http://gstreamer1.0-plugins-ugly_1.20.0.bb>} | 10 +- ....18.5.bb <http://18.5.bb> => gstreamer1.0-python_1.20.0.bb <http://gstreamer1.0-python_1.20.0.bb>} | 7 +- ....bb => gstreamer1.0-rtsp-server_1.20.0.bb <http://gstreamer1.0-rtsp-server_1.20.0.bb>} | 8 +- .../gstreamer/gstreamer1.0-source.inc | 5 + ...1.18.5.bb <http://1.18.5.bb> => gstreamer1.0-vaapi_1.20.0.bb <http://gstreamer1.0-vaapi_1.20.0.bb>} | 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 <http://er1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} | 25 +- 34 files changed, 267 insertions(+), 865 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb <http://gst-devtools_1.18.5.bb> => gst-devtools_1.20.0.bb <http://gst-devtools_1.20.0.bb>} (83%) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb <http://gst-examples_1.18.5.bb> => gst-examples_1.20.0.bb <http://gst-examples_1.20.0.bb>} (82%) 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 <http://gstreamer1.0-libav_1.18.5.bb> => gstreamer1.0-libav_1.20.0.bb <http://gstreamer1.0-libav_1.20.0.bb>} (66%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb <http://gstreamer1.0-omx_1.18.5.bb> => gstreamer1.0-omx_1.20.0.bb <http://gstreamer1.0-omx_1.20.0.bb>} (89%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb <http://gstreamer1.0-plugins-bad_1.18.5.bb> => gstreamer1.0-plugins-bad_1.20.0.bb <http://gstreamer1.0-plugins-bad_1.20.0.bb>} (91%) 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 <http://gstreamer1.0-plugins-base_1.18.5.bb> => gstreamer1.0-plugins-base_1.20.0.bb <http://gstreamer1.0-plugins-base_1.20.0.bb>} (85%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb <http://gstreamer1.0-plugins-good_1.18.5.bb> => gstreamer1.0-plugins-good_1.20.0.bb <http://gstreamer1.0-plugins-good_1.20.0.bb>} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb <http://gstreamer1.0-plugins-ugly_1.18.5.bb> => gstreamer1.0-plugins-ugly_1.20.0.bb <http://gstreamer1.0-plugins-ugly_1.20.0.bb>} (82%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb <http://gstreamer1.0-python_1.18.5.bb> => gstreamer1.0-python_1.20.0.bb <http://gstreamer1.0-python_1.20.0.bb>} (79%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb <http://gstreamer1.0-rtsp-server_1.18.5.bb> => gstreamer1.0-rtsp-server_1.20.0.bb <http://gstreamer1.0-rtsp-server_1.20.0.bb>} (70%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb <http://gstreamer1.0-vaapi_1.18.5.bb> => gstreamer1.0-vaapi_1.20.0.bb <http://gstreamer1.0-vaapi_1.20.0.bb>} (90%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch => 0002-tests-add-support-for-install-the-tests.patch} (65%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch => 0003-tests-use-a-dictionaries-for-environment.patch} (61%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} (72%) base-commit: a179485351a0563d12a2fef3e49971122255ed80 -- 2.34.1 -- Best regards, José Quaresma -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160979): https://lists.openembedded.org/g/openembedded-core/message/160979 <https://lists.openembedded.org/g/openembedded-core/message/160979> Mute This Topic: https://lists.openembedded.org/mt/88693639/1686489 <https://lists.openembedded.org/mt/88693639/1686489> Group Owner: [email protected] <mailto:openembedded-core%[email protected]> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub <https://lists.openembedded.org/g/openembedded-core/unsub> [[email protected] <mailto:[email protected]>] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]
Quoted 5 lines · Claudius Heine
Quoted 2 lines · Alexander Kanavin
Thanks, I guess RP or I should spin this on the autobuilder so you can see where the issues are?
Sure that sounds good.
There you go:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3161
Your choice is to watch the ongoing builds with trepidation, or come back in 3 hours-ish (most of the builds should be complete by then) and see how many fails you got :)
Test configurations are defined here:
https://git.yoctoproject.org/yocto-autobuilder-helper/tree/config.json
Alex
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 10 lines · Alexander Kanavin via lists.openembedded.org
There you go:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3161Your choice is to watch the ongoing builds with trepidation, or come back in 3 hours-ish (most of the builds should be complete by then) and see how many fails you got :)
Test configurations are defined here:
https://git.yoctoproject.org/yocto-autobuilder-helper/tree/config.json
There is a ptest fail on x86:
https://autobuilder.yocto.io/pub/non-release/20220126-15/testresults/qemux86-64-ptest/gstreamer1.0.log
The same ptest has no issues on aarch64:
https://autobuilder.yocto.io/pub/non-release/20220126-15/testresults/qemuarm64-ptest/gstreamer1.0.log
Other than that, looks pretty good. armhost fail is unrelated.
Alex
Hi Jose,
Quoted 8 lines · Jose Quaresma
Hi Claudius,
I think we can do that switch for the monorepo in a follow up patch after the 1.20 integration.
I have an internal update with most ready for 19.3 that misses some of the existing downstream patches that we have.The gstreamer project will provide the archives for different components as they had done so far, so we don't need to change the monorepo to integrate the gstreamer 1.20 for now.
Ok that sounds good. I didn't know about that.
So that means you will update gstreamer to 1.20 when it is ready for kirkstone?
thanks,
Claudius
Quoted 187 lines
Cheers,
JoseClaudius Heine <[email protected] <mailto:[email protected]>> escreveu no dia quarta, 26/01/2022 à(s) 10:28:
Hi, since the release of gstreamer 1.20 is getting close, and it might make sense to include it into the kirkstone release. I prepared preliminary update patchset for it. Gstreamer changed to use monorepos with 1.20 so I went ahead I changed all recipes to use one SRC_URI from `gstreamer1.0-source.inc`. Currently I just use a tarball from a unrelease commit id, but that will be changed to the correct one, after gstreamer is released. I have some ideas which could be implemented with this change, but I wanted feedback for this first: - remove the version from the filename, and define the PV in the `gstreamer1.0-source.inc`, this might make future updates easier. - put all recipes together into one recipe, which provides packages for all subprojects, this improves build time and makes maintenance easier, but also breaks downstream bbappends. Any feedback on this is welcome. kind regards, Claudius Claudius Heine (12): gstreamer1.0: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0 gstreamer1.0-libav: 1.18.5 -> 1.20.0 gstreamer1.0-python: 1.18.5 -> 1.20.0 gstreamer1.0-omx: 1.18.5 -> 1.20.0 gstreamer1.0-vaapi: 1.18.5 -> 1.20.0 gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0 gst-examples: 1.18.5 -> 1.20.0 gst-devtools: 1.18.5 -> 1.20.0 ...ct-has-a-different-signature-on-musl.patch | 8 +- ...tools_1.18.5.bb <http://tools_1.18.5.bb> => gst-devtools_1.20.0.bb <http://gst-devtools_1.20.0.bb>} | 9 +- ...001-Make-player-examples-installable.patch | 22 +- ...mples_1.18.5.bb <http://mples_1.18.5.bb> => gst-examples_1.20.0.bb <http://gst-examples_1.20.0.bb>} | 11 +- ...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------ ...1.18.5.bb <http://1.18.5.bb> => gstreamer1.0-libav_1.20.0.bb <http://gstreamer1.0-libav_1.20.0.bb>} | 9 +- ...x_1.18.5.bb <http://x_1.18.5.bb> => gstreamer1.0-omx_1.20.0.bb <http://gstreamer1.0-omx_1.20.0.bb>} | 6 +- ...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 <http://gstreamer1.0-plugins-bad_1.20.0.bb>} | 20 +- ...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 <http://gstreamer1.0-plugins-base_1.20.0.bb>} | 17 +- ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 12 +- ...bb => gstreamer1.0-plugins-good_1.20.0.bb <http://gstreamer1.0-plugins-good_1.20.0.bb>} | 9 +- ...bb => gstreamer1.0-plugins-ugly_1.20.0.bb <http://gstreamer1.0-plugins-ugly_1.20.0.bb>} | 10 +- ....18.5.bb <http://18.5.bb> => gstreamer1.0-python_1.20.0.bb <http://gstreamer1.0-python_1.20.0.bb>} | 7 +- ....bb => gstreamer1.0-rtsp-server_1.20.0.bb <http://gstreamer1.0-rtsp-server_1.20.0.bb>} | 8 +- .../gstreamer/gstreamer1.0-source.inc | 5 + ...1.18.5.bb <http://1.18.5.bb> => gstreamer1.0-vaapi_1.20.0.bb <http://gstreamer1.0-vaapi_1.20.0.bb>} | 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 <http://er1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} | 25 +- 34 files changed, 267 insertions(+), 865 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb <http://gst-devtools_1.18.5.bb> => gst-devtools_1.20.0.bb <http://gst-devtools_1.20.0.bb>} (83%) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb <http://gst-examples_1.18.5.bb> => gst-examples_1.20.0.bb <http://gst-examples_1.20.0.bb>} (82%) 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 <http://gstreamer1.0-libav_1.18.5.bb> => gstreamer1.0-libav_1.20.0.bb <http://gstreamer1.0-libav_1.20.0.bb>} (66%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb <http://gstreamer1.0-omx_1.18.5.bb> => gstreamer1.0-omx_1.20.0.bb <http://gstreamer1.0-omx_1.20.0.bb>} (89%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb <http://gstreamer1.0-plugins-bad_1.18.5.bb> => gstreamer1.0-plugins-bad_1.20.0.bb <http://gstreamer1.0-plugins-bad_1.20.0.bb>} (91%) 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 <http://gstreamer1.0-plugins-base_1.18.5.bb> => gstreamer1.0-plugins-base_1.20.0.bb <http://gstreamer1.0-plugins-base_1.20.0.bb>} (85%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb <http://gstreamer1.0-plugins-good_1.18.5.bb> => gstreamer1.0-plugins-good_1.20.0.bb <http://gstreamer1.0-plugins-good_1.20.0.bb>} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb <http://gstreamer1.0-plugins-ugly_1.18.5.bb> => gstreamer1.0-plugins-ugly_1.20.0.bb <http://gstreamer1.0-plugins-ugly_1.20.0.bb>} (82%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb <http://gstreamer1.0-python_1.18.5.bb> => gstreamer1.0-python_1.20.0.bb <http://gstreamer1.0-python_1.20.0.bb>} (79%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb <http://gstreamer1.0-rtsp-server_1.18.5.bb> => gstreamer1.0-rtsp-server_1.20.0.bb <http://gstreamer1.0-rtsp-server_1.20.0.bb>} (70%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb <http://gstreamer1.0-vaapi_1.18.5.bb> => gstreamer1.0-vaapi_1.20.0.bb <http://gstreamer1.0-vaapi_1.20.0.bb>} (90%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch => 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patch => 0002-tests-add-support-for-install-the-tests.patch} (65%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patch => 0003-tests-use-a-dictionaries-for-environment.patch} (61%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} (72%) base-commit: a179485351a0563d12a2fef3e49971122255ed80 -- 2.34.1Signature · 3 lines
Best regards, José Quaresma
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]
Claudius Heine <[email protected]> escreveu no dia quarta, 26/01/2022 à(s) 12:15:
Quoted 11 lines
Hi Jose,
Quoted 8 lines · Jose Quaresma
Hi Claudius,
I think we can do that switch for the monorepo in a follow up patch after the 1.20 integration.
I have an internal update with most ready for 19.3 that misses some of the existing downstream patches that we have.
Quoted 7 lines
Quoted 4 lines
The gstreamer project will provide the archives for different components as they had done so far,
so we don't need to change the monorepo to integrate the gstreamer 1.20 for now.Ok that sounds good. I didn't know about that.
I use or distribute the release tarballs - how will this affect me? We will continue to release the various GStreamer modules individually as tarballs, so if you only consume tarballs the move to a mono repository should not affect you at all.
https://gstreamer.freedesktop.org/documentation/frequently-asked-questions/mono-repository.html?gi-language=c#i-use-or-distribute-the-release-tarballs-how-will-this-affect-me
Quoted 3 lines
So that means you will update gstreamer to 1.20 when it is ready for kirkstone?
As I said before I have some pre-work done for the gstreamer 19.3 in preparation for the 1.20 but I am not the manteires or the owner of these recipes.
Jose
Quoted 216 lines
thanks,
ClaudiusQuoted 53 lines
Cheers,
JoseClaudius Heine <[email protected] <mailto:[email protected]>> escreveu no dia quarta, 26/01/2022 à(s) 10:28:
Hi, since the release of gstreamer 1.20 is getting close, and it might make sense to include it into the kirkstone release. I prepared preliminary update patchset for it. Gstreamer changed to use monorepos with 1.20 so I went ahead I changed all recipes to use one SRC_URI from `gstreamer1.0-source.inc`. Currently I just use a tarball from a unrelease commit id, but that will be changed to the correct one, after gstreamer is released. I have some ideas which could be implemented with this change, but I wanted feedback for this first: - remove the version from the filename, and define the PV in the `gstreamer1.0-source.inc`, this might make future updates easier. - put all recipes together into one recipe, which provides packages for all subprojects, this improves build time and makes maintenance easier, but also breaks downstream bbappends. Any feedback on this is welcome. kind regards, Claudius Claudius Heine (12): gstreamer1.0: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-base: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-good: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-bad: 1.18.5 -> 1.20.0 gstreamer1.0-plugins-ugly: 1.18.5 -> 1.20.0 gstreamer1.0-libav: 1.18.5 -> 1.20.0 gstreamer1.0-python: 1.18.5 -> 1.20.0 gstreamer1.0-omx: 1.18.5 -> 1.20.0 gstreamer1.0-vaapi: 1.18.5 -> 1.20.0 gstreamer1.0-rtsp-server: 1.18.5 -> 1.20.0 gst-examples: 1.18.5 -> 1.20.0 gst-devtools: 1.18.5 -> 1.20.0Quoted 7 lines
...ct-has-a-different-signature-on-musl.patch | 8 +- ...tools_1.18.5.bb <http://tools_1.18.5.bb> => gst-devtools_1.20.0.bb <http://gst-devtools_1.20.0.bb>} | 9 +- ...001-Make-player-examples-installable.patch | 22 +- ...mples_1.18.5.bb <http://mples_1.18.5.bb> => gst-examples_1.20.0.bb <http://gst-examples_1.20.0.bb>} | 11 +- ...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346------------------
Quoted 39 lines
...1.18.5.bb <http://1.18.5.bb> => gstreamer1.0-libav_1.20.0.bb <http://gstreamer1.0-libav_1.20.0.bb>} | 9 +- ...x_1.18.5.bb <http://x_1.18.5.bb> => gstreamer1.0-omx_1.20.0.bb <http://gstreamer1.0-omx_1.20.0.bb>} | 6 +- ...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 <http://gstreamer1.0-plugins-bad_1.20.0.bb>} | 20 +- ...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 <http://gstreamer1.0-plugins-base_1.20.0.bb>} | 17 +- ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 12 +- ...bb => gstreamer1.0-plugins-good_1.20.0.bb <http://gstreamer1.0-plugins-good_1.20.0.bb>} | 9 +- ...bb => gstreamer1.0-plugins-ugly_1.20.0.bb <http://gstreamer1.0-plugins-ugly_1.20.0.bb>} | 10 +- ....18.5.bb <http://18.5.bb> => gstreamer1.0-python_1.20.0.bb <http://gstreamer1.0-python_1.20.0.bb>} | 7 +- ....bb => gstreamer1.0-rtsp-server_1.20.0.bb <http://gstreamer1.0-rtsp-server_1.20.0.bb>} | 8 +- .../gstreamer/gstreamer1.0-source.inc | 5 + ...1.18.5.bb <http://1.18.5.bb> => gstreamer1.0-vaapi_1.20.0.bb <http://gstreamer1.0-vaapi_1.20.0.bb>} | 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 <http://er1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} | 25 +-Quoted 9 lines
34 files changed, 267 insertions(+), 865 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb <http://gst-devtools_1.18.5.bb> => gst-devtools_1.20.0.bb <http://gst-devtools_1.20.0.bb>} (83%) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb <http://gst-examples_1.18.5.bb> => gst-examples_1.20.0.bb <http://gst-examples_1.20.0.bb>} (82%) delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patchQuoted 11 lines
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.18.5.bb <http://gstreamer1.0-libav_1.18.5.bb> => gstreamer1.0-libav_1.20.0.bb <http://gstreamer1.0-libav_1.20.0.bb>} (66%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb <http://gstreamer1.0-omx_1.18.5.bb> => gstreamer1.0-omx_1.20.0.bb <http://gstreamer1.0-omx_1.20.0.bb>} (89%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb <
http://gstreamer1.0-plugins-bad_1.18.5.bb>Quoted 4 lines
=> gstreamer1.0-plugins-bad_1.20.0.bb <http://gstreamer1.0-plugins-bad_1.20.0.bb>} (91%) delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patchQuoted 2 lines
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.18.5.bb
Quoted 5 lines
<http://gstreamer1.0-plugins-base_1.18.5.bb> => gstreamer1.0-plugins-base_1.20.0.bb <http://gstreamer1.0-plugins-base_1.20.0.bb>} (85%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb
Quoted 5 lines
<http://gstreamer1.0-plugins-good_1.18.5.bb> => gstreamer1.0-plugins-good_1.20.0.bb <http://gstreamer1.0-plugins-good_1.20.0.bb>} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb
Quoted 10 lines
<http://gstreamer1.0-plugins-ugly_1.18.5.bb> => gstreamer1.0-plugins-ugly_1.20.0.bb <http://gstreamer1.0-plugins-ugly_1.20.0.bb>} (82%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb <http://gstreamer1.0-python_1.18.5.bb> => gstreamer1.0-python_1.20.0.bb <http://gstreamer1.0-python_1.20.0.bb>} (79%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb <
http://gstreamer1.0-rtsp-server_1.18.5.bb>Quoted 11 lines
=> gstreamer1.0-rtsp-server_1.20.0.bb <http://gstreamer1.0-rtsp-server_1.20.0.bb>} (70%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-source.inc rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb <http://gstreamer1.0-vaapi_1.18.5.bb> => gstreamer1.0-vaapi_1.20.0.bb <http://gstreamer1.0-vaapi_1.20.0.bb>} (90%) delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patchQuoted 2 lines
rename
meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patchQuoted 3 lines
=> 0001-tests-respect-the-idententaion-used-in-meson.patch} (71%) delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patchQuoted 2 lines
rename
meta/recipes-multimedia/gstreamer/gstreamer1.0/{0005-tests-add-support-for-install-the-tests.patchQuoted 3 lines
=> 0002-tests-add-support-for-install-the-tests.patch} (65%) delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patchQuoted 2 lines
rename
meta/recipes-multimedia/gstreamer/gstreamer1.0/{0006-tests-use-a-dictionaries-for-environment.patchQuoted 3 lines
=> 0003-tests-use-a-dictionaries-for-environment.patch} (61%) create mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patchQuoted 2 lines
delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patchQuoted 11 lines
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb <http://gstreamer1.0_1.18.5.bb> => gstreamer1.0_1.20.0.bb <http://gstreamer1.0_1.20.0.bb>} (72%) base-commit: a179485351a0563d12a2fef3e49971122255ed80 -- 2.34.1Quoted 4 lines
--
Best regards,José Quaresma
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]
Signature · 3 lines
Best regards, José Quaresma