View | Details | Raw Unified | Return to bug 244306 | Differences between
and this patch

Collapse All | Expand All

(-)x11-servers/xorg-server/Makefile (-2 / +9 lines)
Lines 20-26 Link Here
20
SLAVE_PORT?=	no
20
SLAVE_PORT?=	no
21
21
22
OPTIONS_SUB=	yes
22
OPTIONS_SUB=	yes
23
OPTIONS_DEFINE=	SUID
23
OPTIONS_DEFINE=	SUID FIXDRM
24
OPTIONS_RADIO=	CONF
24
OPTIONS_RADIO=	CONF
25
OPTIONS_RADIO_CONF=	DEVD UDEV
25
OPTIONS_RADIO_CONF=	DEVD UDEV
26
OPTIONS_DEFAULT=	SUID
26
OPTIONS_DEFAULT=	SUID
Lines 33-38 Link Here
33
CONF_DESC=	Backend to use for input device configuration
33
CONF_DESC=	Backend to use for input device configuration
34
DEVD_DESC=	Use devd for autoconfiguration of input devices
34
DEVD_DESC=	Use devd for autoconfiguration of input devices
35
UDEV_DESC=	Use udev via libudev-devd for autoconfiguration of input devices
35
UDEV_DESC=	Use udev via libudev-devd for autoconfiguration of input devices
36
FIXDRM_DESC=	Enable glamor workaround for drm-devel-kmod bug
36
37
37
DEVD_CONFIGURE_ENABLE=	config-devd
38
DEVD_CONFIGURE_ENABLE=	config-devd
38
SUID_CONFIGURE_ENABLE=	suid-wrapper
39
SUID_CONFIGURE_ENABLE=	suid-wrapper
Lines 81-87 Link Here
81
SUB_FILES=	pkg-install pkg-deinstall
82
SUB_FILES=	pkg-install pkg-deinstall
82
.else
83
.else
83
CONFIGURE_ARGS+=	--disable-xorg
84
CONFIGURE_ARGS+=	--disable-xorg
84
OPTIONS_EXCLUDE=	DEVD UDEV SUID
85
OPTIONS_EXCLUDE=	DEVD UDEV SUID FIXDRM
85
# Set PLIST for slave ports so they only need to set PLIST_FILES
86
# Set PLIST for slave ports so they only need to set PLIST_FILES
86
PLIST=		${.CURDIR}/pkg-plist
87
PLIST=		${.CURDIR}/pkg-plist
87
.endif
88
.endif
Lines 105-110 Link Here
105
PLIST_SUB+=	SPARC64="@comment "
106
PLIST_SUB+=	SPARC64="@comment "
106
.endif
107
.endif
107
108
109
post-patch-FIXDRM-on:
110
# Workaround xfwm-4.12 lockups with modesetting driver on drm-kmod 4.16+
111
# with partial revert of commit 86b2d8740a330deafe8a9bbf0402705a43efbb42
112
	@${REINPLACE_CMD} '/glamor_make_pixmap_exportable/ s/FALSE/TRUE/' \
113
		${WRKSRC}/glamor/glamor_egl.c
114
108
post-patch:
115
post-patch:
109
	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
116
	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
110
		${WRKSRC}/configure
117
		${WRKSRC}/configure

Return to bug 244306