diff options
Diffstat (limited to 'recipes-multimedia')
2 files changed, 53 insertions, 2 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch new file mode 100644 index 00000000..d3822cfc --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch @@ -0,0 +1,45 @@ +From 84f693a70e6f3084ca67063a6336aaf3287abb49 Mon Sep 17 00:00:00 2001 +From: Yuqing Zhu <carol.zhu@nxp.com> +Date: Thu, 27 Sep 2018 13:53:49 +0800 +Subject: [PATCH] gstreamer1.0-plugins-base: Fix ion.h header inclusion to be + standard + +NXP "solution" was to manually copy the header to include/linux. +Let's point the Makefile to the proper (mainline) location instead: +https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h + +Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> +--- + configure.ac | 2 +- + gst-libs/gst/allocators/gstionmemory.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 51272df..4bea0dd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -678,7 +678,7 @@ AG_GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [ + dnl check for ion + translit(dnm, m, l) AM_CONDITIONAL(USE_ION, true) + AG_GST_CHECK_FEATURE(ION, [ion], ion, [ +- AC_CHECK_HEADER(linux/ion.h, HAVE_ION="yes", HAVE_ION="no") ++ AC_CHECK_HEADER(ion.h, HAVE_ION="yes", HAVE_ION="no") + ]) + + dnl FIXME : add second check somehow if that is necessary +diff --git a/gst-libs/gst/allocators/gstionmemory.c b/gst-libs/gst/allocators/gstionmemory.c +index 5e0455c..a285f09 100644 +--- a/gst-libs/gst/allocators/gstionmemory.c ++++ b/gst-libs/gst/allocators/gstionmemory.c +@@ -26,7 +26,7 @@ + #include <sys/ioctl.h> + #include <sys/mman.h> + #include <sys/types.h> +-#include <linux/ion.h> ++#include <ion.h> + #include <linux/dma-buf.h> + #include <linux/version.h> + +-- +1.9.1 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb index 3ea3d571..3d31d22f 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.04.00_1805_L4.9.88_MX8QXP_BETA2" +SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA" SRC_URI = " \ ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ @@ -16,8 +16,9 @@ SRC_URI = " \ file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ file://0003-riff-add-missing-include-directories-when-calling-in.patch \ file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ + file://0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch \ " -SRCREV = "04bafd740a52757f12496206cfabe282835a1eb5" +SRCREV = "e1f90437939b147658efed4d86c3f99d5e606968" DEFAULT_PREFERENCE = "-1" @@ -62,6 +63,11 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" EXTRA_OECONF += " \ --enable-zlib \ + CPPFLAGS=" \ + -I${STAGING_KERNEL_DIR}/include/uapi \ + -I${STAGING_KERNEL_DIR}/include \ + -I${STAGING_KERNEL_DIR}/drivers/staging/android/uapi \ + " \ " CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" |