diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-12-26 10:52:34 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-01-04 13:40:32 +0100 |
commit | b85993d235a91e416571970286af96bb85be8546 (patch) | |
tree | a073a9539087d2f0d44da596c1a98c2860551099 /recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch | |
parent | bceab1c31a25425212891bd0d5829695f3852e68 (diff) |
Revert "gstreamer1.0: Update version from 1.12.imx to 1.14.imx"
This reverts commit d6f3d5f70907d2f8f2c653a55f314d7213090635.
This now lives in meta-freescale.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
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 4e861a5..0000000 --- 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 @@ -From e4c96421700ecd008814bceceaf03f0ee9323c02 Mon Sep 17 00:00:00 2001 -From: Yuqing Zhu <carol.zhu@nxp.com> -Date: Thu, 27 Sep 2018 16:00:55 +0800 -Subject: [PATCH] imx-gst1.0-plugin: 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 +- - libs/gstimxcommon.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7b2709d..d94e3a8 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -216,7 +216,7 @@ dnl check ion allocator headfile - old_CFLAGS=$CFLAGS - PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= 1.14, CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gstreamer-allocators-1.0`",\ - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gstreamer-bad-allocators-1.0`") --AC_CHECK_HEADERS([linux/ion.h gst/allocators/gstionmemory.h], HAVE_ION="yes", HAVE_ION="no") -+AC_CHECK_HEADERS([ion.h gst/allocators/gstionmemory.h], HAVE_ION="yes", HAVE_ION="no") - AM_CONDITIONAL(USE_ION, test "x$HAVE_ION" = "xyes") - CFLAGS=$old_CFLAGS - -diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c -index eb808b9..c02ab5f 100644 ---- a/libs/gstimxcommon.c -+++ b/libs/gstimxcommon.c -@@ -26,7 +26,7 @@ - #include <linux/version.h> - #include <linux/dma-buf.h> - #ifdef USE_ION --#include <linux/ion.h> -+#include <ion.h> - #endif - const char *dev_ion = "/dev/ion"; - --- -1.9.1 - |