diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 32da2ea50..5e12548e9 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -518,14 +518,14 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" # GStreamer forked recipes -PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx" +PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx" # GStreamer copied recipes PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-autovideoconvert-add-imxvideoconvert_g2d.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-autovideoconvert-add-imxvideoconvert_g2d.patch deleted file mode 100644 index d4fd8cf3c..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-autovideoconvert-add-imxvideoconvert_g2d.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 784881b9bffaa768c3a1e9cb3d8eead7b4ca356a Mon Sep 17 00:00:00 2001 -From: Hiago De Franco -Date: Thu, 12 Sep 2024 18:44:14 +0200 -Subject: [PATCH] autovideoconvert: add imxvideoconvert_g2d - -On i.MX8 platform, autovideoconvert defaults to CPU-based processing as -imxvideoconvert_g2d is not included as a listed filter, resulting in -poor video playback performance. - -Add imxvideoconvert_g2d to improve performance by utilizing hardware -acceleration. - -Upstream-Status: Submitted [https://github.com/nxp-imx/gst-plugins-bad/pull/2] -Signed-off-by: Hiago De Franco ---- - gst/autoconvert/gstautovideoconvert.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/gst/autoconvert/gstautovideoconvert.c b/gst/autoconvert/gstautovideoconvert.c -index cf5468316cd5..b91bd1556c37 100644 ---- a/gst/autoconvert/gstautovideoconvert.c -+++ b/gst/autoconvert/gstautovideoconvert.c -@@ -85,6 +85,13 @@ gst_auto_video_convert_init (GstAutoVideoConvert * autovideoconvert) - .filters = { NULL }, - .rank = GST_RANK_SECONDARY, - }, -+ { -+ .first_elements = { "capsfilter caps=\"video/x-raw\"", NULL, }, -+ .colorspace_converters = { "imxvideoconvert_g2d", NULL }, -+ .last_elements = { NULL, }, -+ .filters = { NULL }, -+ .rank = GST_RANK_PRIMARY + 1, -+ }, - { - .first_elements = { "capsfilter caps=\"video/x-raw\"", NULL, }, - .colorspace_converters = { "videoconvertscale", NULL }, --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb similarity index 95% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb index f6d094f55..4b7078753 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb @@ -178,9 +178,7 @@ FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" DEFAULT_PREFERENCE = "-1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS:append:imxgpu2d = " virtual/libg2d" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770" SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ @@ -188,10 +186,9 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " -SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch" GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" -SRCBRANCH = "MM_04.09.01_2408_L6.6.y" -SRCREV = "7011fdfa6d60fb3ee1dc8545f675cfdb519203cd" +SRCBRANCH = "MM_04.09.02_2410_L6.6.y" +SRCREV = "bba296b75dfb3e7ae4c836255edbd2b3c085c269" S = "${WORKDIR}/git" @@ -214,13 +211,6 @@ PACKAGECONFIG_G2D:imxgpu2d ??= "g2d" PACKAGECONFIG[g2d] = ",,virtual/libg2d" PACKAGECONFIG[tinycompress] = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress" -# GCC-14 otherwise errors out -CFLAGS += " \ - -Wno-error=implicit-function-declaration \ - -Wno-error=incompatible-pointer-types \ - -Wno-error=return-mismatch \ - -Wno-error=int-conversion \ -" EXTRA_OEMESON += " \ -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \ " @@ -229,8 +219,9 @@ EXTRA_OEMESON:remove = " \ -Dkate=disabled \ " -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" # it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE # TOOLCHAIN = "gcc" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" ########### End of i.MX overrides ######### diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb similarity index 97% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb index 6e7bc20eb..c15457ca8 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb @@ -118,8 +118,8 @@ SRC_URI:remove = " \ SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.09.01_2408_L6.6.y" -SRCREV = "97b1a45e945d3784790cafd2fcc4f6cb16e739d7" +SRCBRANCH = "MM_04.09.02_2410_L6.6.y" +SRCREV = "031d262e65333e58b2ce01aaf47ab1012f93b21e" S = "${WORKDIR}/git" @@ -135,8 +135,6 @@ PACKAGECONFIG_G2D:imxgpu2d ??= "g2d" PACKAGECONFIG[g2d] = ",,virtual/libg2d" PACKAGECONFIG[viv-fb] = ",,virtual/libgles2" -# GCC-14 otherwise errors out -CFLAGS += "-Wno-error=incompatible-pointer-types" EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}"" # links with imx-gpu libs which are pre-built for glibc diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend similarity index 88% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend index a834192eb..528d7e1a3 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend @@ -13,5 +13,5 @@ PACKAGECONFIG_GL:use-mainline-bsp = \ # does not depend on the viv-fb feature. It used to, but that was actually a bug # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".) -PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb " -PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb " +PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb" +PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb similarity index 90% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb index 67dc139fa..5dd717437 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb @@ -94,11 +94,11 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" DEFAULT_PREFERENCE = "-1" LIC_FILES_CHKSUM = " \ - file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \ " # Enable pulsesink in gstreamer -PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" +PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', ' pulseaudio', '', d)}" # fb implementation of v4l2 uses libdrm DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" @@ -111,20 +111,9 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.09.01_2408_L6.6.y" -SRCREV = "d8727edd56536a5c39de7905f073fce61896c0af" - -# set 32bit compile timer for 32-bit platform -GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = "" -GLIBC_64BIT_TIME_FLAGS:mx7-nxp-bsp = "" -INSANE_SKIP:mx6-nxp-bsp:append = " 32bit-time" -INSANE_SKIP:mx7-nxp-bsp:append = " 32bit-time" - -# GCC-14 otherwise errors out -CFLAGS += " \ - -Wno-error=implicit-function-declaration \ - -Wno-error=incompatible-pointer-types \ -" +SRCBRANCH = "MM_04.09.02_2410_L6.6.y" +SRCREV = "33b2732b873758a302064818b35dcad41b5bbc14" + S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch deleted file mode 100644 index 1b9278db0..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sun, 11 Apr 2021 19:48:13 +0100 -Subject: [PATCH] tests: respect the idententaion used in meson - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] - -Signed-off-by: Jose Quaresma - ---- - tests/check/meson.build | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/check/meson.build b/tests/check/meson.build -index 9787b0a..16caac7 100644 ---- a/tests/check/meson.build -+++ b/tests/check/meson.build -@@ -145,11 +145,11 @@ foreach t : core_tests - - if not skip_test - exe = executable(test_name, fname, -- c_args : gst_c_args + test_defines, -- cpp_args : gst_c_args + test_defines, -- include_directories : [configinc], -- link_with : link_with_libs, -- dependencies : gst_deps + test_deps, -+ c_args : gst_c_args + test_defines, -+ cpp_args : gst_c_args + test_defines, -+ include_directories : [configinc], -+ link_with : link_with_libs, -+ dependencies : gst_deps + test_deps, - ) - - env = environment() diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch deleted file mode 100644 index 456f07626..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 330e15374bb30ac29ee72c4b3de79c17b1157112 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sun, 11 Apr 2021 19:48:13 +0100 -Subject: [PATCH] tests: add support for install the tests - -This will provide to run the tests using the gnome-desktop-testing [1] - -[1] https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] - -Signed-off-by: Jose Quaresma - ---- - meson.build | 4 ++++ - meson_options.txt | 1 + - tests/check/meson.build | 21 ++++++++++++++++++++- - tests/check/template.test.in | 3 +++ - 4 files changed, 28 insertions(+), 1 deletion(-) - create mode 100644 tests/check/template.test.in - -diff --git a/meson.build b/meson.build -index 540d6d290e10..0267f22a79ea 100644 ---- a/meson.build -+++ b/meson.build -@@ -624,6 +624,10 @@ if bashcomp_dep.found() - endif - endif - -+installed_tests_enabled = get_option('installed_tests') -+installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name()) -+installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name()) -+ - plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') - - pkgconfig = import('pkgconfig') -diff --git a/meson_options.txt b/meson_options.txt -index 340fb5801d02..5b87f68e8d7f 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso - option('memory-alignment', type: 'combo', - choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], - value: 'malloc') -+option('installed_tests', type : 'boolean', value : false, description : 'Enable installed tests') - - # Feature options - option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') -diff --git a/tests/check/meson.build b/tests/check/meson.build -index e9501feb2af5..fd5a99611e3d 100644 ---- a/tests/check/meson.build -+++ b/tests/check/meson.build -@@ -125,10 +125,16 @@ test_defines = [ - '-UG_DISABLE_ASSERT', - '-UG_DISABLE_CAST_CHECKS', - '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', -- '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"', - '-DGST_DISABLE_DEPRECATED', - ] - -+testfile = meson.current_source_dir() + '/meson.build' -+if installed_tests_enabled -+ install_data(testfile, install_dir : installed_tests_metadir, rename : 'testfile') -+ testfile = installed_tests_metadir + '/testfile' -+endif -+test_defines += '-DTESTFILE="@0@"'.format(testfile) -+ - # sanity checking - if get_option('check').disabled() - if get_option('tests').enabled() -@@ -151,6 +157,8 @@ foreach t : core_tests - include_directories : [configinc], - link_with : link_with_libs, - dependencies : gst_deps + test_deps, -+ install_dir: installed_tests_execdir, -+ install: installed_tests_enabled, - ) - - env = environment() -@@ -161,6 +169,17 @@ foreach t : core_tests - env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) - env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') - env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') -+ if installed_tests_enabled -+ test_conf = configuration_data() -+ test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) -+ test_conf.set('program', test_name) -+ configure_file( -+ input: 'template.test.in', -+ output: test_name + '.test', -+ install_dir: installed_tests_metadir, -+ configuration: test_conf -+ ) -+ endif - - test(test_name, exe, env: env, timeout : 3 * 60) - endif -diff --git a/tests/check/template.test.in b/tests/check/template.test.in -new file mode 100644 -index 000000000000..f701627f87a6 ---- /dev/null -+++ b/tests/check/template.test.in -@@ -0,0 +1,3 @@ -+[Test] -+Type=session -+Exec=@installed_tests_dir@/@program@ --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch deleted file mode 100644 index 83f3870c4..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1f13b802bdb1c1e414c70f770dc164c80e0dcd57 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sat, 24 Apr 2021 10:34:47 +0100 -Subject: [PATCH 3/4] tests: use a dictionaries for environment - -meson environment() can't be passed to configure_file and it is needed for installed_tests, -use a dictionary as this is simplest solution to install the environment. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] - -Signed-off-by: Jose Quaresma ---- - tests/check/meson.build | 22 ++++++++++++++-------- - 1 file changed, 14 insertions(+), 8 deletions(-) - -diff --git a/tests/check/meson.build b/tests/check/meson.build -index fd5a99611e3d..330abaaeadd5 100644 ---- a/tests/check/meson.build -+++ b/tests/check/meson.build -@@ -161,14 +161,20 @@ foreach t : core_tests - install: installed_tests_enabled, - ) - -- env = environment() -- env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root()) -- env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') -- env.set('GST_STATE_IGNORE_ELEMENTS', '') -- env.set('CK_DEFAULT_TIMEOUT', '20') -- env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) -- env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') -- env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') -+ # meson environment object can't be passed to configure_file and -+ # installed tests uses configure_file to install the environment. -+ # use a dictionary as this is the simplest solution -+ # to install the environment. -+ env = { -+ 'GST_PLUGIN_PATH_1_0': meson.project_build_root(), -+ 'GST_PLUGIN_SYSTEM_PATH_1_0': '', -+ 'GST_STATE_IGNORE_ELEMENTS': '', -+ 'CK_DEFAULT_TIMEOUT': '20', -+ 'GST_REGISTRY': '@0@/@1@.registry'.format(meson.current_build_dir(), test_name), -+ 'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner', -+ 'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer', -+ } -+ - if installed_tests_enabled - test_conf = configuration_data() - test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch deleted file mode 100644 index 0a312389e..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 616c489d4ff1e7ed878bc3760180ba994fbd1974 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sun, 2 May 2021 01:58:01 +0100 -Subject: [PATCH 4/4] tests: add helper script to run the installed_tests - -- this is a bash script that will run the installed_tests -with some of the environment variables used in the meson -testing framework. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] - -Signed-off-by: Jose Quaresma ---- - tests/check/meson.build | 17 +++++++++++++++++ - tests/check/template.sh.in | 9 +++++++++ - tests/check/template.test.in | 2 +- - 3 files changed, 27 insertions(+), 1 deletion(-) - create mode 100644 tests/check/template.sh.in - -diff --git a/tests/check/meson.build b/tests/check/meson.build -index 330abaaeadd5..5d383b14dc29 100644 ---- a/tests/check/meson.build -+++ b/tests/check/meson.build -@@ -185,6 +185,23 @@ foreach t : core_tests - install_dir: installed_tests_metadir, - configuration: test_conf - ) -+ -+ # All the tests will be deployed on the target machine and -+ # we use the home folder ~ for the registry which will then expand at runtime. -+ # Using the /tmp/gstreamer-1.0/@0@.registry can be problematic as it mostly -+ # is mounted using tmpfs and if the machine crash from some reason we can lost the registry -+ # that is useful for debug propose of the tests itself. -+ env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@.registry'.format(test_name)} -+ -+ # Set the full path for the test it self. -+ env += {'TEST': '@0@/@1@'.format(join_paths(prefix, installed_tests_execdir), test_name)} -+ -+ configure_file( -+ input : 'template.sh.in', -+ output: test_name + '.sh', -+ install_dir: installed_tests_execdir, -+ configuration : env, -+ ) - endif - - test(test_name, exe, env: env, timeout : 3 * 60) -diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in -new file mode 100644 -index 000000000000..cf7d31b0ea5f ---- /dev/null -+++ b/tests/check/template.sh.in -@@ -0,0 +1,9 @@ -+#!/bin/sh -+ -+set -ax -+ -+CK_DEFAULT_TIMEOUT="@CK_DEFAULT_TIMEOUT@" -+GST_PLUGIN_LOADING_WHITELIST="@GST_PLUGIN_LOADING_WHITELIST@" -+GST_REGISTRY=@GST_REGISTRY@ -+GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" -+exec @TEST@ -diff --git a/tests/check/template.test.in b/tests/check/template.test.in -index f701627f87a6..b74ef6ad732a 100644 ---- a/tests/check/template.test.in -+++ b/tests/check/template.test.in -@@ -1,3 +1,3 @@ - [Test] - Type=session --Exec=@installed_tests_dir@/@program@ -+Exec=@installed_tests_dir@/@program@.sh --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb similarity index 87% rename from recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb index 43cb6a4a2..51a12f308 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb @@ -26,8 +26,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://run-ptest \ 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://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ + file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ " SRC_URI[sha256sum] = "4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61" @@ -92,14 +92,21 @@ LIC_FILES_CHKSUM = " \ " # Use i.MX fork of GST for customizations -SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" +SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ + 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;striplevel=3 \ + file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ +" SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" -SRCBRANCH = "MM_04.09.01_2408_L6.6.y" -SRCREV = "eb286c0766a4fbbae70c8e9dda074f5a90e52e42" +SRCBRANCH = "MM_04.09.02_2410_L6.6.y" +SRCREV = "1a8f23da16cd224574ab2386803149c76f2cb628" S = "${WORKDIR}/git" +PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled" + COMPATIBLE_MACHINE = "(imx-nxp-bsp)" ########### End of i.MX overrides ######### diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index e58980771..9ab20404a 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb @@ -34,11 +34,11 @@ RREPLACES:${PN} = "gst1.0-fsl-plugin" RPROVIDES:${PN} = "gst1.0-fsl-plugin" RCONFLICTS:${PN} = "gst1.0-fsl-plugin" -PV = "4.9.1+git${SRCPV}" +PV = "4.9.2+git${SRCPV}" SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "MM_04.09.01_2408_L6.6.y" -SRCREV = "87135d5f084b6c61efa6671cddc3a5509ab11640" +SRCBRANCH = "MM_04.09.02_2410_L6.6.y" +SRCREV = "ef9c1a080e739e6f0be878148d9f4a050dc83bec" S = "${WORKDIR}/git" @@ -54,15 +54,6 @@ PLATFORM:mx7ulp-nxp-bsp= "MX7ULP" PLATFORM:mx8-nxp-bsp = "MX8" PLATFORM:mx9-nxp-bsp = "MX9" -CFLAGS:append:toolchain-clang = " -Wno-implicit-int -Wno-int-conversion -Wno-incompatible-function-pointer-types" -# GCC-14 otherwise errors out -CFLAGS += " \ - -Wno-error=int-conversion \ - -Wno-error=incompatible-pointer-types \ - -Wno-error=return-mismatch \ - -Wno-error=implicit-function-declaration \ -" - # Todo add a mechanism to map possible build targets EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \