From 87f4f969441979f5c42acfec336047db8e99e3b9 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 17 Apr 2020 09:28:26 +0200
Subject: [PATCH] Revert "xserver-xorg: add poky SIGIO patch that was removed
 from upstream thud branch"

Commit 07d4a6ba ("xserver-xorg: Backport to fix X server 1.20.1 crash")
integrates this patch in meta-freescale layer, then it is no longer
necessary to have it in our meta-digi layer.

This reverts commit 995212a213ecfcf676b85423f4961a371b754d15.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 ...003-Remove-check-for-useSIGIO-option.patch | 47 -------------------
 .../xorg-xserver/xserver-xorg_%.bbappend      |  4 +-
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch

diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
deleted file mode 100644
index beed6cb4a..000000000
--- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
-From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
-Date: Mon, 30 Jan 2017 16:32:06 -0600
-Subject: [PATCH] Remove check for useSIGIO option
-
-Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO
-option.
-
-As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO
-and OsReleaseSIGIO.
-
-No longer the check for useSIGIO is needed
-
-Upstream-Status: Pending
-
-Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
----
- hw/xfree86/os-support/shared/sigio.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
-index 884a71c..be76498 100644
---- a/hw/xfree86/os-support/shared/sigio.c
-+++ b/hw/xfree86/os-support/shared/sigio.c
-@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
-     int i;
-     int installed = FALSE;
- 
--    if (!xf86Info.useSIGIO)
--        return 0;
--
-     for (i = 0; i < MAX_FUNCS; i++) {
-         if (!xf86SigIOFuncs[i].f) {
-             if (xf86IsPipe(fd))
-@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd)
-     int max;
-     int ret;
- 
--    if (!xf86Info.useSIGIO)
--        return 0;
--
-     max = 0;
-     ret = 0;
-     for (i = 0; i < MAX_FUNCS; i++) {
--- 
-2.7.4
-
diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 4d172a276..a20f08a5f 100644
--- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -1,9 +1,7 @@
 # REPLACE meta-nxp-mx8
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI += "file://0001-glamor-Use-CFLAGS-for-EGL-and-GBM.patch \
-            file://0003-Remove-check-for-useSIGIO-option.patch \
-"
+SRC_URI += "file://0001-glamor-Use-CFLAGS-for-EGL-and-GBM.patch"
 SRC_URI_remove = "file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch"
 
 PACKAGECONFIG_remove_mx8 = "glamor"