summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2014-09-11 11:31:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-11 17:24:53 +0100
commit9ebf982d4a4959e3ab4b4f949c24a74738bcc637 (patch)
tree59c4fcf38939e40450493a865e5543a090228eca /meta/recipes-graphics/xorg-xserver/xserver-xorg
parent3b37586fa4a355369b78ea16dee09b50edea96ec (diff)
downloadpoky-9ebf982d4a4959e3ab4b4f949c24a74738bcc637.tar.gz
xserver-xorg: remove aarch64.patch
Patch aarch64.patch adds aarch64 support for xserver-xorg 1.13.1 in header file servermd.h. And aarch64 is supported in version 1.15.1 already and the patch causes redefine error. So remove aarch64.patch. (From OE-Core rev: 2d8700bf2250ff4975dad51ee32e8d520fc14a11) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
deleted file mode 100644
index 045e24a281..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Subject: Add AArch64 support to xserver-xorg
2Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
3
4lnx_video.c parts are not existing in 1.14 branch.
5
6Xserver was checked in AArch64 fastmodel (commercial one with graphics support).
7
8http://patchwork.freedesktop.org/patch/12785/
9
10Upstream-Status: Pending
11
12---
13 include/servermd.h | 7 +++++++
14 1 files changed, 7 insertions(+), 0 deletions(-)
15
16--- xorg-server-1.13.1.orig/include/servermd.h
17+++ xorg-server-1.13.1/include/servermd.h
18@@ -243,10 +243,17 @@ SOFTWARE.
19 #define BITMAP_BIT_ORDER LSBFirst
20 #define GLYPHPADBYTES 4
21 /* ???? */
22 #endif /* AMD64 */
23
24+#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64)
25+#define IMAGE_BYTE_ORDER MSBFirst
26+#define BITMAP_BIT_ORDER MSBFirst
27+#define GLYPHPADBYTES 4
28+/* ???? */
29+#endif /* AArch64 */
30+
31 #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
32 defined(__alpha__) || defined(__alpha) || \
33 defined(__i386__) || \
34 defined(__s390x__) || defined(__s390__)
35