diff options
| author | Zelan Zou <zelan.zou@nxp.com> | 2025-08-14 11:09:31 +0800 |
|---|---|---|
| committer | Zelan Zou <zelan.zou@nxp.com> | 2025-08-14 14:14:13 +0800 |
| commit | 9d27357cac4219be26305a5fc59896d6382d7a37 (patch) | |
| tree | e8d59eafd787d0024132cd6e4a172294e86348ed | |
| parent | 11f943d062e100cfcd9db988f426d72320086a8e (diff) | |
| download | meta-freescale-9d27357cac4219be26305a5fc59896d6382d7a37.tar.gz | |
gstreamer: Upgrade to 1.26.0
Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
| -rw-r--r-- | conf/machine/include/imx-base.inc | 34 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch | 2 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb) | 11 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch | 49 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb) | 2 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb) | 4 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb) | 4 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend) | 0 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb) | 4 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb) | 3 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend | 1 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch | 47 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb) | 9 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb) | 2 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb) | 4 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb) | 6 |
16 files changed, 40 insertions, 142 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 15d7b2e8d..5966da36c 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -527,30 +527,20 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" | |||
| 527 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" | 527 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" |
| 528 | 528 | ||
| 529 | # GStreamer forked recipes | 529 | # GStreamer forked recipes |
| 530 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx" | 530 | PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp ??= "1.26.0.imx" |
| 531 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx" | 531 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp ??= "1.26.0.imx" |
| 532 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx" | 532 | PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.0.imx" |
| 533 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx" | 533 | PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.0.imx" |
| 534 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx" | 534 | |
| 535 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx" | ||
| 536 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx" | ||
| 537 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx" | ||
| 538 | 535 | ||
| 539 | # GStreamer copied recipes | 536 | # GStreamer copied recipes |
| 540 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" | 537 | PREFERRED_VERSION_gst-devtools:imx-nxp-bsp ??= "1.26.0.imx" |
| 541 | PREFERRED_VERSION_gst-examples:mx8-nxp-bsp ??= "1.24.7.imx" | 538 | PREFERRED_VERSION_gst-examples:imx-nxp-bsp ??= "1.24.7.imx" |
| 542 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx" | 539 | PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp ??= "1.26.0.imx" |
| 543 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" | 540 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.0.imx" |
| 544 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" | 541 | PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp ??= "1.26.0.imx" |
| 545 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" | 542 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp ??= "1.26.0.imx" |
| 546 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" | 543 | PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp ??= "1.26.0.imx" |
| 547 | PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" | ||
| 548 | PREFERRED_VERSION_gst-examples:mx9-nxp-bsp ??= "1.24.7.imx" | ||
| 549 | PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx" | ||
| 550 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx" | ||
| 551 | PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx" | ||
| 552 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx" | ||
| 553 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx" | ||
| 554 | 544 | ||
| 555 | # GStreamer downgrade ffmpeg | 545 | # GStreamer downgrade ffmpeg |
| 556 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" | 546 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" |
diff --git a/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch index c0e458135..b596f2ef9 100644 --- a/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +++ b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 73b1002eda17451db1f58431b42c25203f1d3097 Mon Sep 17 00:00:00 2001 | 1 | From 67809420230cd4fcc63069f78efdc90c7b4c4ee1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 9 Sep 2018 17:38:10 -0700 | 3 | Date: Sun, 9 Sep 2018 17:38:10 -0700 |
| 4 | Subject: [PATCH] connect has a different signature on musl | 4 | Subject: [PATCH] connect has a different signature on musl |
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb index 9f7f890d5..9a619f5a0 100644 --- a/recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb | |||
| @@ -6,13 +6,13 @@ SECTION = "multimedia" | |||
| 6 | LICENSE = "LGPL-2.1-or-later" | 6 | LICENSE = "LGPL-2.1-or-later" |
| 7 | LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | 7 | LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" |
| 8 | 8 | ||
| 9 | S = "${WORKDIR}/gst-devtools-1.22.5" | 9 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${@get_gst_ver("${PV}")}.tar.xz \ |
| 10 | |||
| 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.5.tar.xz \ | ||
| 12 | file://0001-connect-has-a-different-signature-on-musl.patch \ | 10 | file://0001-connect-has-a-different-signature-on-musl.patch \ |
| 13 | " | 11 | " |
| 14 | 12 | ||
| 15 | SRC_URI[sha256sum] = "2add1519aa6eeb01d544cb94293688ee3bc2079f6bca6075bf5c23d00a0921be" | 13 | S = "${UNPACKDIR}/gst-devtools-${@get_gst_ver("${PV}")}" |
| 14 | |||
| 15 | SRC_URI[sha256sum] = "eff33d7dc292bb074a2788ea887b6283398ffdefafa49fb7d08efe6658a65648" | ||
| 16 | 16 | ||
| 17 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" | 17 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" |
| 18 | RRECOMMENDS:${PN} = "git" | 18 | RRECOMMENDS:${PN} = "git" |
| @@ -40,6 +40,9 @@ EXTRA_OEMESON += " \ | |||
| 40 | -Dvalidate=enabled \ | 40 | -Dvalidate=enabled \ |
| 41 | ${@gettext_oemeson(d)} \ | 41 | ${@gettext_oemeson(d)} \ |
| 42 | " | 42 | " |
| 43 | # Drop .imx from PV | ||
| 44 | def get_gst_ver(v): | ||
| 45 | return oe.utils.trim_version(v, 3) | ||
| 43 | 46 | ||
| 44 | do_install:append () { | 47 | do_install:append () { |
| 45 | for fn in ${bindir}/gst-validate-launcher \ | 48 | for fn in ${bindir}/gst-validate-launcher \ |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch deleted file mode 100644 index 0a06540fb..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "U. Artie Eoff" <ullysses.a.eoff@intel.com> | ||
| 3 | Date: Mon, 13 Feb 2023 17:02:01 -0500 | ||
| 4 | Subject: [PATCH] avviddec: change | ||
| 5 | AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS | ||
| 6 | |||
| 7 | This fixes a compile error with recent upstream FFmpeg. | ||
| 8 | |||
| 9 | The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to | ||
| 10 | AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit | ||
| 11 | 7d09579190de (lavc 58.132.100). | ||
| 12 | |||
| 13 | The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream | ||
| 14 | commit 10c9a0874cb3 (lavc 59.63.100). | ||
| 15 | |||
| 16 | Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3964> | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cde31d23c071ee93fae96331805f696856084254?merge_request_iid=3964] | ||
| 19 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 20 | --- | ||
| 21 | ext/libav/gstavviddec.c | 6 +++++- | ||
| 22 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 23 | |||
| 24 | diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c | ||
| 25 | index 43cea456ae8..6d7c4cd0de8 100644 | ||
| 26 | --- a/ext/libav/gstavviddec.c | ||
| 27 | +++ b/ext/libav/gstavviddec.c | ||
| 28 | @@ -35,6 +35,10 @@ | ||
| 29 | |||
| 30 | GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); | ||
| 31 | |||
| 32 | +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100) | ||
| 33 | +#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS | ||
| 34 | +#endif | ||
| 35 | + | ||
| 36 | #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15) | ||
| 37 | |||
| 38 | #define MAX_TS_MASK 0xff | ||
| 39 | @@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, | ||
| 40 | if (ffmpegdec->max_threads == 0) { | ||
| 41 | /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal | ||
| 42 | * to one frame per thread. We thus need to calculate the thread count ourselves */ | ||
| 43 | - if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) || | ||
| 44 | + if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) || | ||
| 45 | (ffmpegdec->context->thread_type & FF_THREAD_FRAME)) | ||
| 46 | ffmpegdec->context->thread_count = | ||
| 47 | MIN (gst_ffmpeg_auto_max_threads (), 16); | ||
| 48 | -- | ||
| 49 | GitLab | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb index bf61d4192..138398d85 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ | |||
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz" | 14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz" |
| 15 | SRC_URI[sha256sum] = "c3e4179ba183c2d3101edf87ff70dd07e728c766a5fee34e6ecded76ca5802df" | 15 | SRC_URI[sha256sum] = "707a8b687ff5fddcee5b02415e2ec9b71b4ac44d0b7aec3b477364ceecbf1ecf" |
| 16 | 16 | ||
| 17 | S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}" | 17 | S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}" |
| 18 | 18 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb index 7aa22436c..1c4ee72d0 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb | |||
| @@ -187,8 +187,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug | |||
| 187 | " | 187 | " |
| 188 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " | 188 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " |
| 189 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" | 189 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" |
| 190 | SRCBRANCH = "MM_04.09.03_2412_L6.12.y" | 190 | SRCBRANCH = "MM_04.10.0_2505_L6.12.20" |
| 191 | SRCREV = "7bb1254fcb0a0dcb1ecb4ac21efbc5068151943d" | 191 | SRCREV = "4320364e6be53cae81ac2bca3ce0e09cf8707590" |
| 192 | 192 | ||
| 193 | S = "${UNPACKDIR}/${BP}" | 193 | S = "${UNPACKDIR}/${BP}" |
| 194 | 194 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb index ed6e02435..5c2492638 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb | |||
| @@ -118,8 +118,8 @@ SRC_URI:remove = " \ | |||
| 118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " | 118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " |
| 119 | 119 | ||
| 120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" | 120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" |
| 121 | SRCBRANCH = "MM_04.09.03_2412_L6.12.y" | 121 | SRCBRANCH = "MM_04.10.0_2505_L6.12.20" |
| 122 | SRCREV = "858ae5a1fb2bd2692ca7ebbd5bde2eee14e1842d" | 122 | SRCREV = "bbe6aa6f5b666fda0b172c3e1f417c7eadb16549" |
| 123 | 123 | ||
| 124 | S = "${UNPACKDIR}/${BP}" | 124 | S = "${UNPACKDIR}/${BP}" |
| 125 | 125 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend index 528d7e1a3..528d7e1a3 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb index 28044ccd1..7c921d97c 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb | |||
| @@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu | |||
| 111 | 111 | ||
| 112 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " | 112 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " |
| 113 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" | 113 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" |
| 114 | SRCBRANCH = "MM_04.09.03_2412_L6.12.y" | 114 | SRCBRANCH = "MM_04.10.0_2505_L6.12.20" |
| 115 | SRCREV = "626a972e9ef448f1017cfad07a3486a0fb340a0d" | 115 | SRCREV = "6a0df1aee0ef2477dbacedd79df08c5bcb648e55" |
| 116 | 116 | ||
| 117 | S = "${UNPACKDIR}/${BP}" | 117 | S = "${UNPACKDIR}/${BP}" |
| 118 | 118 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb index 23b8c72cb..1f5956ab4 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb | |||
| @@ -14,7 +14,7 @@ LICENSE_FLAGS = "commercial" | |||
| 14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
| 15 | https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \ | 15 | https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \ |
| 16 | " | 16 | " |
| 17 | SRC_URI[sha256sum] = "c5d1cbdf71ab0c675bca236f70edfa1feb3f813fd4bfff563308f466d8805ca5" | 17 | SRC_URI[sha256sum] = "a86b51c8454a813120848c803421f327d8c07aabcae461e0597cc49398c0fcde" |
| 18 | 18 | ||
| 19 | S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}" | 19 | S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}" |
| 20 | 20 | ||
| @@ -43,6 +43,7 @@ EXTRA_OEMESON += " \ | |||
| 43 | def get_gst_ver(v): | 43 | def get_gst_ver(v): |
| 44 | return oe.utils.trim_version(v, 3) | 44 | return oe.utils.trim_version(v, 3) |
| 45 | 45 | ||
| 46 | FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" | ||
| 46 | FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" | 47 | FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" |
| 47 | 48 | ||
| 48 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 49 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend new file mode 100644 index 000000000..ea144b396 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend | |||
| @@ -0,0 +1 @@ | |||
| PACKAGECONFIG:remove = "a52dec mpeg2dec" | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch deleted file mode 100644 index fd6b1c16e..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | From 8d7e2eaed10e2928358805f613223a6a149790d6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hiago De Franco <hiago.franco@toradex.com> | ||
| 3 | Date: Wed, 31 Jul 2024 11:51:06 -0300 | ||
| 4 | Subject: [PATCH] meson.build: Fix missing python_opt | ||
| 5 | |||
| 6 | 'python_opt' was not declared earlier, giving the following build error: | ||
| 7 | |||
| 8 | | Message: python_abi_flags = | ||
| 9 | | | ||
| 10 | | ../gst-python-1.24.0/meson.build:84:16: ERROR: Unknown variable "python_opt". | ||
| 11 | |||
| 12 | Remove it and keep the error message. | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [oe specific] | ||
| 15 | |||
| 16 | The patch already exists upstream, but this is related to another fix [1] | ||
| 17 | not suitable for OE. Moreover, the backport does not apply since | ||
| 18 | the patch was added to the gstreamer monorepo. | ||
| 19 | |||
| 20 | [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6734? | ||
| 21 | |||
| 22 | Signed-off-by: Hiago De Franco <hiago.franco@toradex.com> | ||
| 23 | --- | ||
| 24 | meson.build | 7 +------ | ||
| 25 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
| 26 | |||
| 27 | diff --git a/meson.build b/meson.build | ||
| 28 | index f240b6fd8aca..53f7a43702c7 100644 | ||
| 29 | --- a/meson.build | ||
| 30 | +++ b/meson.build | ||
| 31 | @@ -80,12 +80,7 @@ foreach loc: pylib_locs | ||
| 32 | endforeach | ||
| 33 | endforeach | ||
| 34 | if pylib_fname == '' | ||
| 35 | - error_msg = 'Could not find python library to load' | ||
| 36 | - if python_opt.enabled() | ||
| 37 | - error(error_msg) | ||
| 38 | - else | ||
| 39 | - message(error_msg) | ||
| 40 | - endif | ||
| 41 | + message('Could not find python library to load') | ||
| 42 | endif | ||
| 43 | |||
| 44 | pygi_override_dir = get_option('pygi-overrides-dir') | ||
| 45 | -- | ||
| 46 | 2.39.2 | ||
| 47 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb index cac54e88a..388ee81e6 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb | |||
| @@ -7,13 +7,12 @@ SECTION = "multimedia" | |||
| 7 | LICENSE = "LGPL-2.1-or-later" | 7 | LICENSE = "LGPL-2.1-or-later" |
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" |
| 9 | 9 | ||
| 10 | SRC_URI = "\ | 10 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz" |
| 11 | https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz \ | 11 | SRC_URI[sha256sum] = "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db" |
| 12 | file://0001-meson.build-Fix-missing-python_opt.patch \ | ||
| 13 | " | ||
| 14 | SRC_URI[sha256sum] = "041c2255c1ea9936c777dcb08a36ecaa6a24a69a12fc46ef53f1530d46c59f9d" | ||
| 15 | 12 | ||
| 16 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" | 13 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" |
| 14 | DEPENDS:append = " gstreamer1.0-plugins-bad" | ||
| 15 | |||
| 17 | RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" | 16 | RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" |
| 18 | 17 | ||
| 19 | PNREAL = "gst-python" | 18 | PNREAL = "gst-python" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb index 58255b992..b5dd9a322 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb | |||
| @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" | |||
| 10 | 10 | ||
| 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz" | 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "5b0fa6b12ba95b1d336a4b274cbe19e982aa3e6819f1d97bfd8e0102b103ed9b" | 13 | SRC_URI[sha256sum] = "e983c039496e3f75e39696554ce74db4120e2465de17aa1cc37160568e9b40bc" |
| 14 | 14 | ||
| 15 | S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}" | 15 | S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}" |
| 16 | 16 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb index 3993730ec..1d83ca031 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb | |||
| @@ -9,9 +9,9 @@ REALPN = "gstreamer-vaapi" | |||
| 9 | LICENSE = "LGPL-2.1-or-later" | 9 | LICENSE = "LGPL-2.1-or-later" |
| 10 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" | 10 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" |
| 11 | 11 | ||
| 12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-1.24.0.tar.xz" | 12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${@get_gst_ver("${PV}")}.tar.xz" |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "6b1f3b91ca65dedc67dc67a25dc1d1e464f11825a27ab9c7ac7c1bda67f03596" | 14 | SRC_URI[sha256sum] = "573931d455f5a96f63db7c8d35d51322b8d287816e8c6a77d84cfbb9fa1351f1" |
| 15 | 15 | ||
| 16 | S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${PV}')}" | 16 | S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${PV}')}" |
| 17 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | 17 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb index a5fc88444..5b315ed7f 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb | |||
| @@ -87,7 +87,7 @@ PTEST_BUILD_HOST_FILES = "" | |||
| 87 | DEFAULT_PREFERENCE = "-1" | 87 | DEFAULT_PREFERENCE = "-1" |
| 88 | 88 | ||
| 89 | LIC_FILES_CHKSUM = " \ | 89 | LIC_FILES_CHKSUM = " \ |
| 90 | file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \ | 90 | file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ |
| 91 | file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \ | 91 | file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \ |
| 92 | " | 92 | " |
| 93 | 93 | ||
| @@ -100,8 +100,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV | |||
| 100 | " | 100 | " |
| 101 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | 101 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " |
| 102 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" | 102 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" |
| 103 | SRCBRANCH = "MM_04.09.03_2412_L6.12.y" | 103 | SRCBRANCH = "MM_04.10.0_2505_L6.12.20" |
| 104 | SRCREV = "e0d37a7d773a502956f54eced8cd701ec7fa5ff5" | 104 | SRCREV = "dba94b66ed28cc6537608a68c31c8be52f6f53a5" |
| 105 | 105 | ||
| 106 | S = "${UNPACKDIR}/${BP}" | 106 | S = "${UNPACKDIR}/${BP}" |
| 107 | 107 | ||
