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>

5 files changed, 64 insertions, 43 deletions

diff --git a/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch b/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch
deleted file mode 100644
index 3299f6fb1..000000000
--- a/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 24 May 2019 22:27:08 +0200
-Subject: [PATCH] fix building with glibc-2.28
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- hw/xfree86/common/xf86Xinput.c         | 1 +
- hw/xfree86/os-support/linux/lnx_init.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index 1fb5b1635e2c..24e0d3f68368 100644
---- a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -84,6 +84,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #ifdef HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h>          /* for major() & minor() on Solaris */
- #endif
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
-index 94853070dc6a..3d89a9d117e6 100644
---- a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -37,6 +37,7 @@
- #include "xf86_OSlib.h"
- 
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- 
- #ifndef K_OFF
- #define K_OFF 0x4
diff --git a/patches/xorg-server-1.17.2/series b/patches/xorg-server-1.17.2/series
deleted file mode 100644
index a3e7a5cb5..000000000
--- a/patches/xorg-server-1.17.2/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-xf86bigfont-always-include-unistd.h.patch
-0002-fix-building-with-glibc-2.28.patch
-# 220b45a212faa8cdb25392d7025c8b2c  - git-ptx-patches magic
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.17.2/0001-xf86bigfont-always-include-unistd.h.patch b/patches/xorg-server-1.20.5/0002-xf86bigfont-always-include-unistd.h.patch
index 5792f3cd4..f34b1eb18 100644
--- a/patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch
+++ b/patches/xorg-server-1.20.5/0002-xf86bigfont-always-include-unistd.h.patch
@@ -16,7 +16,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
-index 46b3242d1bc9..65df73449b4c 100644
+index 529595bb7544..91c733c86fcd 100644
 --- a/Xext/xf86bigfont.c
 +++ b/Xext/xf86bigfont.c
 @@ -39,6 +39,7 @@
@@ -25,9 +25,9 @@ index 46b3242d1bc9..65df73449b4c 100644
  #include <sys/types.h>
 +#include <unistd.h>
  #ifdef HAS_SHM
- #if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
- /* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
-@@ -58,7 +59,6 @@
+ #ifdef SVR4
+ #include <sys/sysmacros.h>
+@@ -51,7 +52,6 @@
  #include <sys/shm.h>
  #include <sys/stat.h>
  #include <stdlib.h>
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