From ae4ce3e62e63ecfbc1f791510b58d40c69afe37363417acabd510ee436c8566c Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 7 Mar 2013 13:48:37 +0000
Subject: [PATCH] Accepting request 157838 from devel:ARM:AArch64:Factory

- u_aarch64-support.patch: Basic support for aarch64.

OBS-URL: https://build.opensuse.org/request/show/157838
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=433
---
 u_aarch64-support.patch | 60 +++++++++++++++++++++++++++++++++++++++++
 xorg-x11-server.changes |  5 ++++
 xorg-x11-server.spec    |  2 ++
 3 files changed, 67 insertions(+)
 create mode 100644 u_aarch64-support.patch

diff --git a/u_aarch64-support.patch b/u_aarch64-support.patch
new file mode 100644
index 0000000..3b3d410
--- /dev/null
+++ b/u_aarch64-support.patch
@@ -0,0 +1,60 @@
+Subject: Basic support for aarch64
+Author: Andreas Schwab <schwab@suse.de>
+
+Index: xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c
+===================================================================
+--- xorg-server-1.13.2.orig/hw/xfree86/os-support/linux/lnx_video.c
++++ xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c
+@@ -58,7 +58,8 @@ static Bool ExtendedEnabled = FALSE;
+       !defined(__sparc__) && \
+       !defined(__mips__) && \
+       !defined(__nds32__) && \
+-      !defined(__arm__)
++      !defined(__arm__) && \
++      !defined(__aarch64__)
+ 
+ /*
+  * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
+@@ -511,7 +512,7 @@ xf86EnableIO(void)
+ #endif
+     }
+     close(fd);
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
+     if (ioperm(0, 1024, 1) || iopl(3)) {
+         if (errno == ENODEV)
+             ErrorF("xf86EnableIOPorts: no I/O ports found\n");
+@@ -540,7 +541,7 @@ xf86DisableIO(void)
+ #if defined(__powerpc__)
+     munmap(ioBase, 0x20000);
+     ioBase = NULL;
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
+     iopl(0);
+     ioperm(0, 1024, 0);
+ #endif
+Index: xorg-server-1.13.2/include/servermd.h
+===================================================================
+--- xorg-server-1.13.2.orig/include/servermd.h
++++ xorg-server-1.13.2/include/servermd.h
+@@ -286,6 +286,20 @@ SOFTWARE.
+ #define GLYPHPADBYTES		4
+ #endif                          /* linux/s390 */
+ 
++#ifdef __aarch64__
++
++#ifdef __AARCH64EL__
++#define IMAGE_BYTE_ORDER        LSBFirst
++#define BITMAP_BIT_ORDER        LSBFirst
++#endif
++#ifdef __AARCH64EB__
++#define IMAGE_BYTE_ORDER        MSBFirst
++#define BITMAP_BIT_ORDER        MSBFirst
++#endif
++#define GLYPHPADBYTES           4
++
++#endif                          /* __aarch64__ */
++
+ /* size of buffer to use with GetImage, measured in bytes. There's obviously
+  * a trade-off between the amount of heap used and the number of times the
+  * ddx routine has to be called.
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 492bf11..2fa5fe7 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar  6 11:26:53 UTC 2013 - schwab@suse.de
+
+- u_aarch64-support.patch: Basic support for aarch64.
+
 -------------------------------------------------------------------
 Wed Feb 20 13:36:40 UTC 2013 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index e33ee3d..59a092f 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -178,6 +178,7 @@ Patch222:       N_sync-fix.patch
 Patch225:       u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
 Patch226:       u_vgaHW-no-legacy.patch
 Patch227:       u_init_framebuffer_base.patch
+Patch228:       u_aarch64-support.patch
 
 %description
 This package contains the X.Org Server.
@@ -297,6 +298,7 @@ cp %{SOURCE96} .
 %patch225 -p1
 %patch226 -p0
 %patch227 -p1
+%patch228 -p1
 
 %build
 autoreconf -fi