diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch deleted file mode 100644 index 4e861a5d3..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From e4c96421700ecd008814bceceaf03f0ee9323c02 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yuqing Zhu <carol.zhu@nxp.com> | ||
| 3 | Date: Thu, 27 Sep 2018 16:00:55 +0800 | ||
| 4 | Subject: [PATCH] imx-gst1.0-plugin: Fix ion.h header inclusion to be standard | ||
| 5 | |||
| 6 | NXP "solution" was to manually copy the header to include/linux. | ||
| 7 | Let's point the Makefile to the proper (mainline) location instead: | ||
| 8 | https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h | ||
| 9 | |||
| 10 | Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> | ||
| 11 | --- | ||
| 12 | configure.ac | 2 +- | ||
| 13 | libs/gstimxcommon.c | 2 +- | ||
| 14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/configure.ac b/configure.ac | ||
| 17 | index 7b2709d..d94e3a8 100755 | ||
| 18 | --- a/configure.ac | ||
| 19 | +++ b/configure.ac | ||
| 20 | @@ -216,7 +216,7 @@ dnl check ion allocator headfile | ||
| 21 | old_CFLAGS=$CFLAGS | ||
| 22 | PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= 1.14, CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gstreamer-allocators-1.0`",\ | ||
| 23 | CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gstreamer-bad-allocators-1.0`") | ||
| 24 | -AC_CHECK_HEADERS([linux/ion.h gst/allocators/gstionmemory.h], HAVE_ION="yes", HAVE_ION="no") | ||
| 25 | +AC_CHECK_HEADERS([ion.h gst/allocators/gstionmemory.h], HAVE_ION="yes", HAVE_ION="no") | ||
| 26 | AM_CONDITIONAL(USE_ION, test "x$HAVE_ION" = "xyes") | ||
| 27 | CFLAGS=$old_CFLAGS | ||
| 28 | |||
| 29 | diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c | ||
| 30 | index eb808b9..c02ab5f 100644 | ||
| 31 | --- a/libs/gstimxcommon.c | ||
| 32 | +++ b/libs/gstimxcommon.c | ||
| 33 | @@ -26,7 +26,7 @@ | ||
| 34 | #include <linux/version.h> | ||
| 35 | #include <linux/dma-buf.h> | ||
| 36 | #ifdef USE_ION | ||
| 37 | -#include <linux/ion.h> | ||
| 38 | +#include <ion.h> | ||
| 39 | #endif | ||
| 40 | const char *dev_ion = "/dev/ion"; | ||
| 41 | |||
| 42 | -- | ||
| 43 | 1.9.1 | ||
| 44 | |||
