Skip to contentSkip to conversation

xserver-xorg: remove aarch64.patch

PATCH New Kai Kang 1 participant 1 message Sep 11, 2014

lore
Share & tools
lore

Kai Kang

author
#0 lore raw

PATCH 1/1 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.

---
 .../xorg-xserver/xserver-xorg/aarch64.patch        | 35 ----------------------
 .../xorg-xserver/xserver-xorg_1.15.1.bb            |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch deleted +0 -35
deleted file mode 100644
index 045e24a..0000000
@@ -1,35 +0,0 @@
-Subject: Add AArch64 support to xserver-xorg
-Author: Marcin Juszkiewicz <[email protected]>
-
-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__)
- 
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb +0 -1
index 22ac604..e952e60 100644
@@ -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 \
            "
Signature · 1 line
1.9.1