summaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-03-08 19:27:27 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-03-08 19:27:27 +0000
commit121ae90af1478922bd6e8e96a81f210a96806aa8 (patch)
tree65aadbca6f6abe7bb7d71b1e33d4f454e7f0f7de /x11-servers
parentmail/phplist update to 3.5.1 (diff)
graphics/mesa-libs: Change default to use DRI3
Change the default mesa configuration to use DRI3 rather than the older DRI2 interface. This should improve performance somewhat, and alleviates the need for the FIXDRM option in x11-servers/xorg-server. Remove the FIXDRM option from x11-servers/xorg-server. Add an UPDATING entry for the change. For users of graphics/drm-legacy-kmod or the base graphics drivers, this might cause regressions. If you experience problems when running OpenGL applications please force the use of the DRI2 backend by setting the LIBGL_DRI3_DISABLE environment variable to 1 before starting any OpenGL application. This is easiest done by adding it to your shell startup file or .xinitrc. Add UPDATING entry for xorg-server, detailing the change of device configuration backend. PR: 196678, 244306 (for tracking)
Notes
Notes: svn path=/head/; revision=528071
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile13
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