Date: Thu, 20 Feb 2020 21:15:45 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526589 - in head: deskutils/easystroke emulators/virtualbox-ose emulators/virtualbox-ose-additions emulators/virtualbox-ose/files net/tigervnc-server net/tigervnc-server/files x11-driv... Message-ID: <202002202115.01KLFjmR003071@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Thu Feb 20 21:15:44 2020 New Revision: 526589 URL: https://svnweb.freebsd.org/changeset/ports/526589 Log: Update xorg x11 servers to 1.20.7 Update xorg x11 servers to 1.20.7. This updates x11-servers/xorg-server, xephyr, xorg-dmx, xorg-nestserver, xorg-vbserver and xwayland. Enable the UDEV backend by default, instead of the DEVD backend, for autoconfiguration of input devices on FreeBSD 12 and later. FreeBSD 11 lacks the needed support in base and will keep on using the DEVD backend. Support for the HAL backend is dropped completely, it has been deprecated for a long time. Update and improve the DEVD backend. Add a pkg message about sysctl configuration that might be needed when using UDEV. Use the upstream fix for glamour issues. Use evdev xkb rules by default in xwayland [2] Add x11-drivers/xf86-input-libinput to the list installed by default by x11-drivers/xorg-drivers. Fix net/tigervnc-server and emulators/virtualbox-ose Bump portrevision of all x11 drivers, as well as other ports dependent on xorg-server. This represents work by many people over a long period. These include wulf, ak, dumbbell, hselasky pete AT nomadlogic DOT org, jbeich, manu, myself and possibly others (I tried to look through history, but might have missed people. If so, I am sorry.) PR: 196678 [1], 244129 [2] Submitted by: hselasky, wulf [1], jbeich [2] Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xserver-1.20 (in part) Added: head/net/tigervnc-server/files/patch-unix_xserver_hw_vnc_xvnc.c (contents, props changed) head/x11-servers/xorg-server/files/20-evdev-kbd.conf (contents, props changed) head/x11-servers/xorg-server/files/config_Makefile.am (contents, props changed) head/x11-servers/xorg-server/files/configure.ac (contents, props changed) head/x11-servers/xorg-server/files/hw_xfree86_Makefile.am (contents, props changed) head/x11-servers/xorg-server/files/patch-config_Makefile.in (contents, props changed) head/x11-servers/xorg-server/files/patch-config_udev.c (contents, props changed) head/x11-servers/xorg-server/files/patch-hw_xfree86_Makefile.in (contents, props changed) head/x11-servers/xorg-server/files/patch-hw_xfree86_xorg-wrapper.c (contents, props changed) head/x11-servers/xorg-server/files/patch-include_dix-config.h.in (contents, props changed) head/x11-servers/xorg-server/files/patch-test_xtest.c (contents, props changed) head/x11-servers/xorg-server/files/xkb_Makefile.am (contents, props changed) head/x11-servers/xorg-server/pkg-message (contents, props changed) Deleted: head/x11-servers/xorg-nestserver/distinfo head/x11-servers/xorg-server/files/patch-CVE-2017-10971 head/x11-servers/xorg-server/files/patch-CVE-2017-10972 head/x11-servers/xorg-server/files/patch-CVE-2017-12176 head/x11-servers/xorg-server/files/patch-CVE-2017-12177 head/x11-servers/xorg-server/files/patch-CVE-2017-12178 head/x11-servers/xorg-server/files/patch-CVE-2017-12179 head/x11-servers/xorg-server/files/patch-CVE-2017-12183 head/x11-servers/xorg-server/files/patch-CVE-2017-1218x head/x11-servers/xorg-server/files/patch-CVE-2017-1218y head/x11-servers/xorg-server/files/patch-CVE-2017-13721 head/x11-servers/xorg-server/files/patch-CVE-2017-13723 head/x11-servers/xorg-server/files/patch-glamor_glamor__dash.c head/x11-servers/xorg-server/files/patch-hw_xfree86_dri2_pci__ids_i965__pci__ids.h head/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c head/x11-servers/xorg-server/files/patch-os_io.c head/x11-servers/xorg-vfbserver/distinfo head/x11-servers/xwayland/distinfo Modified: head/deskutils/easystroke/Makefile head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose/Makefile head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk head/net/tigervnc-server/Makefile head/net/tigervnc-server/Makefile.common.mk head/x11-drivers/xf86-input-egalax/Makefile head/x11-drivers/xf86-input-elographics/Makefile head/x11-drivers/xf86-input-evdev/Makefile head/x11-drivers/xf86-input-joystick/Makefile head/x11-drivers/xf86-input-keyboard/Makefile head/x11-drivers/xf86-input-libinput/Makefile head/x11-drivers/xf86-input-mouse/Makefile head/x11-drivers/xf86-input-synaptics/Makefile head/x11-drivers/xf86-input-vmmouse/Makefile head/x11-drivers/xf86-input-void/Makefile head/x11-drivers/xf86-input-wacom/Makefile head/x11-drivers/xf86-video-amdgpu/Makefile head/x11-drivers/xf86-video-apm/Makefile head/x11-drivers/xf86-video-ark/Makefile head/x11-drivers/xf86-video-ast/Makefile head/x11-drivers/xf86-video-ati-legacy/Makefile head/x11-drivers/xf86-video-ati/Makefile head/x11-drivers/xf86-video-chips/Makefile head/x11-drivers/xf86-video-cirrus/Makefile head/x11-drivers/xf86-video-dummy/Makefile head/x11-drivers/xf86-video-geode/Makefile head/x11-drivers/xf86-video-glint/Makefile head/x11-drivers/xf86-video-i128/Makefile head/x11-drivers/xf86-video-i740/Makefile head/x11-drivers/xf86-video-intel/Makefile head/x11-drivers/xf86-video-mach64/Makefile head/x11-drivers/xf86-video-mga/Makefile head/x11-drivers/xf86-video-neomagic/Makefile head/x11-drivers/xf86-video-nv/Makefile head/x11-drivers/xf86-video-openchrome/Makefile head/x11-drivers/xf86-video-qxl/Makefile head/x11-drivers/xf86-video-r128/Makefile head/x11-drivers/xf86-video-rendition/Makefile head/x11-drivers/xf86-video-s3/Makefile head/x11-drivers/xf86-video-s3virge/Makefile head/x11-drivers/xf86-video-savage/Makefile head/x11-drivers/xf86-video-scfb/Makefile head/x11-drivers/xf86-video-siliconmotion/Makefile head/x11-drivers/xf86-video-sis/Makefile head/x11-drivers/xf86-video-sunffb/Makefile head/x11-drivers/xf86-video-tdfx/Makefile head/x11-drivers/xf86-video-trident/Makefile head/x11-drivers/xf86-video-tseng/Makefile head/x11-drivers/xf86-video-vesa/Makefile head/x11-drivers/xf86-video-vmware/Makefile head/x11-drivers/xf86-video-voodoo/Makefile head/x11-drivers/xorg-drivers/Makefile head/x11-drivers/xorgxrdp/Makefile head/x11-servers/xephyr/Makefile head/x11-servers/xorg-dmx/Makefile head/x11-servers/xorg-nestserver/Makefile head/x11-servers/xorg-server/Makefile head/x11-servers/xorg-server/distinfo head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in head/x11-servers/xorg-server/files/patch-config_config-backends.h head/x11-servers/xorg-server/files/patch-config_config.c head/x11-servers/xorg-server/files/patch-config_devd.c head/x11-servers/xorg-server/files/patch-configure head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c head/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c head/x11-servers/xorg-server/files/patch-xkb_Makefile.in head/x11-servers/xorg-server/pkg-plist head/x11-servers/xorg-vfbserver/Makefile head/x11-servers/xwayland/Makefile head/x11/nvidia-driver-304/Makefile head/x11/nvidia-driver-340/Makefile head/x11/nvidia-driver-390/Makefile head/x11/nvidia-driver/Makefile head/x11/slim/Makefile Directory Properties: head/x11-servers/xorg-server/files/pkg-deinstall.in (props changed) head/x11-servers/xorg-server/files/pkg-install.in (props changed) Modified: head/deskutils/easystroke/Makefile ============================================================================== --- head/deskutils/easystroke/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/deskutils/easystroke/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,7 +3,7 @@ PORTNAME= easystroke PORTVERSION= 0.6.0 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= deskutils MASTER_SITES= SF Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/emulators/virtualbox-ose-additions/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.34 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/emulators/virtualbox-ose/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.34 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} Modified: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk Thu Feb 20 20:38:00 2020 (r526588) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk Thu Feb 20 21:15:44 2020 (r526589) @@ -13,7 +13,7 @@ + vboxmouse_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_system_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_system_INCS := \ -+ $(vboxmouse_xorg_INCS) \ ++ /usr/local/include/pixman-1 \ + /usr/local/include/xorg \ + $(PATH_SUB_CURRENT) + vboxmouse_drv_system_SOURCES = \ Modified: head/net/tigervnc-server/Makefile ============================================================================== --- head/net/tigervnc-server/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/net/tigervnc-server/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -17,8 +17,8 @@ RUN_DEPENDS+= ${LOCALBASE}/share/X11/xkb/rules/base:x1 USES+= autoreconf:build gl jpeg libtool pkgconfig ssl xorg USE_LDCONFIG= yes USE_GL+= gl -USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \ - xorg-macros xorgproto xrandr xrender xtrans xtst +USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont2 \ + xkbfile xorg-macros xorgproto xrandr xrender xtrans xtst BINARY_WRAPPERS= gm4 @@ -48,6 +48,8 @@ CONFIGURE_ARGS+= \ --disable-selective-werror \ --disable-xwayland \ --with-fontrootdir=${LOCALBASE}/share/fonts + +CFLAGS+= -I${LOCALBASE}/include/libdrm # This is server port, disabling some features # - disable vncviewer Modified: head/net/tigervnc-server/Makefile.common.mk ============================================================================== --- head/net/tigervnc-server/Makefile.common.mk Thu Feb 20 20:38:00 2020 (r526588) +++ head/net/tigervnc-server/Makefile.common.mk Thu Feb 20 21:15:44 2020 (r526589) @@ -3,6 +3,7 @@ PORTNAME= tigervnc DISTVERSIONPREFIX= v DISTVERSION= 1.10.1 +PORTREVISION= 1 CATEGORIES= net x11-servers MAINTAINER?= meta@FreeBSD.org Added: head/net/tigervnc-server/files/patch-unix_xserver_hw_vnc_xvnc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/tigervnc-server/files/patch-unix_xserver_hw_vnc_xvnc.c Thu Feb 20 21:15:44 2020 (r526589) @@ -0,0 +1,18 @@ +--- unix/xserver/hw/vnc/xvnc.c.orig 2019-12-20 07:02:02 UTC ++++ unix/xserver/hw/vnc/xvnc.c +@@ -295,6 +295,15 @@ void ddxBeforeReset(void) + } + #endif + ++#if INPUTTHREAD ++/** This function is called in Xserver/os/inputthread.c when starting ++ the input thread. */ ++void ++ddxInputThreadInit(void) ++{ ++} ++#endif ++ + void ddxUseMsg(void) + { + vncPrintBanner(); Modified: head/x11-drivers/xf86-input-egalax/Makefile ============================================================================== --- head/x11-drivers/xf86-input-egalax/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-egalax/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,7 +3,7 @@ PORTNAME= xf86-input-egalax PORTVERSION= 0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= glebius@FreeBSD.org Modified: head/x11-drivers/xf86-input-elographics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-elographics/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-elographics/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-elographics PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-evdev/Makefile ============================================================================== --- head/x11-drivers/xf86-input-evdev/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-evdev/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-evdev PORTVERSION= 2.10.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-joystick/Makefile ============================================================================== --- head/x11-drivers/xf86-input-joystick/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-joystick/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-joystick PORTVERSION= 1.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-keyboard/Makefile ============================================================================== --- head/x11-drivers/xf86-input-keyboard/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-keyboard/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-keyboard PORTVERSION= 1.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-libinput/Makefile ============================================================================== --- head/x11-drivers/xf86-input-libinput/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-libinput/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-libinput PORTVERSION= 0.28.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-mouse/Makefile ============================================================================== --- head/x11-drivers/xf86-input-mouse/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-mouse/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.9.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-synaptics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-synaptics/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-synaptics/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-synaptics PORTVERSION= 1.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-vmmouse/Makefile ============================================================================== --- head/x11-drivers/xf86-input-vmmouse/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-vmmouse/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,7 +3,7 @@ PORTNAME= xf86-input-vmmouse PORTVERSION= 13.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-void/Makefile ============================================================================== --- head/x11-drivers/xf86-input-void/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-void/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-void PORTVERSION= 1.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-wacom/Makefile ============================================================================== --- head/x11-drivers/xf86-input-wacom/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-input-wacom/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-wacom PORTVERSION= 0.39.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MASTER_SITES= https://github.com/linuxwacom/${PORTNAME}/releases/download/${DISTNAME}/ Modified: head/x11-drivers/xf86-video-amdgpu/Makefile ============================================================================== --- head/x11-drivers/xf86-video-amdgpu/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-amdgpu/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -4,6 +4,7 @@ PORTNAME= xf86-video-amdgpu PORTVERSION= 19.1.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-apm/Makefile ============================================================================== --- head/x11-drivers/xf86-video-apm/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-apm/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-apm PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-ark/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ark/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-ark/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ark PORTVERSION= 0.7.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-ast/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ast/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-ast/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ast PORTVERSION= 1.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-ati-legacy/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ati-legacy/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-ati-legacy/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ati-legacy PORTVERSION= 7.9.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11-drivers DISTNAME= xf86-video-ati-${DISTVERSION} Modified: head/x11-drivers/xf86-video-ati/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ati/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-ati/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-ati PORTVERSION= 19.1.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-drivers Modified: head/x11-drivers/xf86-video-chips/Makefile ============================================================================== --- head/x11-drivers/xf86-video-chips/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-chips/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-chips PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-cirrus/Makefile ============================================================================== --- head/x11-drivers/xf86-video-cirrus/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-cirrus/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-cirrus PORTVERSION= 1.5.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-dummy/Makefile ============================================================================== --- head/x11-drivers/xf86-video-dummy/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-dummy/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-dummy PORTVERSION= 0.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-geode/Makefile ============================================================================== --- head/x11-drivers/xf86-video-geode/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-geode/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-geode PORTVERSION= 2.11.20 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-glint/Makefile ============================================================================== --- head/x11-drivers/xf86-video-glint/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-glint/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-glint PORTVERSION= 1.2.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-i128/Makefile ============================================================================== --- head/x11-drivers/xf86-video-i128/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-i128/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-i740/Makefile ============================================================================== --- head/x11-drivers/xf86-video-i740/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-i740/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,8 @@ PORTNAME= xf86-video-i740 PORTVERSION= 1.4.0 -CATEGORIES= x11-drivers +PORTREVISION= 1 +CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org i740 display driver Modified: head/x11-drivers/xf86-video-intel/Makefile ============================================================================== --- head/x11-drivers/xf86-video-intel/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-intel/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,6 +3,7 @@ PORTNAME= xf86-video-intel PORTVERSION= 2.99.917.20181203 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-mach64/Makefile ============================================================================== --- head/x11-drivers/xf86-video-mach64/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-mach64/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-mach64 PORTVERSION= 6.9.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-mga/Makefile ============================================================================== --- head/x11-drivers/xf86-video-mga/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-mga/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-mga PORTVERSION= 2.0.0 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= x11-drivers Modified: head/x11-drivers/xf86-video-neomagic/Makefile ============================================================================== --- head/x11-drivers/xf86-video-neomagic/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-neomagic/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-neomagic PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-nv/Makefile ============================================================================== --- head/x11-drivers/xf86-video-nv/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-nv/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-nv PORTVERSION= 2.1.21 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-openchrome/Makefile ============================================================================== --- head/x11-drivers/xf86-video-openchrome/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-openchrome/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-openchrome PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-qxl/Makefile ============================================================================== --- head/x11-drivers/xf86-video-qxl/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-qxl/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-qxl DISTVERSION= 0.1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-r128/Makefile ============================================================================== --- head/x11-drivers/xf86-video-r128/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-r128/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-r128 PORTVERSION= 6.12.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-rendition/Makefile ============================================================================== --- head/x11-drivers/xf86-video-rendition/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-rendition/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-rendition PORTVERSION= 4.2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-s3/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-s3/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-s3virge/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3virge/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-s3virge/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-s3virge PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-savage/Makefile ============================================================================== --- head/x11-drivers/xf86-video-savage/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-savage/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-savage PORTVERSION= 2.3.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-scfb/Makefile ============================================================================== --- head/x11-drivers/xf86-video-scfb/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-scfb/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,6 +3,7 @@ PORTNAME= xf86-video-scfb PORTVERSION= 0.0.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-siliconmotion/Makefile ============================================================================== --- head/x11-drivers/xf86-video-siliconmotion/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-siliconmotion/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-siliconmotion PORTVERSION= 1.7.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-sis/Makefile ============================================================================== --- head/x11-drivers/xf86-video-sis/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-sis/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-sis PORTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-sunffb/Makefile ============================================================================== --- head/x11-drivers/xf86-video-sunffb/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-sunffb/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-tdfx/Makefile ============================================================================== --- head/x11-drivers/xf86-video-tdfx/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-tdfx/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-tdfx PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-trident/Makefile ============================================================================== --- head/x11-drivers/xf86-video-trident/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-trident/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-trident PORTVERSION= 1.3.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-tseng/Makefile ============================================================================== --- head/x11-drivers/xf86-video-tseng/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-tseng/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tseng PORTVERSION= 1.2.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-vesa/Makefile ============================================================================== --- head/x11-drivers/xf86-video-vesa/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-vesa/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-vesa PORTVERSION= 2.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-vmware/Makefile ============================================================================== --- head/x11-drivers/xf86-video-vmware/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-vmware/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-vmware PORTVERSION= 13.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-voodoo/Makefile ============================================================================== --- head/x11-drivers/xf86-video-voodoo/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xf86-video-voodoo/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-voodoo PORTVERSION= 1.2.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xorg-drivers/Makefile ============================================================================== --- head/x11-drivers/xorg-drivers/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xorg-drivers/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,7 @@ PORTNAME= xorg-drivers PORTVERSION= 7.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -53,6 +53,7 @@ VIDEO_DRIVERS= apm \ voodoo OPTIONS_DEFAULT= KEYBOARD \ + LIBINPUT \ MOUSE \ SCFB Modified: head/x11-drivers/xorgxrdp/Makefile ============================================================================== --- head/x11-drivers/xorgxrdp/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-drivers/xorgxrdp/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -3,6 +3,7 @@ PORTNAME= xorgxrdp DISTVERSIONPREFIX= v DISTVERSION= 0.2.12 +PORTREVISION= 1 CATEGORIES= x11-drivers DIST_SUBDIR= xrdp Modified: head/x11-servers/xephyr/Makefile ============================================================================== --- head/x11-servers/xephyr/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-servers/xephyr/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -16,8 +16,6 @@ MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes -OPTIONS_EXCLUDE=DEVD HAL SUID UDEV - USE_XORG= x11 xcb CONFIGURE_ARGS+=--enable-xephyr --disable-dmx --disable-xnest --disable-xvfb \ Modified: head/x11-servers/xorg-dmx/Makefile ============================================================================== --- head/x11-servers/xorg-dmx/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-servers/xorg-dmx/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -11,8 +11,6 @@ MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes -OPTIONS_EXCLUDE=DEVD HAL SUID UDEV - USE_XORG= dmx xorgproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ Modified: head/x11-servers/xorg-nestserver/Makefile ============================================================================== --- head/x11-servers/xorg-nestserver/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-servers/xorg-nestserver/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= xorg-nestserver -PORTVERSION= 1.19.1 PORTEPOCH= 2 COMMENT= Nesting X server from X.Org @@ -11,31 +10,16 @@ LICENSE= MIT MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr -DISTINFO_FILE= ${.CURDIR}/distinfo -PATCHDIR= ${.CURDIR}/files RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config SLAVE_PORT= yes -OPTIONS_EXCLUDE=DEVD HAL SUID UDEV +USE_XORG= x11 xext -USE_XORG= x11 xext xfont2 - CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb \ --disable-xwayland PLIST_FILES= bin/Xnest man/man1/Xnest.1.gz - -EXTRA_PATCHES= ${MASTERDIR}/files/patch-CVE-2017-12176 \ - ${MASTERDIR}/files/patch-CVE-2017-12177 \ - ${MASTERDIR}/files/patch-CVE-2017-12178 \ - ${MASTERDIR}/files/patch-CVE-2017-12179 \ - ${MASTERDIR}/files/patch-CVE-2017-12183 \ - ${MASTERDIR}/files/patch-CVE-2017-1218x \ - ${MASTERDIR}/files/patch-CVE-2017-1218y \ - ${MASTERDIR}/files/patch-CVE-2017-13721 \ - ${MASTERDIR}/files/patch-CVE-2017-13723 \ - ${MASTERDIR}/files/patch-os_io.c do-install: cd ${WRKSRC}/hw/xnest; DESTDIR=${STAGEDIR} ${MAKE} install Modified: head/x11-servers/xorg-server/Makefile ============================================================================== --- head/x11-servers/xorg-server/Makefile Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-servers/xorg-server/Makefile Thu Feb 20 21:15:44 2020 (r526589) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= xorg-server -PORTVERSION?= 1.18.4 -PORTREVISION?= 13 +PORTVERSION?= 1.20.7 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -22,14 +22,24 @@ SLAVE_PORT?= no OPTIONS_SUB= yes OPTIONS_DEFINE= SUID OPTIONS_RADIO= CONF -OPTIONS_RADIO_CONF= DEVD HAL UDEV +OPTIONS_RADIO_CONF= DEVD UDEV +OPTIONS_DEFAULT= SUID +OPTIONS_DEFAULT_FreeBSD_11= DEVD +OPTIONS_DEFAULT_FreeBSD_12= UDEV +OPTIONS_DEFAULT_FreeBSD_13= UDEV +OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} + +SUID_DESC= Install setuid wrapper to allow startx as non-root +CONF_DESC= Backend to use for input device configuration DEVD_DESC= Use devd for autoconfiguration of input devices -HAL_DESC= Use hald for autoconfiguration of input devices UDEV_DESC= Use udev via libudev-devd for autoconfiguration of input devices -SUID_DESC= Install the Xorg server with setuid bit set -OPTIONS_DEFAULT=DEVD SUID -OPTIONS_EXCLUDE_sparc64= HAL +DEVD_CONFIGURE_ENABLE= config-devd +SUID_CONFIGURE_ENABLE= suid-wrapper +SUID_CONFIGURE_ON= --libexecdir=${PREFIX}/bin # set SUID_WRAPPER_DIR +UDEV_CONFIGURE_ENABLE= config-udev +UDEV_CONFIGURE_ON= --disable-config-udev-kms +UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd .include <bsd.port.options.mk> @@ -46,15 +56,14 @@ DEFAULT_FONTPATH_LIST= \ DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" -USES= gmake gl libtool perl5 ssl tar:bzip2 xorg xorg-cat:xserver +USES= gl gmake perl5 ssl xorg xorg-cat:xserver USE_PERL5= build USE_GL+= gl -USE_XORG+= pixman xau xdmcp xfont xkbfile xorgproto xshmfence xtrans +USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ - --localstatedir=/var --with-shared-memory-dir=/tmp \ - --disable-config-udev-kms --disable-systemd-logind \ - --without-dtrace --enable-glamor + --without-dtrace --with-shared-memory-dir=/tmp \ + --disable-install-setuid --disable-unit-tests INSTALL_TARGET= install-strip .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" @@ -71,9 +80,9 @@ CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disab --disable-xwayland --enable-xcsecurity SUB_FILES= pkg-install pkg-deinstall .else -CONFIGURE_ARGS+=--disable-xorg -# for slave ports we need to overwrite PLIST, so it doesn't overwrite -# PLIST_FILES, with the masterport plist. +CONFIGURE_ARGS+= --disable-xorg +OPTIONS_EXCLUDE= DEVD UDEV SUID +# Set PLIST for slave ports so they only need to set PLIST_FILES PLIST= ${.CURDIR}/pkg-plist .endif @@ -86,23 +95,6 @@ PLIST= ${.CURDIR}/pkg-plist CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif -.if ${PORT_OPTIONS:MHAL} -LIB_DEPENDS+= libhal.so:sysutils/hal -CONFIGURE_ARGS+= --enable-config-hal -.else -CONFIGURE_ARGS+= --disable-config-hal -.endif - -.if ${PORT_OPTIONS:MUDEV} -LIB_DEPENDS+= libudev.so:devel/libudev-devd -CONFIGURE_ARGS+= --enable-config-udev -.else -CONFIGURE_ARGS+= --disable-config-udev -.endif - -# We handle Xorg setuid in the plist. This allows to build xorg-server as a user. -CONFIGURE_ARGS+=--disable-install-setuid - .if ${ARCH} == "i386" || ${ARCH} == "amd64" LIB_DEPENDS+= libunwind.so:devel/libunwind .endif @@ -113,42 +105,21 @@ PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64="@comment " .endif -.if ${PORT_OPTIONS:MSUID} -pre-everything:: - @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by" - @${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper" - @${ECHO_MSG} "port before handling them normally. If you are concerned about the security" - @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm," - @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set" - @${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf." -.endif - post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure -# build libglx.so but don't install it yet. which is done in pre-install. - @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \ - -e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \ - ${WRKSRC}/hw/xfree86/dixmods/Makefile.in -post-configure: -.if ${PORT_OPTIONS:MDEVD} - @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ - -e 's|config\.lo|config.lo devd.lo|g' \ - ${WRKSRC}/config/Makefile - @${REINPLACE_CMD} -e 's|^/\* #undef CONFIG_UDEV \*/|#define CONFIG_DEVD 1|' \ - ${WRKSRC}/include/dix-config.h -.endif - .if ${SLAVE_PORT} == "no" post-install: -# The .xorg dir because else the xorg-server might not load the correct -# libglx module. +# Avoid conflict with nvidia-driver, move libglx.so into .xorg directory @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg - ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ + ${MV} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so \ ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d @${MKDIR} ${STAGEDIR}${FONTPATHD} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d + @${INSTALL_DATA} ${FILESDIR}/20-evdev-kbd.conf \ + ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d .endif # ! SLAVE_PORT .include <bsd.port.post.mk> Modified: head/x11-servers/xorg-server/distinfo ============================================================================== --- head/x11-servers/xorg-server/distinfo Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-servers/xorg-server/distinfo Thu Feb 20 21:15:44 2020 (r526589) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484803304 -SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 -SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508 +TIMESTAMP = 1580036705 +SHA256 (xorg/xserver/xorg-server-1.20.7.tar.bz2) = bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1 +SIZE (xorg/xserver/xorg-server-1.20.7.tar.bz2) = 6303005 Added: head/x11-servers/xorg-server/files/20-evdev-kbd.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/20-evdev-kbd.conf Thu Feb 20 21:15:44 2020 (r526589) @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "Evdev keyboard" + MatchDevicePath "/dev/input/event*" + MatchIsKeyboard "on" + Option "XkbRules" "evdev" +EndSection Added: head/x11-servers/xorg-server/files/config_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/config_Makefile.am Thu Feb 20 21:15:44 2020 (r526589) @@ -0,0 +1,16 @@ +* Build the devd config backend if activated +* +--- config/Makefile.am.orig 2017-03-16 05:24:43 UTC ++++ config/Makefile.am +@@ -4,6 +4,11 @@ noinst_LTLIBRARIES = libconfig.la + libconfig_la_SOURCES = config.c config-backends.h + libconfig_la_LIBADD = + ++if CONFIG_DEVD ++libconfig_la_SOURCES += devd.c ++libconfig_la_LIBADD += -lusbhid ++endif ++ + if NEED_DBUS + AM_CFLAGS += $(DBUS_CFLAGS) + libconfig_la_SOURCES += dbus-core.c Added: head/x11-servers/xorg-server/files/configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/configure.ac Thu Feb 20 21:15:44 2020 (r526589) @@ -0,0 +1,97 @@ +* Plumb the devd config backend into configure +* +* define USE_DEV_IO for ARM platforms +* +* Only run pkg-config for udev if it is not disabled to prevent over-linking +* +* Automatically use systemd/logind only on Linux +* +--- configure.ac.orig 2017-03-15 18:05:25 UTC ++++ configure.ac +@@ -266,9 +266,12 @@ case $host_cpu in + esac + GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" + ;; +- arm*) ++ arm*|aarch64*) + ARM_VIDEO=yes + DEFAULT_INT10="stub" ++ case $host_os in ++ *freebsd*) AC_DEFINE(USE_DEV_IO) ;; ++ esac + ;; + i*86) + I386_VIDEO=yes +@@ -565,6 +568,7 @@ AC_ARG_ENABLE(xcsecurity, AS_HELP_ST + AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) + AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no]) + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) ++AC_ARG_ENABLE(config-devd, AS_HELP_STRING([--enable-config-devd], [Build devd support (default: auto)]), [CONFIG_DEVD=$enableval], [CONFIG_DEVD=auto]) + AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) + AC_ARG_ENABLE(config-udev-kms, AS_HELP_STRING([--enable-config-udev-kms], [Build udev kms support (default: auto)]), [CONFIG_UDEV_KMS=$enableval], [CONFIG_UDEV_KMS=auto]) + AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) +@@ -856,10 +860,27 @@ if test "x$CONFIG_UDEV" = xyes && test " + AC_MSG_ERROR([Hotplugging through both libudev and hal not allowed]) + fi + +-PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no]) +-if test "x$CONFIG_UDEV" = xauto; then +- CONFIG_UDEV="$HAVE_LIBUDEV" +- AC_DEFINE(HAVE_LIBUDEV, 1, [Define to 1 if libudev is available.]) ++if test "x$CONFIG_DEVD" = xauto; then ++ case $host_os in ++ *freebsd*) ++ CONFIG_DEVD=yes ++ ;; ++ *) ++ CONFIG_DEVD=no ++ ;; ++ esac ++fi ++AM_CONDITIONAL(CONFIG_DEVD, [test "x$CONFIG_DEVD" = xyes]) ++if test "x$CONFIG_DEVD" = xyes; then ++ AC_DEFINE(CONFIG_DEVD, 1, [Use devd for input auto configuration]) ++fi ++ ++if test "x$CONFIG_UDEV" != xno; then ++ PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no]) ++ if test "x$CONFIG_UDEV" = xauto; then ++ CONFIG_UDEV="$HAVE_LIBUDEV" ++ AC_DEFINE(HAVE_LIBUDEV, 1, [Define to 1 if libudev is available.]) ++ fi + fi + AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes]) + if test "x$CONFIG_UDEV" = xyes; then +@@ -907,7 +928,14 @@ AM_CONDITIONAL(CONFIG_HAL, [test "x$CONF + + if test "x$SYSTEMD_LOGIND" = xauto; then + if test "x$HAVE_DBUS" = xyes -a "x$CONFIG_UDEV" = xyes ; then +- SYSTEMD_LOGIND=yes ++ case $host_os in ++ *linux*) ++ SYSTEMD_LOGIND=yes ++ ;; ++ *) ++ SYSTEMD_LOGIND=no ++ ;; ++ esac + else + SYSTEMD_LOGIND=no + fi +@@ -2467,12 +2495,12 @@ AC_SUBST([prefix]) + + AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep]) + +-if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then ++if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno && test "x$CONFIG_DEVD" = xno; then + AC_MSG_WARN([ +- *********************************************** +- Neither HAL nor udev backend will be enabled. ++ ***************************************************** ++ Neither HAL, devd, nor udev backend will be enabled. + Input device hotplugging will not be available! +- ***********************************************]) ++ *****************************************************]) + fi + + AC_CONFIG_FILES([ Added: head/x11-servers/xorg-server/files/hw_xfree86_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/hw_xfree86_Makefile.am Thu Feb 20 21:15:44 2020 (r526589) @@ -0,0 +1,14 @@ +* Don't overwrite Xorg binary with Xorg.sh when SUID_WRAPPER_DIR == bindir +* Instead, relink bin/X to Xorg.wrap rather than to Xorg (which isn't Xorg.sh) +* +--- hw/xfree86/Makefile.am.orig 2017-03-16 05:24:43 UTC ++++ hw/xfree86/Makefile.am +@@ -114,7 +114,7 @@ endif + if SUID_WRAPPER + $(MKDIR_P) $(DESTDIR)$(SUID_WRAPPER_DIR) + mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg +- ${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg ++ (test ! -f $(DESTDIR)$(bindir)/Xorg && ${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg || cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg.wrap$(EXEEXT) X) + -chown 0 $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap + endif + Modified: head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in ============================================================================== --- head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in Thu Feb 20 20:38:00 2020 (r526588) +++ head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in Thu Feb 20 21:15:44 2020 (r526589) @@ -1,6 +1,6 @@ --- hw/xfree86/os-support/misc/Makefile.in.orig 2015-09-23 10:21:18.470900000 +0200 +++ hw/xfree86/os-support/misc/Makefile.in 2015-09-23 10:22:34.979974000 +0200 -@@ -530,7 +530,8 @@ +@@ -543,7 +543,8 @@ #AM_LDFLAGS = -r AM_CPPFLAGS = $(XORG_INCS) Added: head/x11-servers/xorg-server/files/patch-config_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/patch-config_Makefile.in Thu Feb 20 21:15:44 2020 (r526589) @@ -0,0 +1,100 @@ +* generated from patched Makefile.am; revise and regen instead of editing +* +* Build the devd config backend if activated +* +--- config/Makefile.in.orig 2017-03-16 05:24:43 UTC ++++ config/Makefile.in *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002202115.01KLFjmR003071>