Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jul 2020 20:59:38 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r541134 - branches/2020Q3/graphics/mesa-dri
Message-ID:  <202007032059.063KxcGn071117@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: manu
Date: Fri Jul  3 20:59:38 2020
New Revision: 541134
URL: https://svnweb.freebsd.org/changeset/ports/541134

Log:
  MFH: mesa-dri: Use gallium SWRAST on x86 and aarch64
  
  Mesa have two software rasterizer, the classic mesa dri one and
  the gallium one.
  The classic dri one is starting to be deprecated upstream (like all
  dri drivers) so switch the arches that can build the gallium one to it.
  
  Approved by:	portmgr (bapt@)

Modified:
  branches/2020Q3/graphics/mesa-dri/Makefile
  branches/2020Q3/graphics/mesa-dri/pkg-plist
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/graphics/mesa-dri/Makefile
==============================================================================
--- branches/2020Q3/graphics/mesa-dri/Makefile	Fri Jul  3 20:29:33 2020	(r541133)
+++ branches/2020Q3/graphics/mesa-dri/Makefile	Fri Jul  3 20:59:38 2020	(r541134)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
@@ -42,8 +42,10 @@ ALL_DRI_DRIVERS=	I915 I965 R100 R200 SWRAST
 ALL_GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA SWRAST
 ALL_VULKAN_DRIVERS=	INTEL AMD
 
-.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
-DRI_DRIVERS=	SWRAST	# llvmpipe
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
+GALLIUM_DRIVERS+=	SWRAST	# llvmpipe
+.elif ${ARCH:Marm*} || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
+DRI_DRIVERS+=		SWRAST # Mesa Classic swrast
 .endif
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \

Modified: branches/2020Q3/graphics/mesa-dri/pkg-plist
==============================================================================
--- branches/2020Q3/graphics/mesa-dri/pkg-plist	Fri Jul  3 20:29:33 2020	(r541133)
+++ branches/2020Q3/graphics/mesa-dri/pkg-plist	Fri Jul  3 20:59:38 2020	(r541134)
@@ -17,6 +17,7 @@ include/GL/internal/dri_interface.h
 %%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
 %%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so
 %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
+%%SWRAST_GDRIVER%%lib/dri/swrast_dri.so
 %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
 %%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so
 %%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007032059.063KxcGn071117>