On Tue, 24 Sep 2019 12:44:01 +0200, Björn Esser wrote:
> Also drop configuration options, that are
> not available anymore.
There are a few patches in patches/xorg-server-1.17.2. Please check if
they are still required and either port them to 1.20.5 or remove them.
Furthermore, compilation fails with
In file included from lnx_init.c:33:
../../../../hw/xfree86/common/compiler.h:767:10: fatal error: sys/io.h:
No such file or directory compilation terminated.
I guess that this is related to compilation with gcc9.
Michael
>
> Signed-off-by: Björn Esser <[email protected]>
> ---
> rules/xorg-server.in | 71 ++----------------------------------------
> rules/xorg-server.make | 20 ++----------
> 2 files changed, 4 insertions(+), 87 deletions(-)
>
> 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
> -
> 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
> -
> -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)
_______________________________________________
ptxdist mailing list
[email protected]
