forked from pool/xorg-x11-server
Accepting request 157850 from X11:XOrg
- u_aarch64-support.patch: Basic support for aarch64. (forwarded request 157838 from Andreas_Schwab) OBS-URL: https://build.opensuse.org/request/show/157850 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=256
This commit is contained in:
commit
5098b9026b
60
u_aarch64-support.patch
Normal file
60
u_aarch64-support.patch
Normal file
@ -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.
|
@ -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
|
Wed Feb 20 13:36:40 UTC 2013 - sndirsch@suse.com
|
||||||
|
|
||||||
|
@ -178,6 +178,7 @@ Patch222: N_sync-fix.patch
|
|||||||
Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
|
Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
|
||||||
Patch226: u_vgaHW-no-legacy.patch
|
Patch226: u_vgaHW-no-legacy.patch
|
||||||
Patch227: u_init_framebuffer_base.patch
|
Patch227: u_init_framebuffer_base.patch
|
||||||
|
Patch228: u_aarch64-support.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the X.Org Server.
|
This package contains the X.Org Server.
|
||||||
@ -297,6 +298,7 @@ cp %{SOURCE96} .
|
|||||||
%patch225 -p1
|
%patch225 -p1
|
||||||
%patch226 -p0
|
%patch226 -p0
|
||||||
%patch227 -p1
|
%patch227 -p1
|
||||||
|
%patch228 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
|
Loading…
Reference in New Issue
Block a user