Hi, FYI, you don't need to resent the whole series, just post a v3 for the patches that need some changes.
On Wed, Sep 25, 2019 at 11:14:33AM +0200, Björn Esser wrote: > 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 <[email protected]> > --- > .../0002-fix-building-with-glibc-2.28.patch | 34 --------- > patches/xorg-server-1.17.2/series | 5 -- > ...t-include-sys-io.h-on-ARM-with-glibc.patch | 55 ++++++++++++++ > ...xf86bigfont-always-include-unistd.h.patch} | 8 +-- > patches/xorg-server-1.20.5/series | 5 ++ > rules/xorg-server.in | 71 +------------------ > rules/xorg-server.make | 20 +----- > 7 files changed, 68 insertions(+), 130 deletions(-) > delete mode 100644 > patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch > delete mode 100644 patches/xorg-server-1.17.2/series > create mode 100644 > patches/xorg-server-1.20.5/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch > rename > patches/{xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch => > xorg-server-1.20.5/0002-xf86bigfont-always-include-unistd.h.patch} (83%) > create mode 100644 patches/xorg-server-1.20.5/series > > 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 <[email protected]> > -Date: Fri, 24 May 2019 22:27:08 +0200 > -Subject: [PATCH] fix building with glibc-2.28 > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - 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 <[email protected]> > +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 <[email protected]> > +--- > + 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 > similarity index 83% > rename from > patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch > rename to > 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 <[email protected]> > 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 > diff --git a/rules/xorg-server.in b/rules/xorg-server.in > index fd4fcd5d1..e91d982ba 100644 > --- a/rules/xorg-server.in > +++ b/rules/xorg-server.in > @@ -8,6 +8,7 @@ menuconfig XORG_SERVER > select HOST_XORG_UTIL_MACROS > select HOST_XORG_LIB_XTRANS # needed for autoreconf > select HOST_XORG_FONT_UTIL # needed for autoreconf > + > # > # required dependencies, according to REQUIRED_MODULES > # and REQUIRED_LIBS in conrigure.ac: > @@ -32,10 +33,6 @@ menuconfig XORG_SERVER > > select LIBDRM if XORG_SERVER_LIBDRM > > - # input hotplug with udev > - select UDEV if XORG_SERVER_UDEV > - select UDEV_LIBUDEV if XORG_SERVER_UDEV > - > # glx triggered > select XORG_LIB_X11 if XORG_SERVER_EXT_GLX > select MESALIB if XORG_SERVER_EXT_GLX > @@ -84,7 +81,7 @@ menuconfig XORG_SERVER > select XORG_LIB_XRES if XORG_SERVER_EXT_XRES > > # for kdrive > - select TSLIB if XORG_SERVER_TSLIB > + select TSLIB > > # FIXME: unclear dependencies > #select XORG_LIB_XXF86VM if XORG_SERVER_EXT_XV > @@ -196,20 +193,6 @@ config XORG_SERVER_XEPHYR > Xnest this kind of server supports all new features (extensions). It > doesn't depend on the features of the underlying X server. > > -config XORG_SERVER_XFAKE > - bool > - depends on BROKEN > - prompt "fake server" > - help > - FIXME > - > -config XORG_SERVER_XFBDEV > - bool > - select XORG_SERVER_KDRIVE > - prompt "xfbdev server" > - help > - FIXME > - Remove the variable from targetinstall as well. > endmenu > > # > ---------------------------------------------------------------------------- > @@ -231,11 +214,6 @@ endmenu > > menu "xorg options " > > -config XORG_SERVER_OPT_AIGLX > - bool > - depends on BROKEN > - prompt "aiglx" > - > config XORG_SERVER_OPT_INSTALL_SETUID > bool > prompt "install server suid root" > @@ -248,47 +226,8 @@ config XORG_SERVER_OPT_SECURE_RPC > help > Use secure RPC authentication (SUN-DES-1) > > -config XORG_SERVER_UDEV > - bool > - select XORG_SERVER_LIBDRM > - prompt "detect input devices via udev" > - help > - FIXME The option is removed here, but still used for the configure arguments. What's going on here? Michael > - > -endmenu > - > -if XORG_SERVER_KDRIVE > - > -menu "kdrive options " > - > -config XORG_SERVER_TSLIB > - bool > - prompt "tslib support" > - help > - Build kdrive tslib touchscreen support > - > -config XORG_SERVER_KDRIVE_KBD > - bool > - prompt "kbd driver" > - help > - Build kbd driver for kdrive > - > -config XORG_SERVER_KDRIVE_MOUSE > - bool > - prompt "mouse driver" > - help > - Build mouse driver for kdrive > - > -config XORG_SERVER_KDRIVE_EVDEV > - bool > - prompt "evdev driver" > - help > - Build evdev driver for kdrive > - > endmenu > > -endif > - > # > ---------------------------------------------------------------------------- > > menu "xorg extensions " > @@ -383,11 +322,6 @@ config XORG_SERVER_EXT_GLX > help > --enable-glx > > -config XORG_SERVER_OPT_GLX_TLS > - bool > - depends on XORG_SERVER_EXT_GLX > - prompt "tls support for glx" > - > config XORG_SERVER_EXT_DRI > bool > select XORG_SERVER_LIBDRM > @@ -485,4 +419,3 @@ endmenu > # > ---------------------------------------------------------------------------- > > endif > - > diff --git a/rules/xorg-server.make b/rules/xorg-server.make > index 462e598be..a6f124285 100644 > --- a/rules/xorg-server.make > +++ b/rules/xorg-server.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server > # > # Paths and names > # > -XORG_SERVER_VERSION := 1.17.2 > -XORG_SERVER_MD5 := 397e405566651150490ff493e463f1ad > +XORG_SERVER_VERSION := 1.20.5 > +XORG_SERVER_MD5 := c9fc7e21e11286dbedd22c00df652130 > XORG_SERVER := xorg-server-$(XORG_SERVER_VERSION) > XORG_SERVER_SUFFIX := tar.bz2 > XORG_SERVER_URL := $(call ptx/mirror, XORG, > individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)) > @@ -61,9 +61,6 @@ XORG_SERVER_CONF_OPT = \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --disable-debug \ > --disable-sparkle \ > - --disable-install-libxf86config \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_AIGLX)-aiglx \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_GLX_TLS)-glx-tls \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_COMPOSITE)-composite \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_SHM)-mitshm \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XRES)-xres \ > @@ -84,7 +81,6 @@ XORG_SERVER_CONF_OPT = \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XACE)-xace \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XSELINUX)-xselinux \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XCSECURITY)-xcsecurity \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_TSLIB)-tslib \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_DBE)-dbe \ > --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XF86BIGFONT)-xf86bigfont \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_DPMS)-dpms \ > @@ -119,11 +115,6 @@ XORG_SERVER_CONF_OPT = \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_GLAMOR)-glamor \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE)-kdrive \ > --$(call ptx/endis, PTXCONF_XORG_SERVER_XEPHYR)-xephyr \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_XFAKE)-xfake \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_XFBDEV)-xfbdev \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE_KBD)-kdrive-kbd \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE_MOUSE)-kdrive-mouse \ > - --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE_EVDEV)-kdrive-evdev \ > --disable-libunwind \ > --$(call ptx/endis, > PTXCONF_XORG_SERVER_OPT_INSTALL_SETUID)-install-setuid \ > $(XORG_OPTIONS_TRANS) \ > @@ -189,13 +180,6 @@ ifdef PTXCONF_PRELINK > /etc/prelink.conf.d/xorg) > endif > > -ifdef PTXCONF_XORG_SERVER_XORG > -ifdef PTXCONF_XORG_SERVER_UDEV > - @$(call install_copy, xorg-server, 0, 0, 0644, -, \ > - $(XORG_DATADIR)/X11/xorg.conf.d/10-evdev.conf) > -endif > -endif > - > ifdef PTXCONF_XORG_SERVER_XVFB > @$(call install_copy, xorg-server, 0, 0, 0755, -, \ > $(XORG_PREFIX)/bin/Xvfb) > -- > 2.23.0 > > > _______________________________________________ > ptxdist mailing list > [email protected] -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected]
