summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2017-02-01 09:14:10 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:22:17 +0000
commit82548f8e9c48e45cf92d5e431360a3c0c8496ab0 (patch)
tree2234986358d240b266340e6ead04050d986d8e3b
parenta94c2267453b54521e4d952b0e89d0c8e19fc419 (diff)
downloadpoky-82548f8e9c48e45cf92d5e431360a3c0c8496ab0.tar.gz
xserver-xorg: Fix X server 1.19 crash
Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO option: xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO and OsReleaseSIGIO The check for useSIGIO is no longer needed. (From OE-Core rev: 5ed1bc5b4dadc74f1db52179238fbbd145a59043) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch47
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb1
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
new file mode 100644
index 0000000000..beed6cb4a4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
@@ -0,0 +1,47 @@
1From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
2From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
3Date: Mon, 30 Jan 2017 16:32:06 -0600
4Subject: [PATCH] Remove check for useSIGIO option
5
6Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO
7option.
8
9As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO
10and OsReleaseSIGIO.
11
12No longer the check for useSIGIO is needed
13
14Upstream-Status: Pending
15
16Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
17---
18 hw/xfree86/os-support/shared/sigio.c | 6 ------
19 1 file changed, 6 deletions(-)
20
21diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
22index 884a71c..be76498 100644
23--- a/hw/xfree86/os-support/shared/sigio.c
24+++ b/hw/xfree86/os-support/shared/sigio.c
25@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
26 int i;
27 int installed = FALSE;
28
29- if (!xf86Info.useSIGIO)
30- return 0;
31-
32 for (i = 0; i < MAX_FUNCS; i++) {
33 if (!xf86SigIOFuncs[i].f) {
34 if (xf86IsPipe(fd))
35@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd)
36 int max;
37 int ret;
38
39- if (!xf86Info.useSIGIO)
40- return 0;
41-
42 max = 0;
43 ret = 0;
44 for (i = 0; i < MAX_FUNCS; i++) {
45--
462.7.4
47
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
index 98ffc8676b..0dc1028214 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
@@ -4,6 +4,7 @@ SRC_URI += "file://musl-arm-inb-outb.patch \
4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ 4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
5 file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \ 5 file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \
6 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ 6 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
7 file://0003-Remove-check-for-useSIGIO-option.patch \
7 " 8 "
8SRC_URI[md5sum] = "caa8ee7b2950abbf734347d137529fb6" 9SRC_URI[md5sum] = "caa8ee7b2950abbf734347d137529fb6"
9SRC_URI[sha256sum] = "79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb" 10SRC_URI[sha256sum] = "79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb"