From 964173303972313f3e6700abf2d4d16bf89afab2 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Wed, 1 Jul 2020 19:43:10 +0200 Subject: [PATCH] recipes-multimedia: gstreamer: Update for the new NXP BSP release imx-5.4.24-2.1.0. Upgrade GST version from 1.16.0 to 1.16.1 The headerfix.patch in gst-plugins-good needes to be removed as these changes are already included in 1.16.1 Signed-off-by: Mike Engel --- .../gstreamer1.0-plugins-bad_1.16.imx.bb | 6 +-- .../gstreamer1.0-plugins-base_1.16.imx.bb | 6 +-- .../gstreamer1.0-plugins-good/headerfix.patch | 43 ------------------- .../gstreamer1.0-plugins-good_1.16.imx.bb | 7 ++- .../gstreamer/gstreamer1.0_1.16.imx.bb | 6 +-- ...in_4.5.4.bb => imx-gst1.0-plugin_4.5.5.bb} | 4 +- .../gstreamer1.0-plugins-good-qt_1.16.imx.bb | 6 +-- 7 files changed, 17 insertions(+), 61 deletions(-) delete mode 100644 meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch rename meta-digi-dey/recipes-multimedia/gstreamer/{imx-gst1.0-plugin_4.5.4.bb => imx-gst1.0-plugin_4.5.5.bb} (97%) diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb index 0883c8543..ab32983b8 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb @@ -3,14 +3,14 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb DEPENDS += "jpeg libdrm" DEPENDS_append_imxgpu2d = " virtual/libg2d" -PV = "1.16.0.imx" +PV = "1.16.1.imx" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/${PN}:" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" -SRCBRANCH = "MM_04.05.04_2002_L5.4.3" -SRCREV = "eea4cfe9315a9c648d116cfff3cd532e9a31237d" +SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCREV = "2fdaef1839ebfef7ea3bc8c1c59463a9ef0ae19a" SRC_URI = " \ ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \ file://configure-allow-to-disable-libssh2.patch \ diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb index f88b7e5b0..a3787d465 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb @@ -1,14 +1,14 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb -PV = "1.16.0.imx" +PV = "1.16.1.imx" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.05.04_2002_L5.4.3" -SRCREV = "5221bd72a116341738ab060b195b38a2cbed1c58" +SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCREV = "cad00a3c4318c787c9661990e8f9328e4a69a329" SRC_URI = " \ ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch deleted file mode 100644 index 34d25a0a4..000000000 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -Things break with overlapping defines between glib and gstreamer with glibc 2.30. - -Discussion in the link below, basically internal __ prefixed variables -shouldn't be redefined. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/635] -RP 2019/8/6 - -Index: gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h -=================================================================== ---- gst-plugins-good-1.16.0.orig/sys/v4l2/ext/types-compat.h -+++ gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h -@@ -24,29 +24,6 @@ - #ifndef __TYPES_COMPAT_H__ - #define __TYPES_COMPAT_H__ - --/* From linux/types.h */ --#ifndef __bitwise__ --# ifdef __CHECKER__ --# define __bitwise__ __attribute__((bitwise)) --# else --# define __bitwise__ --# endif --#endif -- --#ifndef __bitwise --# ifdef __CHECK_ENDIAN__ --# define __bitwise __bitwise__ --# else --# define __bitwise --# endif --#endif -- --#define __u64 guint64 --#define __u32 guint32 --#define __u16 guint16 --#define __u8 guint8 --#define __s64 gint64 --#define __s32 gint32 --#define __le32 guint32 __bitwise -+#include - - #endif /* __TYPES_COMPAT_H__ */ diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb index ca4ff3323..3f346d6a4 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb @@ -1,18 +1,17 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb -PV = "1.16.0.imx" +PV = "1.16.1.imx" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/${PN}:" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.05.04_2002_L5.4.3" -SRCREV = "3bcc85705695ee629ac3fb687411bb196d231918" +SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCREV = "fc6d8ccf3bd775517fafb1ce1d9224312d2812d8" SRC_URI = " \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://headerfix.patch \ " S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb index 99595498f..f3b4c1c1f 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb @@ -1,13 +1,13 @@ require recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb -PV = "1.16.0.imx" +PV = "1.16.1.imx" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" # Use i.MX fork of GST for customizations GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" -SRCBRANCH = "MM_04.05.04_2002_L5.4.3" -SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259" +SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCREV = "beca1b382febc2ba38a21fcb8f5092209773eb7f" SRC_URI = " \ ${GST1.0_SRC};branch=${SRCBRANCH} \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.5.bb similarity index 97% rename from meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb rename to meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.5.bb index 6b56c4d06..e8ccccb39 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.5.bb @@ -21,12 +21,12 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" IMXGST_SRC ?= "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https" -SRCBRANCH = "MM_04.05.04_2002_L5.4.3" +SRCBRANCH = "MM_04.05.05_2005_L5.4.24" SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH} \ file://0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch \ " -SRCREV = "77760c4e4177f2afd80d7d09f3d1fb137b96adfa" +SRCREV = "4d2e5c1547c5f8a5e4e26a034ab87c809b34fb54" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb index 12573ba39..5e0460d9a 100644 --- a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb +++ b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb @@ -7,15 +7,15 @@ DEPENDS += "gstreamer1.0-plugins-base virtual/kernel libcap zlib bzip2 \ " GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.05.04_2002_L5.4.3" +SRCBRANCH = "MM_04.05.05_2005_L5.4.24" SRC_URI = " \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ file://0001-configure.ac-Add-prefix-to-correct-the-QT_PATH.patch \ " -SRCREV = "3bcc85705695ee629ac3fb687411bb196d231918" +SRCREV = "fc6d8ccf3bd775517fafb1ce1d9224312d2812d8" -PV = "1.16.0.imx" +PV = "1.16.1.imx" S = "${WORKDIR}/git"