gstreamer1.0-plugins-base: Use linux-imx-headers instead of kernel

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

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 a92599460067d9a000cc6f74d1d42a329bf1e1fc..21807911abffad4a16d0a23100f18ccc55525f92 100644 (file)
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb
@@ -5,6 +5,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 += "iso-codes util-linux linux-imx-headers"
+
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
 SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA"
 
@@ -16,7 +18,6 @@ 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 = "e1f90437939b147658efed4d86c3f99d5e606968"
 
@@ -32,10 +33,6 @@ PACKAGECONFIG_append = " pango "
 # Disable introspection to fix [GstGL-1.0.gir] Error
 EXTRA_OECONF_append = " --disable-introspection --disable-opengl --enable-wayland"
 
-# ion allocator will be enabled only when detecting the ion.h exists, which is built out from kernel.
-# Now, ion allocator can be supported on all i.MX platform
-DEPENDS_append = " iso-codes util-linux virtual/kernel"
-
 inherit gettext
 
 PACKAGES_DYNAMIC =+ "^libgst.*"
@@ -63,12 +60,7 @@ 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 \
-    -I${STAGING_KERNEL_BUILDDIR}/include/generated/uapi \
-    " \
+    CPPFLAGS="-I${STAGING_INCDIR}/imx" \
 "
 
 CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"