From c38d8ed84e676938596410fbfd0da48313f1d4d0 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 14 Sep 2020 12:36:19 +0200 Subject: [PATCH] meta-digi-dey: gstreamer: Remove unneeded patch for CCIMX6 https://jira.digi.com/browse/DEL-7221 Signed-off-by: Mike Engel --- ...d-define-a-G2D_AMPHION_INTERLACED-ma.patch | 27 ------------------- .../gstreamer/imx-gst1.0-plugin_%.bbappend | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch deleted file mode 100644 index 1fa126876..000000000 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Gabriel Valcazar -Date: Fri, 20 Jul 2018 18:04:55 +0200 -Subject: [PATCH] imx_2d_device_g2d: define a G2D_AMPHION_INTERLACED macro - -Currently, this symbol is not present in the libg2d used by imx6 platforms, so -this is a workaround to get the package to compile. - -https://jira.digi.com/browse/DEL-6078 - -Signed-off-by: Gabriel Valcazar ---- - libs/device-2d/imx_2d_device_g2d.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libs/device-2d/imx_2d_device_g2d.c b/libs/device-2d/imx_2d_device_g2d.c -index 56dc550..e5d58c3 100755 ---- a/libs/device-2d/imx_2d_device_g2d.c -+++ b/libs/device-2d/imx_2d_device_g2d.c -@@ -27,6 +27,8 @@ - GST_DEBUG_CATEGORY_EXTERN (imx2ddevice_debug); - #define GST_CAT_DEFAULT imx2ddevice_debug - -+#define G2D_AMPHION_INTERLACED 0x10 -+ - typedef struct _Imx2DDeviceG2d { - gint capabilities; - struct g2d_surfaceEx src; diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend index 1e1c8de7e..d4213ce64 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend +++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend @@ -6,4 +6,3 @@ SRC_URI += " \ file://0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch \ file://0002-imx-gst1.0-plugin-fix-build-using-MUSL-C-library.patch \ " -SRC_URI_append_ccimx6 = " file://0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch"