code.ossystems Code Review - meta-freescale.git/blob

   1 From 84f693a70e6f3084ca67063a6336aaf3287abb49 Mon Sep 17 00:00:00 2001
   2 From: Yuqing Zhu <carol.zhu@nxp.com>
   3 Date: Thu, 27 Sep 2018 13:53:49 +0800
   4 Subject: [PATCH] gstreamer1.0-plugins-base: Fix ion.h header inclusion to be
   5  standard
   6
   7 NXP "solution" was to manually copy the header to include/linux.
   8 Let's point the Makefile to the proper (mainline) location instead:
   9 https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h
  10
  11 Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
  12 ---
  13  configure.ac                           | 2 +-
  14  gst-libs/gst/allocators/gstionmemory.c | 2 +-
  15  2 files changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/configure.ac b/configure.ac
  18 index 51272df..4bea0dd 100644
  19 --- a/configure.ac
  20 +++ b/configure.ac
  21 @@ -678,7 +678,7 @@ AG_GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [
  22  dnl check for ion
  23  translit(dnm, m, l) AM_CONDITIONAL(USE_ION, true)
  24  AG_GST_CHECK_FEATURE(ION, [ion], ion, [
  25 -  AC_CHECK_HEADER(linux/ion.h, HAVE_ION="yes", HAVE_ION="no")
  26 +  AC_CHECK_HEADER(ion.h, HAVE_ION="yes", HAVE_ION="no")
  27  ])
  28
  29  dnl FIXME : add second check somehow if that is necessary
  30 diff --git a/gst-libs/gst/allocators/gstionmemory.c b/gst-libs/gst/allocators/gstionmemory.c
  31 index 5e0455c..a285f09 100644
  32 --- a/gst-libs/gst/allocators/gstionmemory.c
  33 +++ b/gst-libs/gst/allocators/gstionmemory.c
  34 @@ -26,7 +26,7 @@
  35  #include <sys/ioctl.h>
  36  #include <sys/mman.h>
  37  #include <sys/types.h>
  38 -#include <linux/ion.h>
  39 +#include <ion.h>
  40  #include <linux/dma-buf.h>
  41  #include <linux/version.h>
  42
  43 --
  44 1.9.1
  45