Update gstreamer recipes to 1.19.90
cover Update gstreamer recipes to 1.19.90
Hi,
this patchset update gstreamer to 1.19.90, the rc1 of the 1.20.0 release.
Changes from the RFC patchset:
- Use split up tarballs, instead of combined one
- Use 1.19.90 release instead of commit id
- Added patch to remove the gstbin:test_watch_for_state_change testcase, since it seems to be flaky:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778
regards,
Claudius
Claudius Heine (12):
gstreamer1.0: 1.18.5 -> 1.19.90
gstreamer1.0-plugins-base: 1.18.5 -> 1.19.90
gstreamer1.0-plugins-good: 1.18.5 -> 1.19.90
gstreamer1.0-plugins-bad: 1.18.5 -> 1.19.90
gstreamer1.0-plugins-ugly: 1.18.5 -> 1.19.90
gstreamer1.0-libav: 1.18.5 -> 1.19.90
gstreamer1.0-python: 1.18.5 -> 1.19.90
gstreamer1.0-omx: 1.18.5 -> 1.19.90
gstreamer1.0-vaapi: 1.18.5 -> 1.19.90
gstreamer1.0-rtsp-server: 1.18.5 -> 1.19.90
gst-examples: 1.18.5 -> 1.19.90
gst-devtools: 1.18.5 -> 1.19.90
...ools_1.18.5.bb => gst-devtools_1.19.90.bb} | 2 +-
...001-Make-player-examples-installable.patch | 2 +-
...ples_1.18.5.bb => gst-examples_1.19.90.bb} | 0
...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------
....18.5.bb => gstreamer1.0-libav_1.19.90.bb} | 5 +-
..._1.18.5.bb => gstreamer1.0-omx_1.19.90.bb} | 2 +-
...issing-opencv-data-dir-in-yocto-buil.patch | 17 +-
.../0005-msdk-fix-includedir-path.patch | 18 +-
...bb => gstreamer1.0-plugins-bad_1.19.90.bb} | 4 +-
...004-glimagesink-Downrank-to-marginal.patch | 32 --
...b => gstreamer1.0-plugins-base_1.19.90.bb} | 5 +-
...b => gstreamer1.0-plugins-good_1.19.90.bb} | 2 +-
...b => gstreamer1.0-plugins-ugly_1.19.90.bb} | 5 +-
...18.5.bb => gstreamer1.0-python_1.19.90.bb} | 2 +-
...bb => gstreamer1.0-rtsp-server_1.19.90.bb} | 4 +-
....18.5.bb => gstreamer1.0-vaapi_1.19.90.bb} | 2 +-
...der.c-when-env-var-is-set-do-not-fal.patch | 69 ----
...pect-the-idententaion-used-in-meson.patch} | 7 +-
...002-Remove-unused-valgrind-detection.patch | 112 ------
...s-add-support-for-install-the-tests.patch} | 48 ++-
...-use-too-strict-timeout-for-validati.patch | 32 --
...-use-a-dictionaries-for-environment.patch} | 24 +-
...er-script-to-run-the-installed_tests.patch | 72 ++++
...bin-test_watch_for_state_change-test.patch | 107 ++++++
...-the-environment-for-installed_tests.patch | 58 ---
...r1.0_1.18.5.bb => gstreamer1.0_1.19.90.bb} | 18 +-
26 files changed, 258 insertions(+), 737 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.19.90.bb} (94%)
rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.19.90.bb} (100%)
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.19.90.bb} (78%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.19.90.bb} (95%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.19.90.bb} (97%)
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.19.90.bb} (94%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.19.90.bb} (97%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.19.90.bb} (89%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.19.90.bb} (91%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.19.90.bb} (82%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.19.90.bb} (95%)
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} (87%)
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} (79%)
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} (70%)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.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.19.90.bb} (77%)base-commit: d1e1c8698a5143a1e5d80d172105b76c57b85dd6
Signature · 1 line
2.34.1
PATCH 1/12 gstreamer1.0: 1.18.5 -> 1.19.90
Backported patches where removed, others updated to their current version.
This also adds a patch to remove the gstbin:test_watch_for_state_change testcase, since it seems flaky:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778
---
...der.c-when-env-var-is-set-do-not-fal.patch | 69 -----------
...pect-the-idententaion-used-in-meson.patch} | 7 +-
...002-Remove-unused-valgrind-detection.patch | 112 ------------------
...s-add-support-for-install-the-tests.patch} | 48 ++++----
...-use-too-strict-timeout-for-validati.patch | 32 -----
...-use-a-dictionaries-for-environment.patch} | 24 ++--
...er-script-to-run-the-installed_tests.patch | 72 +++++++++++
...bin-test_watch_for_state_change-test.patch | 107 +++++++++++++++++
...-the-environment-for-installed_tests.patch | 58 ---------
...r1.0_1.18.5.bb => gstreamer1.0_1.19.90.bb} | 18 ++-
10 files changed, 225 insertions(+), 322 deletions(-)
delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-tests-respect-the-idententaion-used-in-meson.patch => 0001-tests-respect-the-idententaion-used-in-meson.patch} (87%)
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} (79%)
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} (70%)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.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.19.90.bb} (77%)meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch deleted +0 -69
@@ -1,69 +0,0 @@ -From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <[email protected]> -Date: Sat, 10 Oct 2020 19:09:03 +0000 -Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through - to system plugin scanner - -If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. - -Falling through to the one installed on the system is problamatic in cross-compilation -environemnts, regardless of whether one pointed to by the env var succeeded or failed. - -taken from: -http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669> - -Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9f958058697e6fbf5bde325228034572331d1a3a] - -Signed-off-by: Jose Quaresma <[email protected]> ---- - gst/gstpluginloader.c | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c -index d1e404d98..c626bf263 100644 ---- a/gst/gstpluginloader.c -+++ b/gst/gstpluginloader.c -@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) - if (loader->child_running) - return TRUE; - -- /* Find the gst-plugin-scanner: first try the env-var if it is set, -- * otherwise use the installed version */ -+ /* Find the gst-plugin-scanner */ - env = g_getenv ("GST_PLUGIN_SCANNER_1_0"); - if (env == NULL) - env = g_getenv ("GST_PLUGIN_SCANNER"); - - if (env != NULL && *env != '\0') { -+ /* use the env-var if it is set */ - GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env); - helper_bin = g_strdup (env); - res = gst_plugin_loader_try_helper (loader, helper_bin); - g_free (helper_bin); -- } -- -- if (!res) { -+ } else { -+ /* use the installed version */ - GST_LOG ("Trying installed plugin scanner"); - - #ifdef G_OS_WIN32 -@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) - #endif - res = gst_plugin_loader_try_helper (loader, helper_bin); - g_free (helper_bin); -+ } - -- if (!res) { -- GST_INFO ("No gst-plugin-scanner available, or not working"); -- } -+ if (!res) { -+ GST_INFO ("No gst-plugin-scanner available, or not working"); - } - - return loader->child_running; --- -2.29.2 -
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch +3 -4
@@ -1,17 +1,16 @@ -From 122e5ac3dd16a461b6ae595605490c8f5d1c3a9d Mon Sep 17 00:00:00 2001 +From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sun, 11 Apr 2021 19:48:13 +0100 Subject: [PATCH 1/4] tests: respect the idententaion used in meson Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] -Signed-off-by: Jose Quaresma <[email protected]> --- 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 +index 9c4228b6e4..506606684d 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -146,11 +146,11 @@ foreach t : core_tests
@@ -32,5 +31,5 @@ index a617cf159..b2636714b 100644 env = environment() -- -2.31.1 +2.33.1
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch deleted +0 -112
112 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch +23 -25
94 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 +12 -12
@@ -1,4 +1,4 @@ -From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17 00:00:00 2001 +From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sat, 24 Apr 2021 10:34:47 +0100 Subject: [PATCH 3/4] tests: use a dictionaries for environment
@@ -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(-) + 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 +index 00a138a568..48ec2532f8 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build -@@ -161,14 +161,17 @@ foreach t : core_tests +@@ -161,14 +161,19 @@ foreach t : core_tests install: installed_tests_enabled, ) - env = environment() -- env.set('GST_PLUGIN_PATH_1_0', meson.build_root()) +- env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root()) - env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') - env.set('GST_STATE_IGNORE_ELEMENTS', '') - env.set('CK_DEFAULT_TIMEOUT', '20') - env.set('GST_REGISTRY', '@0@/@[email protected]'.format(meson.current_build_dir(), test_name)) - env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') - env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') -+ # environment() can't be passed to configure_file and it is needed for installed_tests -+ # use a dictionary as this is simplest solution to install the environment ++ # meson environment object can't be passed to configure_file and ++ # installed tests uses configure_file to install the environment. ++ # use a dictionary as this is the simplest solution ++ # to install the environment. + env = { -+ 'GST_PLUGIN_PATH_1_0': meson.build_root(), ++ 'GST_PLUGIN_PATH_1_0': meson.project_build_root(), + 'GST_PLUGIN_SYSTEM_PATH_1_0': '', + 'GST_STATE_IGNORE_ELEMENTS': '', + 'CK_DEFAULT_TIMEOUT': '20',
@@ -44,5 +44,5 @@ index a697a7b06..f64524904 100644 if installed_tests_enabled test_conf = configuration_data() -- -2.31.1 +2.33.1
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch new file +72 -0
72 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch new file +107 -0
107 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.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +8 -10
@@ -10,22 +10,20 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native" inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection ptest-gnome -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ +LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" S = "${WORKDIR}/gstreamer-${PV}" SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ file://run-ptest \ - file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ - file://0002-Remove-unused-valgrind-detection.patch \ - file://0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \ - file://0004-tests-respect-the-idententaion-used-in-meson.patch \ - file://0005-tests-add-support-for-install-the-tests.patch \ - file://0006-tests-use-a-dictionaries-for-environment.patch \ - file://0007-tests-install-the-environment-for-installed_tests.patch \ + file://0001-tests-respect-the-idententaion-used-in-meson.patch \ + file://0002-tests-add-support-for-install-the-tests.patch \ + file://0003-tests-use-a-dictionaries-for-environment.patch \ + file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ + file://0005-tests-remove-gstbin-test_watch_for_state_change-test.patch \ " -SRC_URI[sha256sum] = "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a" +SRC_URI[sha256sum] = "4829bf60e40c13f37605638c28ce2855e84b58dc380e4331838ae13c02c8c2aa" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \
@@ -36,7 +34,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
PATCH 2/12 gstreamer1.0-plugins-base: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
...004-glimagesink-Downrank-to-marginal.patch | 32 -------------------
...b => gstreamer1.0-plugins-base_1.19.90.bb} | 5 ++-
2 files changed, 2 insertions(+), 35 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.19.90.bb} (94%)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.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb +2 -3
@@ -4,15 +4,14 @@ 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" +SRC_URI[sha256sum] = "667c5cbfae1873c8291b5911bedbf20ce92ee607b8b1b3d37120ed54e452db00" S = "${WORKDIR}/gst-plugins-base-${PV}"
Signature · 1 line
2.34.1
Re: [PATCH 02/12] gstreamer1.0-plugins-base: 1.18.5 -> 1.19.90
Hi,
Claudius Heine <[email protected]> escreveu no dia quarta, 2/02/2022 à(s) 13:42:
Quoted 80 lines
Signed-off-by Claudius Heine <[email protected]>--- ...004-glimagesink-Downrank-to-marginal.patch | 32 ------------------- ...b => gstreamer1.0-plugins-base_1.19.90.bb} | 5 ++- 2 files changed, 2 insertions(+), 35 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.19.90.bb} (94%)diff --git
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patchb/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patchdeleted file mode 100644
index f45ea65ef3..0000000000
---a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch+++/dev/nullmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch deleted +0
-7@@ -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
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch deleted +0
-3-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]
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch deleted +0
-22- -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 -(quoted diff) +0
-0gstreamer1.0-plugins-base_1.18.5.bb b/meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-base_1.19.90.bb
similarity index 94%
rename from meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-base_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-base_1.19.90.bb
index180241828f..5b02d4565a100644
--- a/meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-base_1.18.5.bb
+++ b/meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-base_1.19.90.bb(quoted diff) +0
-0@@ -4,15 +4,14 @@ DESCRIPTION = "'Base' GStreamer plugins and helperlibraries"
HOMEPAGE = "https://gstreamer.freedesktop.org/"
BUGTRACKER = "
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues"
LICENSE = "GPLv2+ & LGPLv2+"meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb +1
-1-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
\
Quoted 5 lines
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 \
Why is this patch dropped? As Far as I know it is not merged upstream.
Quoted 12 lines
"-SRC_URI[sha256sum] = "
960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3" +SRC_URI[sha256sum] = "667c5cbfae1873c8291b5911bedbf20ce92ee607b8b1b3d37120ed54e452db00"S = "${WORKDIR}/gst-plugins-base-${PV}"
--
2.34.1
Signature · 3 lines
Best regards, José Quaresma
Re: [PATCH 02/12] gstreamer1.0-plugins-base: 1.18.5 -> 1.19.90
Hi Jose,
On 2022-02-02 18:57, Jose Quaresma wrote:
[...]
Quoted 11 lines
SRC_URI =
"https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz
<https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$%7BPV%7D.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 \Quoted 1 line
Why is this patch dropped? As Far as I know it is not merged upstream.
Good catch! Thanks. Not sure why I dropped it. I will add a rebased version to v2.
Re: [PATCH 02/12] gstreamer1.0-plugins-base: 1.18.5 -> 1.19.90
Quoted 5 lines · Claudius Heine
Quoted 1 line
file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch\
Quoted 1 line
file://0003-viv-fb-Make-sure-config.h-is-included.patch\
Quoted 1 line
Quoted 9 lines
file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
Quoted 4 lines
- file://0004-glimagesink-Downrank-to-marginal.patch \
Why is this patch dropped? As Far as I know it is not merged upstream.
Good catch! Thanks. Not sure why I dropped it. I will add a rebased version to v2.
On the other hand I think it's something we do not need anymore.
Alex
PATCH 3/12 gstreamer1.0-plugins-good: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
...gins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.19.90.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.19.90.bb} (97%)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ " -SRC_URI[sha256sum] = "3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b" +SRC_URI[sha256sum] = "76c74ad1f2b62ee751c40d7d24544c3c0c580e2b7153d85272bd8b9dafa1a43e" S = "${WORKDIR}/gst-plugins-good-${PV}"
Signature · 1 line
2.34.1
PATCH 4/12 gstreamer1.0-plugins-bad: 1.18.5 -> 1.19.90
In reply to Claudius HeineFeatures libmms and ofa where removed upstream.
Patches where rebased.
---
...missing-opencv-data-dir-in-yocto-buil.patch | 17 ++++++++---------
.../0005-msdk-fix-includedir-path.patch | 18 +++++++++---------
....bb => gstreamer1.0-plugins-bad_1.19.90.bb} | 4 +---
3 files changed, 18 insertions(+), 21 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.19.90.bb} (97%)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +8 -9
@@ -19,31 +19,30 @@ diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build index 0b0b3fc..0ed3344 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build -@@ -78,20 +78,21 @@ else +@@ -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 +9 -9
@@ -16,16 +16,16 @@ diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index 6346c9451..068f38548 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build -@@ -40,7 +40,9 @@ endif +@@ -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.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +1 -3
@@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ file://0005-msdk-fix-includedir-path.patch \ " -SRC_URI[sha256sum] = "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" +SRC_URI[sha256sum] = "817cde39be30609e562c5b99d0e40527d58bd2319bc7a46eb8bec27f713f55ca" S = "${WORKDIR}/gst-plugins-bad-${PV}"
@@ -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
Re: [PATCH 04/12] gstreamer1.0-plugins-bad: 1.18.5 -> 1.19.90
Hi, Claudius
There are some new options on the gstreamer bad that are not updated on this patch.
more precisely what will be done to use the new gpl option ?
# License-related feature options
option('gpl', type: 'feature', value: 'disabled', yield: true,
description: 'Allow build plugins that have (A)GPL-licensed dependencies')
Claudius Heine <[email protected]> escreveu no dia quarta, 2/02/2022 à(s) 13:43:
Quoted 162 lines
Features
libmmsandofawhere removed upstream.Patches where rebased.
Signed-off-by Claudius Heine <[email protected]>--- ...missing-opencv-data-dir-in-yocto-buil.patch | 17 ++++++++--------- .../0005-msdk-fix-includedir-path.patch | 18 +++++++++--------- ....bb => gstreamer1.0-plugins-bad_1.19.90.bb} | 4 +--- 3 files changed, 18 insertions(+), 21 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.19.90.bb} (97%)
diff --git
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patchb/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patchindexb816709066..2b9854b45e100644
---a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
+++b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch(quoted diff) +0
-0@@ -19,31 +19,30 @@ diff --git a/ext/opencv/meson.buildb/ext/opencv/meson.build
index 0b0b3fc..0ed3344 100644
--- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build
-@@ -78,20 +78,21 @@ else
+@@ -84,20 +84,21 @@ if notopencv_found
endifif
opencv_found
+pkgconf_sysroot= run_command(python3, '-c', 'import os;
print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +1
-3- opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + opencv_prefix = opencv_dep.get_variable('prefix') gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] # Check the data dir used by opencv for its xml data files # Use prefix from pkg-config to be compatible with cross-compilation -- r = run_command('test', '-d', opencv_prefix + '/share/opencv') -+ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix +'/share/opencv')
+- r = run_command('test', '-d',opencv_prefix+ '/share/opencv', check:
false)
++ r =run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv', check: false)if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' else-- r =
run_command('test', '-d', opencv_prefix + '/share/OpenCV')
-+ r = run_command('test', '-d',pkgconf_sysroot+opencv_prefix+
'/share/OpenCV')
+- r = run_command('test', '-d',opencv_prefix+ '/share/OpenCV',
check: false)
++ r = run_command('test', '-d',pkgconf_sysroot+opencv_prefix+
'/share/OpenCV', check: false)if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' else-- r =
run_command('test', '-d', opencv_prefix + '/share/opencv4')
-+ r = run_command('test', '-d',pkgconf_sysroot+opencv_prefix+
'/share/opencv4')
+- r = run_command('test', '-d',opencv_prefix+ '/share/opencv4',
check: false)
++ r = run_command('test', '-d',pkgconf_sysroot+opencv_prefix+
'/share/opencv4', check: false)if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' else--
2.28.0
-
diff --gita/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patchb/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patchindexcb3bb7d361..5a89be79d0100644
---a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch
+++b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch(quoted diff) +0
-0@@ -16,16 +16,16 @@ diff --git a/sys/msdk/meson.buildb/sys/msdk/meson.build
index6346c9451..068f38548100644
--- a/sys/msdk/meson.build
+++ b/sys/msdk/meson.build
-@@ -40,7 +40,9 @@ endif
+@@ -46,7 +46,9 @@ ifmfx_api!= 'oneVPL'
+mfx_dep= dependency('libmfx', version: ['>= 1.0', '<= 1.99'],
required: false)-
mfx_dep=dependency('libmfx', required: false)
- ifmfx_dep.found()
-+pkgconf_sysroot=run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +2
-5- 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()
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +5
-0+ mfx_incdir = mfx_dep.get_variable('includedir') ++ mfx_incdir = pkgconf_sysroot + mfx_incdir + mfx_inc = [] + use_msdk = true + else -- 2.17.1(quoted diff) +0
-0gstreamer1.0-plugins-bad_1.18.5.bb b/meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-bad_1.19.90.bb
similarity index 97%
rename from meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-bad_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-bad_1.19.90.bb
indexf90dff693d..21ab28cc92100644meta/recipes-multimedia/gstreamer/ renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +0
-0gstreamer1.0-plugins-bad_1.19.90.bb
meta/recipes-multimedia/gstreamer/ renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +0
-0@@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ file://0005-msdk-fix-includedir-path.patch \ "-SRC_URI[sha256sum] = "
a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" +SRC_URI[sha256sum] = "817cde39be30609e562c5b99d0e40527d58bd2319bc7a46eb8bec27f713f55ca"S = "${WORKDIR}/gst-plugins-bad-${PV}"
meta/recipes-multimedia/gstreamer/ renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +0
-0@@ -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"meta/recipes-multimedia/gstreamer/ renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +0
-2@@ -132,7 +131,6 @@ EXTRA_OEMESON += " \ -Dmplex=disabled \ -Dmusepack=disabled \ -Dnvcodec=disabled \ - -Dofa=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dopensles=disabled \ --2.34.1
Signature · 3 lines
Best regards, José Quaresma
Re: [PATCH 04/12] gstreamer1.0-plugins-bad: 1.18.5 -> 1.19.90
Quoted 4 lines · Jose Quaresma
Hi, Claudius
There are some new options on the gstreamer bad that are not updated on this patch. more precisely what will be done to use the new gpl option ?
Hmm... I am not sure. gpl probably needs to be added because we already have faad and others which require it. I will at least that in v2.
For all other features I am open to suggestions about which should be added.
regards,
Claudius
PATCH 5/12 gstreamer1.0-plugins-ugly: 1.18.5 -> 1.19.90
In reply to Claudius HeineFeature gpl was added, which allows building gpl licensed codecs.
---
...s-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.19.90.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.19.90.bb} (89%)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +3 -2
@@ -13,7 +13,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9" +SRC_URI[sha256sum] = "5242a42c3fad209030bd2e8630b08ae93821384c2278965764a039d31ab2a246" S = "${WORKDIR}/gst-plugins-ugly-${PV}"
@@ -23,7 +23,7 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ - a52dec mpeg2dec \ + a52dec mpeg2dec gpl \ " PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52"
@@ -33,6 +33,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
Re: [PATCH 05/12] gstreamer1.0-plugins-ugly: 1.18.5 -> 1.19.90
Hi Claudius,
Claudius Heine <[email protected]> escreveu no dia quarta, 2/02/2022 à(s) 13:43:
Quoted 37 lines
Feature
gplwas added, which allows building gpl licensed codecs.Signed-off-by Claudius Heine <[email protected]>--- ...s-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.19.90.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb =>
gstreamer1.0-plugins-ugly_1.19.90.bb} (89%)(quoted diff) +0
-0gstreamer1.0-plugins-ugly_1.18.5.bb b/meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-ugly_1.19.90.bb
similarity index 89%
rename from meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-ugly_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-ugly_1.19.90.bb
index9777aaee19..53d8d0ed07100644
--- a/meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-ugly_1.18.5.bb
+++ b/meta/recipes-multimedia/gstreamer/ gstreamer1.0-plugins-ugly_1.19.90.bbmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +0
-0@@ -13,7 +13,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz
\ "-SRC_URI[sha256sum] = "
df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9" +SRC_URI[sha256sum] = "5242a42c3fad209030bd2e8630b08ae93821384c2278965764a039d31ab2a246"S = "${WORKDIR}/gst-plugins-ugly-${PV}"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.19.90.bb GST_PLUGIN_SET_HAS_EXAMPLES = "0" · line 27
Quoted 6 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +1
-1@@ -23,7 +23,7 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ - a52dec mpeg2dec \ + a52dec mpeg2dec gpl \
This will require commercial licence support
https://docs.yoctoproject.org/dev-manual/common-tasks.html?highlight=license_flags#enabling-commercially-licensed-recipes
Quoted 18 lines
(quoted diff) +0
-0"PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52"
(quoted diff) +0
-0@@ -33,6 +33,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 \--
2.34.1
Signature · 3 lines
Best regards, José Quaresma
Re: [PATCH 05/12] gstreamer1.0-plugins-ugly: 1.18.5 -> 1.19.90
Hi Jose,
On 2022-02-02 18:58, Jose Quaresma wrote:
[...]
Quoted 21 lines
@@ -13,7 +13,7 @@ LICENSE_FLAGS = "commercial"
SRC_URI = " \
https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz
<https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$%7BPV%7D.tar.xz>
\
"
-SRC_URI[sha256sum] =
"df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9"
+SRC_URI[sha256sum] =
"5242a42c3fad209030bd2e8630b08ae93821384c2278965764a039d31ab2a246"
S = "${WORKDIR}/gst-plugins-ugly-${PV}"
@@ -23,7 +23,7 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0"
PACKAGECONFIG ??= " \
${GSTREAMER_ORC} \
- a52dec mpeg2dec \
+ a52dec mpeg2dec gpl \Quoted 2 lines
This will require commercial licence support
https://docs.yoctoproject.org/dev-manual/common-tasks.html?highlight=license_flags#enabling-commercially-licensed-recipes <https://docs.yoctoproject.org/dev-manual/common-tasks.html?highlight=license_flags#enabling-commercially-licensed-recipes>
Yes. I am not sure if I understand your point. The LICENSE_FLAGS = "commercial" is already set in the recipe, see first line of this diff.
regards,
Claudius
PATCH 6/12 gstreamer1.0-libav: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
...st-libav-fix-build-with-ffmpeg-5.0.0.patch | 346 ------------------
....18.5.bb => gstreamer1.0-libav_1.19.90.bb} | 5 +-
2 files changed, 2 insertions(+), 349 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.19.90.bb} (78%)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.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb +2 -3
@@ -7,14 +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" +SRC_URI[sha256sum] = "8d8a3b999eb7f219e5159494a151417ed00dbb5e5122e9cbfe782bb9eb9f75ff" S = "${WORKDIR}/gst-libav-${PV}"
Signature · 1 line
2.34.1
PATCH 7/12 gstreamer1.0-python: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
...eamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.19.90.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.19.90.bb} (91%)meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb +1 -1
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52" +SRC_URI[sha256sum] = "5945f2295318e76e9102a77efabccb440e820c5de83a094e2dc5ad0e92d2d78d" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
Signature · 1 line
2.34.1
PATCH 8/12 gstreamer1.0-omx: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
.../{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.19.90.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.19.90.bb} (95%)meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb +1 -1
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42" +SRC_URI[sha256sum] = "1699520169e5fb61e4583dfbc18c0674485592ca5bba1da34fd25bb8bed0a0c7" S = "${WORKDIR}/gst-omx-${PV}"
Signature · 1 line
2.34.1
PATCH 9/12 gstreamer1.0-vaapi: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
...treamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.19.90.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.19.90.bb} (95%)meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb +1 -1
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b" +SRC_URI[sha256sum] = "437f614d6fc8904f97feb6a297e42f09d9cd9c6c05f1ebc96a95f1c1b89f2f69" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
Signature · 1 line
2.34.1
PATCH 10/12 gstreamer1.0-rtsp-server: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
...p-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.19.90.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.19.90.bb} (82%)meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb +2 -2
@@ -2,7 +2,7 @@ SUMMARY = "A library on top of GStreamer for building an RTSP server" HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/" SECTION = "multimedia" LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" +LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f" +SRC_URI[sha256sum] = "eb610cad65101c1df68ec8771a60ff3a3ba0d00a7f81b4b0048d7f49dd02d06c" S = "${WORKDIR}/${PNREAL}-${PV}"
Signature · 1 line
2.34.1
PATCH 11/12 gst-examples: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
.../gst-examples/0001-Make-player-examples-installable.patch | 2 +-
.../{gst-examples_1.18.5.bb => gst-examples_1.19.90.bb} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.19.90.bb} (100%)meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch +1 -1
@@ -32,6 +32,6 @@ index f7a7419..6281130 100644 gtk_play_resources, 'gtk-video-renderer.h', 'gtk-video-renderer.c'], -+ install: true, ++ install: true, dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep]) endif
meta/recipes-multimedia/gstreamer/gst-examples_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb +0 -0
Signature · 1 line
2.34.1
PATCH 12/12 gst-devtools: 1.18.5 -> 1.19.90
In reply to Claudius Heine---
.../{gst-devtools_1.18.5.bb => gst-devtools_1.19.90.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.19.90.bb} (94%)meta/recipes-multimedia/gstreamer/gst-devtools_1.19.90.bb renamed from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb +1 -1
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079" +SRC_URI[sha256sum] = "a51061e4a799a24dcc6ccea5350ab1366fcae53331f8067bd6f52d50c6d822f3" 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