xorg-server: version bump 1.17.2 -> 1.20.5

Add a patch from the xserver package in Fedora to
NOT include sys/io.h on ARM.  Also drop several
configuration options, that are not available anymore.

Signed-off-by: Björn Esser <b.esser@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 97 insertions, 0 deletions

diff --git a/patches/xorg-server-1.20.5/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch b/patches/xorg-server-1.20.5/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
new file mode 100644
index 000000000..a8fba9756
--- /dev/null
+++ b/patches/xorg-server-1.20.5/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
@@ -0,0 +1,55 @@
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Mon, 1 Jul 2019 13:20:39 +0200
+Subject: [PATCH] compiler.h: Do not include sys/io.h on ARM with glibc
+
+<sys/io.h> on ARM hasn't worked for a long, long time, so it was removed
+it from glibc upstream.
+
+Remove the include to avoid a compilation failure on ARM with glibc.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+---
+ hw/xfree86/common/compiler.h | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index 7144c6a27f29..2b2008b3f427 100644
+--- a/hw/xfree86/common/compiler.h
++++ b/hw/xfree86/common/compiler.h
+@@ -758,36 +758,6 @@ inl(unsigned short port)
+     return xf86ReadMmio32Le((void *) ioBase, port);
+ }
+ 
+-#elif defined(__arm__) && defined(__linux__)
+-
+-/* for Linux on ARM, we use the LIBC inx/outx routines */
+-/* note that the appropriate setup via "ioperm" needs to be done */
+-/*  *before* any inx/outx is done. */
+-
+-#include <sys/io.h>
+-
+-static __inline__ void
+-xf_outb(unsigned short port, unsigned char val)
+-{
+-    outb(val, port);
+-}
+-
+-static __inline__ void
+-xf_outw(unsigned short port, unsigned short val)
+-{
+-    outw(val, port);
+-}
+-
+-static __inline__ void
+-xf_outl(unsigned short port, unsigned int val)
+-{
+-    outl(val, port);
+-}
+-
+-#define outb xf_outb
+-#define outw xf_outw
+-#define outl xf_outl
+-
+ #elif defined(__nds32__)
+ 
+ /*
diff --git a/patches/xorg-server-1.20.5/0002-xf86bigfont-always-include-unistd.h.patch b/patches/xorg-server-1.20.5/0002-xf86bigfont-always-include-unistd.h.patch
new file mode 100644
index 000000000..f34b1eb18
--- /dev/null
+++ b/patches/xorg-server-1.20.5/0002-xf86bigfont-always-include-unistd.h.patch
@@ -0,0 +1,37 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 28 May 2015 23:47:37 +0200
+Subject: [PATCH] xf86bigfont: always include unistd.h
+
+Otherwise compiling can fail with:
+
+xf86bigfont.c: In function 'ProcXF86BigfontQueryVersion':
+xf86bigfont.c:287:9: error: implicit declaration of function 'geteuid' [-Werror=implicit-function-declaration]
+xf86bigfont.c:287:9: warning: nested extern declaration of 'geteuid' [-Wnested-externs]
+xf86bigfont.c:288:9: error: implicit declaration of function 'getegid' [-Werror=implicit-function-declaration]
+xf86bigfont.c:288:9: warning: nested extern declaration of 'getegid' [-Wnested-externs]
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Xext/xf86bigfont.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
+index 529595bb7544..91c733c86fcd 100644
+--- a/Xext/xf86bigfont.c
++++ b/Xext/xf86bigfont.c
+@@ -39,6 +39,7 @@
+ #endif
+ 
+ #include <sys/types.h>
++#include <unistd.h>
+ #ifdef HAS_SHM
+ #ifdef SVR4
+ #include <sys/sysmacros.h>
+@@ -51,7 +52,6 @@
+ #include <sys/shm.h>
+ #include <sys/stat.h>
+ #include <stdlib.h>
+-#include <unistd.h>
+ #include <time.h>
+ #include <errno.h>
+ #endif
diff --git a/patches/xorg-server-1.20.5/series b/patches/xorg-server-1.20.5/series
new file mode 100644
index 000000000..d0423cb40
--- /dev/null
+++ b/patches/xorg-server-1.20.5/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
+0002-xf86bigfont-always-include-unistd.h.patch
+# ae8637745e425b5ff7d2bc7b315cc052  - git-ptx-patches magic