Attachment 211830 Details for Bug 244306 – Restore xorg-server's FIXDRM option

[patch] Restore xorg-server's FIXDRM option

xorg.1.20.7.fixdrm.patch (text/plain), 1.42 KB, created by Vladimir Kondratyev on 2020-02-22 12:48:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Kondratyev

Created: 2020-02-22 12:48:34 UTC

Size: 1.42 KB

patch

obsolete

>Index: x11-servers/xorg-server/Makefile
>===================================================================
>--- x11-servers/xorg-server/Makefile	(revision 526744)
>+++ x11-servers/xorg-server/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> SLAVE_PORT?=	no
> 
> OPTIONS_SUB=	yes
>-OPTIONS_DEFINE=	SUID
>+OPTIONS_DEFINE=	SUID FIXDRM
> OPTIONS_RADIO=	CONF
> OPTIONS_RADIO_CONF=	DEVD UDEV
> OPTIONS_DEFAULT=	SUID
>@@ -33,6 +33,7 @@
> CONF_DESC=	Backend to use for input device configuration
> DEVD_DESC=	Use devd for autoconfiguration of input devices
> UDEV_DESC=	Use udev via libudev-devd for autoconfiguration of input devices
>+FIXDRM_DESC=	Enable glamor workaround for drm-devel-kmod bug
> 
> DEVD_CONFIGURE_ENABLE=	config-devd
> SUID_CONFIGURE_ENABLE=	suid-wrapper
>@@ -81,7 +82,7 @@
> SUB_FILES=	pkg-install pkg-deinstall
> .else
> CONFIGURE_ARGS+=	--disable-xorg
>-OPTIONS_EXCLUDE=	DEVD UDEV SUID
>+OPTIONS_EXCLUDE=	DEVD UDEV SUID FIXDRM
> # Set PLIST for slave ports so they only need to set PLIST_FILES
> PLIST=		${.CURDIR}/pkg-plist
> .endif
>@@ -105,6 +106,12 @@
> PLIST_SUB+=	SPARC64="@comment "
> .endif
> 
>+post-patch-FIXDRM-on:
>+# Workaround xfwm-4.12 lockups with modesetting driver on 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

Actions: View | Diff

Attachments on bug 244306: 211830 | 211930