Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <Mike.Engel@digi.com>
This commit is contained in:
Mike Engel 2020-07-01 19:43:10 +02:00
parent 26623ba00d
commit 9641733039
7 changed files with 17 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
View File

@ -3,14 +3,14 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb
DEPENDS += "jpeg libdrm" DEPENDS += "jpeg libdrm"
DEPENDS_append_imxgpu2d = " virtual/libg2d" 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/${PN}:"
FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" 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" 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" SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
SRCREV = "eea4cfe9315a9c648d116cfff3cd532e9a31237d" SRCREV = "2fdaef1839ebfef7ea3bc8c1c59463a9ef0ae19a"
SRC_URI = " \ SRC_URI = " \
${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \ ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \
file://configure-allow-to-disable-libssh2.patch \ file://configure-allow-to-disable-libssh2.patch \

6
meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
View File

@ -1,14 +1,14 @@
require recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb 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/files:"
FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/${PN}:" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/${PN}:"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" 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" SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
SRCREV = "5221bd72a116341738ab060b195b38a2cbed1c58" SRCREV = "cad00a3c4318c787c9661990e8f9328e4a69a329"
SRC_URI = " \ SRC_URI = " \
${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \

43
meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch
View File

@ -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 <linux/types.h>
#endif /* __TYPES_COMPAT_H__ */

7
meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
View File

@ -1,18 +1,17 @@
require recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb 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/${PN}:"
FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" 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" 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"
SRCREV = "3bcc85705695ee629ac3fb687411bb196d231918" SRCREV = "fc6d8ccf3bd775517fafb1ce1d9224312d2812d8"
SRC_URI = " \ SRC_URI = " \
${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
file://headerfix.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

6
meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
View File

@ -1,13 +1,13 @@
require recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb 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:" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:"
# Use i.MX fork of GST for customizations # Use i.MX fork of GST for customizations
GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https"
SRCBRANCH = "MM_04.05.04_2002_L5.4.3" SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259" SRCREV = "beca1b382febc2ba38a21fcb8f5092209773eb7f"
SRC_URI = " \ SRC_URI = " \
${GST1.0_SRC};branch=${SRCBRANCH} \ ${GST1.0_SRC};branch=${SRCBRANCH} \
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \

4
meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb → meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.5.bb
View File

@ -21,12 +21,12 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
IMXGST_SRC ?= "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https" 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} \ SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH} \
file://0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch \ file://0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch \
" "
SRCREV = "77760c4e4177f2afd80d7d09f3d1fb137b96adfa" SRCREV = "4d2e5c1547c5f8a5e4e26a034ab87c809b34fb54"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

6
meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb
View File

@ -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" 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 = " \ SRC_URI = " \
${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \
file://0001-configure.ac-Add-prefix-to-correct-the-QT_PATH.patch \ 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" S = "${WORKDIR}/git"