svn commit: r528071 - in head: . graphics/mesa-dri/files graphics/mesa-libs x11-servers/xorg-server

[Niclas Zeising]

Author: zeising
Date: Sun Mar  8 19:27:27 2020
New Revision: 528071
URL: https://svnweb.freebsd.org/changeset/ports/528071

Log:
  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)

Deleted:
  head/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c
  head/graphics/mesa-dri/files/patch-src_glx_glxext.c
Modified:
  head/UPDATING
  head/graphics/mesa-libs/Makefile
  head/x11-servers/xorg-server/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Mar  8 19:16:10 2020	(r528070)
+++ head/UPDATING	Sun Mar  8 19:27:27 2020	(r528071)
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200308
+  AFFECTS: users of graphics/mesa-libs and legacy graphics drivers
+  AUTHOR: zeising at FreeBSD.org
+
+  The mesa OpenGL library (graphics/mesa-libs) has been switched to use DRI3
+  by default, instead of the older DRI2 interface.  This might cause regressions
+  when using the legacy graphics drivers, either through
+  graphics/drm-legacy-kmod or the graphics drivers in base.
+  
+  If you experience issues when running OpenGL applications it is possible
+  to force the use of DRI2 by setting the LIBGL_DRI3_DISABLE environment
+  variable to 1 before starting any OpenGL application.  The easiest way to
+  do this is by adding it to either your shell startup files or .xinitrc.
+
 20200306
   AFFECTS: users of databases/mysql80-server
   AUTHOR: joneum at FreeBSD.org

Modified: head/graphics/mesa-libs/Makefile
==============================================================================
--- head/graphics/mesa-libs/Makefile	Sun Mar  8 19:16:10 2020	(r528070)
+++ head/graphics/mesa-libs/Makefile	Sun Mar  8 19:27:27 2020	(r528071)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Sun Mar  8 19:16:10 2020	(r528070)
+++ head/x11-servers/xorg-server/Makefile	Sun Mar  8 19:27:27 2020	(r528071)
@@ -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-conf
 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 --disab
 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
@@ -105,12 +104,6 @@ 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;/' \