xserver-xorg: add poky SIGIO patch that was removed from upstream thud branch
This patch is included in the rocko and sumo branches of poky to avoid errors when starting an xserver using DRI, but it was removed in the thud branch in favor of newer input methods other than SIGIO. SIGIO is still supported, but not explicitly in the xserver configuration. Since the vivante driver on the i.MX6 is using DRI and, by extension, SIGIO (even though there is no way to configure xserver to enable SIGIO support), the only way to make xserver start correctly is by removing the SIGIO support check in the code. https://jira.digi.com/browse/DEL-6565 Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
parent
5a14bd9666
commit
995212a213
|
|
@ -0,0 +1,47 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
# REPLACE meta-nxp-mx8
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
|
||||
|
||||
SRC_URI += "file://0001-glamor-Use-CFLAGS-for-EGL-and-GBM.patch"
|
||||
SRC_URI += "file://0001-glamor-Use-CFLAGS-for-EGL-and-GBM.patch \
|
||||
file://0003-Remove-check-for-useSIGIO-option.patch \
|
||||
"
|
||||
SRC_URI_remove = "file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch"
|
||||
|
||||
PACKAGECONFIG_remove_mx8 = "glamor"
|
||||
|
|
|
|||
Loading…
Reference in New Issue