rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

- rebased u_aarch64-support.patch and reenabled it

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=436
This commit is contained in:
Stefan Dirsch 2013-03-13 16:46:40 +00:00 committed by Git OBS Bridge
parent dcc72099ec
commit b067c52e7c
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
u_aarch64-support.patch
View File

@ -15,24 +15,6 @@ Index: xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c
/* /*
* Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare * 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 Index: xorg-server-1.13.2/include/servermd.h
=================================================================== ===================================================================
--- xorg-server-1.13.2.orig/include/servermd.h --- xorg-server-1.13.2.orig/include/servermd.h

5
xorg-x11-server.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 13 16:46:09 UTC 2013 - sndirsch@suse.com
- rebased u_aarch64-support.patch and reenabled it
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 8 16:16:07 UTC 2013 - tobias.johannes.klausmann@mni.thm.de Fri Mar 8 16:16:07 UTC 2013 - tobias.johannes.klausmann@mni.thm.de

3
xorg-x11-server.spec
View File

@ -298,8 +298,7 @@ cp %{SOURCE96} .
#%patch222 -p1 #%patch222 -p1
%patch226 -p0 %patch226 -p0
%patch227 -p1 %patch227 -p1
### Fix me for 1.14.x - Rebase me! %patch228 -p1
#%patch228 -p1
%build %build
autoreconf -fi autoreconf -fi