diff --git a/u_aarch64-support.patch b/u_aarch64-support.patch index 3b3d410..b628883 100644 --- a/u_aarch64-support.patch +++ b/u_aarch64-support.patch @@ -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 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 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 296ce24..7675b76 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -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 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 842177c..e42fd48 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -298,8 +298,7 @@ cp %{SOURCE96} . #%patch222 -p1 %patch226 -p0 %patch227 -p1 -### Fix me for 1.14.x - Rebase me! -#%patch228 -p1 +%patch228 -p1 %build autoreconf -fi