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>
This commit is contained in:
parent
3b37586fa4
commit
9ebf982d4a
|
@ -1,35 +0,0 @@
|
|||
Subject: Add AArch64 support to xserver-xorg
|
||||
Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
|
||||
|
||||
lnx_video.c parts are not existing in 1.14 branch.
|
||||
|
||||
Xserver was checked in AArch64 fastmodel (commercial one with graphics support).
|
||||
|
||||
http://patchwork.freedesktop.org/patch/12785/
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
include/servermd.h | 7 +++++++
|
||||
1 files changed, 7 insertions(+), 0 deletions(-)
|
||||
|
||||
--- xorg-server-1.13.1.orig/include/servermd.h
|
||||
+++ xorg-server-1.13.1/include/servermd.h
|
||||
@@ -243,10 +243,17 @@ SOFTWARE.
|
||||
#define BITMAP_BIT_ORDER LSBFirst
|
||||
#define GLYPHPADBYTES 4
|
||||
/* ???? */
|
||||
#endif /* AMD64 */
|
||||
|
||||
+#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64)
|
||||
+#define IMAGE_BYTE_ORDER MSBFirst
|
||||
+#define BITMAP_BIT_ORDER MSBFirst
|
||||
+#define GLYPHPADBYTES 4
|
||||
+/* ???? */
|
||||
+#endif /* AArch64 */
|
||||
+
|
||||
#if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
|
||||
defined(__alpha__) || defined(__alpha) || \
|
||||
defined(__i386__) || \
|
||||
defined(__s390x__) || defined(__s390__)
|
||||
|
|
@ -4,7 +4,6 @@ require xserver-xorg.inc
|
|||
SRC_URI += "file://crosscompile.patch \
|
||||
file://fix_open_max_preprocessor_error.patch \
|
||||
file://mips64-compiler.patch \
|
||||
file://aarch64.patch \
|
||||
file://xorg-CVE-2013-6424.patch \
|
||||
file://xshmfence-option.patch \
|
||||
"
|
||||
|
|
Loading…
Reference in New Issue