summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-04-16 14:59:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-16 16:51:40 +0100
commit716bf31e0b30251129d59475639c31838f0eaf99 (patch)
tree3560d910f64be08c5824c6b13037894d06c08ba2 /meta/recipes-graphics/xorg-xserver
parentaf9ed97e30ac1a3a2b4e1062f2f8aee255d05972 (diff)
downloadpoky-716bf31e0b30251129d59475639c31838f0eaf99.tar.gz
xserver-xorg: fix segfaults for ARM SoCs
(From OE-Core rev: f45a03b510479f6c27b24a0fd8d0c661674495e1) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch39
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb3
2 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch
new file mode 100644
index 0000000000..16f0489c85
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch
@@ -0,0 +1,39 @@
1From a095f5005be66c1b9747187e91e5332b0d8b106b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Tue, 16 Apr 2013 13:47:22 +0200
4Subject: [xserver 1.14/master] dixstruct.h: fix segfaults - char is unsigned
5 for ARM and PowerPC architectures
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10see ARM related bug reports [1-3]
11
12Upstream-Status: Submitted [4]
13
14[1] https://github.com/archlinuxarm/PKGBUILDs/issues/446I
15[2] http://www.raspberrypi.org/phpBB3/viewtopic.php?t=38568&p=321673
16[3] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/037805.html
17[4] http://lists.x.org/archives/xorg-devel/2013-April/036010.html
18
19Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
20---
21 include/dixstruct.h | 2 +-
22 1 files changed, 1 insertions(+), 1 deletions(-)
23
24diff --git a/include/dixstruct.h b/include/dixstruct.h
25index 6784819..aef822c 100644
26--- a/include/dixstruct.h
27+++ b/include/dixstruct.h
28@@ -96,7 +96,7 @@ typedef struct _Client {
29 unsigned int clientGone:1;
30 unsigned int closeDownMode:2;
31 unsigned int clientState:2;
32- char smart_priority;
33+ signed char smart_priority;
34 short noClientException; /* this client died or needs to be killed */
35 int priority;
36 ReplySwapPtr pSwapReplyFunc;
37--
381.7.6.5
39
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
index 83b80494ea..8c573bdf30 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
@@ -6,12 +6,13 @@ SRC_URI += "file://crosscompile.patch \
6 file://mips64-compiler.patch \ 6 file://mips64-compiler.patch \
7 file://aarch64.patch \ 7 file://aarch64.patch \
8 file://fix_compilation_when_not_using_xinerama.patch \ 8 file://fix_compilation_when_not_using_xinerama.patch \
9 file://0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "86110278b784e279381b7f6f2295c508" 12SRC_URI[md5sum] = "86110278b784e279381b7f6f2295c508"
12SRC_URI[sha256sum] = "1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630" 13SRC_URI[sha256sum] = "1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630"
13 14
14PR = "${INC_PR}.0" 15PR = "${INC_PR}.1"
15 16
16# These extensions are now integrated into the server, so declare the migration 17# These extensions are now integrated into the server, so declare the migration
17# path for in-place upgrades. 18# path for in-place upgrades.