Page MenuHomeFreeBSD
Files F142179676

D23834.diff
No OneTemporary
Actions

D23834.diff
View Options

Index: head/x11-servers/xorg-server/Makefile
===================================================================
--- head/x11-servers/xorg-server/Makefile
+++ head/x11-servers/xorg-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= xorg-server
PORTVERSION?= 1.20.7
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG/individual/xserver
@@ -20,7 +20,7 @@
SLAVE_PORT?= no
OPTIONS_SUB= yes
-OPTIONS_DEFINE= SUID
+OPTIONS_DEFINE= FIXDRM SUID
OPTIONS_RADIO= CONF
OPTIONS_RADIO_CONF= DEVD UDEV
OPTIONS_DEFAULT= SUID
@@ -32,6 +32,7 @@
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
@@ -81,7 +82,7 @@
SUB_FILES= pkg-install pkg-deinstall
.else
CONFIGURE_ARGS+= --disable-xorg
-OPTIONS_EXCLUDE= DEVD UDEV SUID
+OPTIONS_EXCLUDE= DEVD FIXDRM UDEV SUID
# Set PLIST for slave ports so they only need to set PLIST_FILES
PLIST= ${.CURDIR}/pkg-plist
.endif
@@ -104,6 +105,12 @@
.else
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;/' \
Index: head/x11-servers/xorg-server/pkg-message
===================================================================
--- head/x11-servers/xorg-server/pkg-message
+++ head/x11-servers/xorg-server/pkg-message
@@ -21,6 +21,8 @@
kern.evdev.rcpt_mask=6
+If your X session locks up after starting certain applications, rebuild this
+port with the FIXDRM option turned on.
EOM
}
]

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 17, 9:28 PM (8 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27674483
Default Alt Text
D23834.diff (1 KB)

Event Timeline