From owner-svn-ports-all@freebsd.org Tue Feb 25 17:32:04 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C46DD239A6E; Tue, 25 Feb 2020 17:32:04 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48RmFw4Q72z4L0X; Tue, 25 Feb 2020 17:32:04 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8487C1A212; Tue, 25 Feb 2020 17:32:04 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01PHW4Vw035924; Tue, 25 Feb 2020 17:32:04 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01PHW4hn035922; Tue, 25 Feb 2020 17:32:04 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <202002251732.01PHW4hn035922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Tue, 25 Feb 2020 17:32:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527097 - head/x11-servers/xorg-server X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/x11-servers/xorg-server X-SVN-Commit-Revision: 527097 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2020 17:32:04 -0000 Author: jrm Date: Tue Feb 25 17:32:03 2020 New Revision: 527097 URL: https://svnweb.freebsd.org/changeset/ports/527097 Log: x11-servers/xorg-server: Restore FIXDRM as an off-by-default knob This is a workaround for a problem with certain systems [1] after x11-servers/xorg-server was upgraded to 1.20.7. Other workarounds are described in PR 244306. [1] These systems have been reported to have problems: Sandy Bridge Ivy Bridge Broadwell Kaby Lake Whiskey Lake PR: 244306 Submitted by: wulf Reported by: philippe.michel7@free.fr Approved by: x11 (zeising) Differential Revision: https://reviews.freebsd.org/D23834 Modified: head/x11-servers/xorg-server/Makefile (contents, props changed) head/x11-servers/xorg-server/pkg-message (contents, props changed) Modified: head/x11-servers/xorg-server/Makefile ============================================================================== --- head/x11-servers/xorg-server/Makefile Tue Feb 25 16:13:36 2020 (r527096) +++ head/x11-servers/xorg-server/Makefile Tue Feb 25 17:32:03 2020 (r527097) @@ -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 @@ RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-conf 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 @@ 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 @@ -81,7 +82,7 @@ CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disab 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 @@ PLIST_SUB+= SPARC64="" .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;/' \ Modified: head/x11-servers/xorg-server/pkg-message ============================================================================== --- head/x11-servers/xorg-server/pkg-message Tue Feb 25 16:13:36 2020 (r527096) +++ head/x11-servers/xorg-server/pkg-message Tue Feb 25 17:32:03 2020 (r527097) @@ -21,6 +21,8 @@ To make it persistent across reboots, add the followin 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 } ]