From 45004945822bd131bd712bef061e5ba901b429ad Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 13 May 2019 13:37:34 +0200 Subject: [PATCH] gstreamer: update recipes to v1.14.4.imx This is the version used in meta-fsl-bsp-release branch sumo-4.14.98-2.0.0_ga. https://jira.digi.com/browse/DEL-6603 Signed-off-by: Gabriel Valcazar --- ...1.14.0.bb => gstreamer1.0-libav_1.14.4.bb} | 4 +- ...01-opencv-Fix-build-for-opencv-3.4.2.patch | 70 ------------------- .../gstreamer1.0-plugins-bad_1.14.imx.bb | 8 +-- ...t-hardcode-libtool-name-when-running.patch | 28 ++------ .../gstreamer1.0-plugins-base_1.14.imx.bb | 19 ++--- .../gstreamer1.0-plugins-good_1.14.imx.bb | 6 +- ...bb => gstreamer1.0-plugins-ugly_1.14.4.bb} | 4 +- ....bb => gstreamer1.0-rtsp-server_1.14.4.bb} | 4 +- .../gstreamer/gstreamer1.0_1.14.imx.bb | 6 +- ...0-plugin-Update-KERNEL_VERSION-check.patch | 37 ++++++++++ ...in_4.4.4.bb => imx-gst1.0-plugin_4.4.5.bb} | 17 ++--- .../gstreamer1.0-plugins-good-qt_1.14.imx.bb | 6 +- 12 files changed, 78 insertions(+), 131 deletions(-) rename meta-digi-dey/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.14.0.bb => gstreamer1.0-libav_1.14.4.bb} (91%) delete mode 100644 meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-Fix-build-for-opencv-3.4.2.patch rename meta-digi-dey/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.14.0.bb => gstreamer1.0-plugins-ugly_1.14.4.bb} (85%) rename meta-digi-dey/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.14.0.bb => gstreamer1.0-rtsp-server_1.14.4.bb} (75%) create mode 100644 meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch rename meta-digi-dey/recipes-multimedia/gstreamer/{imx-gst1.0-plugin_4.4.4.bb => imx-gst1.0-plugin_4.4.5.bb} (84%) diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.4.bb similarity index 91% rename from meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb rename to meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.4.bb index ae8e8b2ed..b7f4c54d8 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.4.bb @@ -23,7 +23,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz file://0002-gst-libs-Remove-library-path-switch-from-dependency_.patch \ " -SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d" -SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89" +SRC_URI[md5sum] = "58342db11dbb201a66a62577dcf7bab5" +SRC_URI[sha256sum] = "dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-Fix-build-for-opencv-3.4.2.patch b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-Fix-build-for-opencv-3.4.2.patch deleted file mode 100644 index 2f89ef626..000000000 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-Fix-build-for-opencv-3.4.2.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c247745faaf885fd3fa094198fc0ea288e295dbf Mon Sep 17 00:00:00 2001 -From: Thibault Saunier -Date: Fri, 13 Jul 2018 14:42:28 -0400 -Subject: [PATCH] opencv: Fix build for opencv >= 3.4.2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The `CV_RGB` macro is now in `imgproc.hpp`. - -Fixes: - - ../subprojects/gst-plugins-bad/ext/opencv/gsthanddetect.cpp:497:40: error: ‘CV_RGB’ was not declared in this scope - cvCircle (img, center, radius, CV_RGB (0, 0, 200), 1, 8, 0); - ^~~~~~ - -Upstream-Status: Backport [https://github.com/GStreamer/gst-plugins-bad/commit/c247745faaf885fd3fa094198fc0ea288e295dbf] - -Signed-off-by: Tom Hochstein ---- - ext/opencv/MotionCells.cpp | 3 +++ - ext/opencv/gsthanddetect.cpp | 3 +++ - ext/opencv/gsttemplatematch.cpp | 3 +++ - 3 files changed, 9 insertions(+) - -diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp -index f85989e..175ec90 100644 ---- a/ext/opencv/MotionCells.cpp -+++ b/ext/opencv/MotionCells.cpp -@@ -51,6 +51,9 @@ - - #include - #include "MotionCells.h" -+#if (CV_MAJOR_VERSION >= 3) -+#include -+#endif - #include - - MotionCells::MotionCells () -diff --git a/ext/opencv/gsthanddetect.cpp b/ext/opencv/gsthanddetect.cpp -index 60fd5be..47203fd 100644 ---- a/ext/opencv/gsthanddetect.cpp -+++ b/ext/opencv/gsthanddetect.cpp -@@ -62,6 +62,9 @@ - - /* element header */ - #include "gsthanddetect.h" -+#if (CV_MAJOR_VERSION >= 3) -+#include -+#endif - #include - - GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug); -diff --git a/ext/opencv/gsttemplatematch.cpp b/ext/opencv/gsttemplatematch.cpp -index f39208d..ec0b56a 100644 ---- a/ext/opencv/gsttemplatematch.cpp -+++ b/ext/opencv/gsttemplatematch.cpp -@@ -63,6 +63,9 @@ - - #include "../../gst-libs/gst/gst-i18n-plugin.h" - #include "gsttemplatematch.h" -+#if (CV_MAJOR_VERSION >= 3) -+#include -+#endif - #include - - GST_DEBUG_CATEGORY_STATIC (gst_template_match_debug); --- -2.7.4 - diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb index df9e871c0..d4fccbd6b 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb @@ -24,6 +24,7 @@ PACKAGECONFIG_remove = " gles2" PACKAGECONFIG_remove_mx8mm = " vulkan" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols" +PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,vulkan-headers" # Disable introspection to fix [GstGL-1.0.gir] Error EXTRA_OECONF_append = " --disable-introspection" @@ -40,14 +41,13 @@ SRC_URI_remove = "file://0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-outpu EXTRA_OECONF_remove = "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}" GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" -SRCBRANCH = "MM_04.04.04_1811_L4.14.78_GA" +SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" SRC_URI = " \ ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \ - file://0001-opencv-Fix-build-for-opencv-3.4.2.patch \ " -SRCREV = "7e8a87fcbf5bd44b6982f6d15f2d28aa5f49a6be" +SRCREV = "0191521ba226904e4b2f84c38e5f6ae75169a18a" # This remove "--exclude=autopoint" option from autoreconf argument to avoid # configure.ac:30: error: required file './ABOUT-NLS' not found @@ -61,7 +61,7 @@ do_compile_prepend () { export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/ion/.libs" } -PV = "1.14.0.imx" +PV = "1.14.4.imx" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch index a1cc7d3dc..d23e81875 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch @@ -1,7 +1,7 @@ -From a049bb15839557594713cb32e7d6bfe0e2127392 Mon Sep 17 00:00:00 2001 +From 80c48db2d2d1d355e204c454027a8983d1b52a62 Mon Sep 17 00:00:00 2001 From: Yuqing Zhu -Date: Fri, 20 Apr 2018 22:46:46 +0800 -Subject: [PATCH] Makefile.am: don't hardcode libtool name when running +Date: Tue, 25 Dec 2018 13:56:12 +0800 +Subject: [PATCH] [PATCH] Makefile.am: don't hardcode libtool name when running introspection tools Do patch refine basing on commit: f1d9652351e7754c63003104eceb526af424c7e0 @@ -13,7 +13,6 @@ Signed-off-by: Yuqing Zhu gst-libs/gst/allocators/Makefile.am | 2 +- gst-libs/gst/app/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- - gst-libs/gst/gl/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/rtp/Makefile.am | 2 +- @@ -21,10 +20,10 @@ Signed-off-by: Yuqing Zhu gst-libs/gst/sdp/Makefile.am | 2 +- gst-libs/gst/tag/Makefile.am | 2 +- gst-libs/gst/video/Makefile.am | 2 +- - 11 files changed, 11 insertions(+), 11 deletions(-) + 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am -index 0edc0ae..d0d425d 100644 +index fa11983..caccbb1 100644 --- a/gst-libs/gst/allocators/Makefile.am +++ b/gst-libs/gst/allocators/Makefile.am @@ -58,7 +58,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ @@ -62,19 +61,6 @@ index 2922245..7fb65f2 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-audio-@GST_API_VERSION@ \ -diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am -index b04187f..576bf1c 100644 ---- a/gst-libs/gst/gl/Makefile.am -+++ b/gst-libs/gst/gl/Makefile.am -@@ -205,7 +205,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ - --include=Gst-@GST_API_VERSION@ \ - --include=GstBase-@GST_API_VERSION@ \ - --include=GstVideo-@GST_API_VERSION@ \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gstreamer-@GST_API_VERSION@ \ - --pkg gstreamer-base-@GST_API_VERSION@ \ - --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index ae51993..35a6e44 100644 --- a/gst-libs/gst/pbutils/Makefile.am @@ -154,7 +140,7 @@ index 0247c33..c86515b 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-tag-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am -index 1b74f37..0f7c07e 100644 +index 72f23cd..b65a6c5 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -126,7 +126,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE @@ -167,5 +153,5 @@ index 1b74f37..0f7c07e 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-video-@GST_API_VERSION@ \ -- -2.7.4 +1.9.1 diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb index ee07aae92..1742574c5 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb @@ -11,11 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" -DEPENDS += "virtual/kernel" DEPENDS_append_imxgpu2d = " virtual/libg2d" -do_configure[depends] += "virtual/kernel:do_shared_workdir" - # Enable pango lib PACKAGECONFIG_append = " pango " @@ -27,30 +24,26 @@ PACKAGECONFIG[gio-unix-2.0] = "" EXTRA_OECONF_append = " --disable-opengl --enable-wayland" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.04.04_1811_L4.14.78_GA" +SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" SRC_URI = " \ ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ file://make-gio_unix_2_0-dependency-configurable.patch \ " -SRCREV = "318a9477159d6b162e480faf29f56153b27fb6a7" +SRCREV = "f62f8ab685e549eefaecdb1e700239a5a408fcad" + +inherit use-imx-headers EXTRA_AUTORECONF = "" -# Find ion.h in kernel -EXTRA_OECONF = " \ - CPPFLAGS=" \ - -I${STAGING_KERNEL_DIR}/include/uapi \ - -I${STAGING_KERNEL_DIR}/include \ - " \ -" +EXTRA_OECONF = "CPPFLAGS="-I${STAGING_INCDIR_IMX}"" EXTRA_OEMAKE += "GIR_EXTRA_LIBS_PATH=${GIR_EXTRA_LIBS_PATH}:${B}/gst-libs/gst/allocators/.libs" FILES_${PN} += "${libdir}/gstreamer-1.0/include" -PV = "1.14.0.imx" +PV = "1.14.4.imx" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb index 9392e82d8..0a30ca351 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb @@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ DEPENDS += "libdrm" GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.04.04_1811_L4.14.78_GA" +SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" SRC_URI = " \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ " -SRCREV = "cec0ef39784a3acfd2b442d107f054c6ab10181e" +SRCREV = "a31aabb7581d3f491cd31889d44479bb0f34990b" EXTRA_AUTORECONF = "" PACKAGECONFIG_append = " vpx" @@ -21,7 +21,7 @@ PACKAGECONFIG_append = " vpx" # Fix: unrecognised options: --disable-sunaudio [unknown-configure-option] EXTRA_OECONF_remove = " --disable-sunaudio" -PV = "1.14.0.imx" +PV = "1.14.4.imx" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.4.bb similarity index 85% rename from meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb rename to meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.4.bb index 4bf983a8c..16fa17705 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.4.bb @@ -11,8 +11,8 @@ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ " -SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88" -SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1" +SRC_URI[md5sum] = "90768a0074db071175ce980064d9a1ac" +SRC_URI[sha256sum] = "ac02d837f166c35ff6ce0738e281680d0b90052cfb1f0255dcf6aaca5f0f6d23" S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.4.bb similarity index 75% rename from meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb rename to meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.4.bb index cc8445e85..d40fa0bc1 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.4.bb @@ -4,8 +4,8 @@ require gstreamer1.0-rtsp-server.inc FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server:" -SRC_URI[md5sum] = "8a505c88f7469c3a0d1e9f4e9a315e53" -SRC_URI[sha256sum] = "6b65a077bed815f6d3157ebea503cc9f3c32d289af2756b7ff7e3958744d9756" +SRC_URI[md5sum] = "ab0fb5c829266a500e14b46b7bdf06bf" +SRC_URI[sha256sum] = "3d0ece2afdcd601c175ece24e32a30bc19247b454f4eafd3deeec2533c6884f1" # Disable introspection to fix [GstRtsp-1.0.gir] Error EXTRA_OECONF_append = " --disable-introspection" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb index 6f436fc84..72de5e6a2 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ # Use i.MX fork of GST for customizations GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" -SRCBRANCH = "MM_04.04.04_1811_L4.14.78_GA" +SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" SRC_URI = " ${GST1.0_SRC};branch=${SRCBRANCH}" -SRCREV = "f4e127a5e9a1eb977e023532d6636d939c8ccbc8" +SRCREV = "d42548da09724ad8cc1aa4f1944607920be2f4c0" EXTRA_AUTORECONF = "" @@ -20,7 +20,7 @@ DEPENDS += " elfutils" # Unrecognised options, need to remove them EXTRA_OECONF_remove = " --disable-docbook --disable-trace" -PV = "1.14.0.imx" +PV = "1.14.4.imx" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch new file mode 100644 index 000000000..f95a02120 --- /dev/null +++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch @@ -0,0 +1,37 @@ +From e2e72f8baaa7ee90f489e866befb6f4ce91ba533 Mon Sep 17 00:00:00 2001 +From: "i.MX Yocto Project Build" +Date: Mon, 14 Jan 2019 01:59:42 -0600 +Subject: [PATCH] imx-gst1.0-plugin: Update KERNEL_VERSION check + +It should be against v4.14 instead of v4.14.34 + +Signed-off-by: i.MX Yocto Project Build +--- + libs/gstimxcommon.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c +index eb808b9..49eb3e2 100644 +--- a/libs/gstimxcommon.c ++++ b/libs/gstimxcommon.c +@@ -38,7 +38,7 @@ unsigned long phy_addr_from_fd(int dmafd) + if (dmafd < 0) + return NULL; + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 34) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + fd = open(dev_ion, O_RDWR); + if(fd < 0) { + return NULL; +@@ -83,7 +83,7 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size) + if (!vaddr) + return NULL; + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 34) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + fd = open(dev_ion, O_RDWR); + if(fd < 0) { + return NULL; +-- +2.7.4 + diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.4.bb b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.5.bb similarity index 84% rename from meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.4.bb rename to meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.5.bb index b0f89f0e5..75885e5b7 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.4.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.5.bb @@ -1,5 +1,5 @@ # Copyright (C) 2014,2016 Freescale Semiconductor -# Copyright 2017-2018 NXP +# Copyright 2017-2019 NXP # Copyright (C) 2012-2015 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) @@ -7,8 +7,7 @@ DESCRIPTION = "Gstreamer freescale plugins" LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" SECTION = "multimedia" -DEPENDS = "imx-codec imx-parser virtual/kernel libdrm gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -do_configure[depends] += "virtual/kernel:do_shared_workdir" +DEPENDS = "imx-codec imx-parser libdrm gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" DEPENDS_append_mx6 = " imx-lib" DEPENDS_append_mx7 = " imx-lib" DEPENDS_append_imxvpu = " imx-vpuwrap" @@ -22,14 +21,16 @@ 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.04.04_1811_L4.14.78_GA" +SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" -SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}" -SRCREV = "79cf42955b5100cd1a3b2ea2647ceb7cfa50fffb" +SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH} \ + file://0001-imx-gst1.0-plugin-Update-KERNEL_VERSION-check.patch \ +" +SRCREV = "0c5f48b3aee473d8c8f3e853eb2078f054caa4d2" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig use-imx-headers PLATFORM_mx6 = "MX6" PLATFORM_mx6sl = "MX6SL" @@ -42,7 +43,7 @@ PLATFORM_mx8 = "MX8" # Todo add a mechanism to map possible build targets EXTRA_OECONF = "PLATFORM=${PLATFORM} \ - CPPFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated/uapi -I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" \ + CPPFLAGS="-I${STAGING_INCDIR_IMX}" \ CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', bb.utils.contains('DISTRO_FEATURES', 'x11', '--disable-x11', '', d), '', d)}" diff --git a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb index 1376a1199..5bc6d0f16 100644 --- a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb +++ b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.04.04_1811_L4.14.78_GA" +SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" SRC_URI = " \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ file://0001-configure.ac-Add-prefix-to-correct-the-QT_PATH.patch \ " -SRCREV = "cec0ef39784a3acfd2b442d107f054c6ab10181e" +SRCREV = "a31aabb7581d3f491cd31889d44479bb0f34990b" DEPENDS += "gstreamer1.0-plugins-base virtual/kernel \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ @@ -56,7 +56,7 @@ do_install_append() { fi } -PV = "1.14.0.imx" +PV = "1.14.4.imx" S = "${WORKDIR}/git"