diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2020-03-08 19:27:27 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2020-03-08 19:27:27 +0000 |
| commit | 121ae90af1478922bd6e8e96a81f210a96806aa8 (patch) | |
| tree | 65aadbca6f6abe7bb7d71b1e33d4f454e7f0f7de /x11-servers | |
| parent | 5375cd49403517c5c61f0b3f6081cc2eb327cfd8 (diff) | |
| download | ports-121ae90af1478922bd6e8e96a81f210a96806aa8.tar.gz ports-121ae90af1478922bd6e8e96a81f210a96806aa8.zip | |
Notes
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index ed6e44977437..4da5c25467dd 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.20.7 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -20,7 +20,7 @@ RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ SLAVE_PORT?= no OPTIONS_SUB= yes -OPTIONS_DEFINE= FIXDRM SUID +OPTIONS_DEFINE= SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= DEVD UDEV OPTIONS_DEFAULT= SUID @@ -32,7 +32,6 @@ 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 -FIXDRM_DESC= Enable glamor workaround for drm-kmod bug UDEV_DESC= Use udev via libudev-devd for autoconfiguration of input devices DEVD_CONFIGURE_ENABLE= config-devd @@ -82,7 +81,7 @@ CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ SUB_FILES= pkg-install pkg-deinstall .else CONFIGURE_ARGS+= --disable-xorg -OPTIONS_EXCLUDE= DEVD FIXDRM UDEV SUID +OPTIONS_EXCLUDE= DEVD UDEV SUID # Set PLIST for slave ports so they only need to set PLIST_FILES PLIST= ${.CURDIR}/pkg-plist .endif @@ -106,12 +105,6 @@ PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64="@comment " .endif -post-patch-FIXDRM-on: -# Workaround lockups with modesetting driver using drm-kmod 4.16+ with partial -# revert of commit 86b2d8740a330deafe8a9bbf0402705a43efbb42 - @${REINPLACE_CMD} '/glamor_make_pixmap_exportable/ s/FALSE/TRUE/' \ - ${WRKSRC}/glamor/glamor_egl.c - post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure |