ports/154651: [PATCH] graphics/dri: make it possible to choose which DRI drivers will be built

[b.f.]

>Number:         154651
>Category:       ports
>Synopsis:       [PATCH] graphics/dri: make it possible to choose which DRI drivers will be built
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 10 13:10:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     b.f.
>Release:        9-CURRENT amd64
>Organization:
-
>Environment:
>Description:
Many people don't want or need all of the DRI drivers -- make it possible to build a chosen subset of drivers, while still building all by default.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/dri/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile	25 Mar 2010 23:11:21 -0000	1.35
+++ Makefile	10 Feb 2011 13:06:41 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	graphics
 
@@ -25,6 +26,26 @@
 EXTRA_PATCHES+=	${FILESDIR}/mesalib74-configure
 .endif
 
+OPTIONS=	I810 "Include DRI support for Intel i810" On \
+		I915 "Include DRI support for Intel i915" On \
+		I965 "Include DRI support for Intel i965" On \
+		MACH64 "Include DRI support for AMD/ATI Mach64" On \
+		MGA "Include DRI support for Matrox" On \
+		R128 "Include DRI support for AMD/ATI R128" On \
+		R200 "Include DRI support for AMD/ATI R200" On \
+		R300 "Include DRI support for AMD/ATI R300" On
+
+.if defined(WITHOUT_NOUVEAU)
+OPTIONS+=	R600 "Include DRI support for AMD/ATI R600" On
+.endif
+
+OPTIONS+=	RADEON "Include DRI support for AMD/ATI R100" On \
+		SAVAGE "Include DRI support for S3/Via Savage" On \
+		SIS "Include DRI support for SiS 300 and 6326" On \
+		SWRAST "Include generic software DRI support" On \
+		TDFX "Include DRI support for 3dfx Voodoo" On \
+		UNICHROME "Include DRI support for S3/Via Unichrome" On
+
 do-install:
 	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
 
@@ -36,4 +57,16 @@
 BROKEN=		Does not install on ia64
 .endif
 
+ALL_DRI_DRIVERS=	i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+			savage sis swrast tdfx unichrome
+.for _d in ${ALL_DRI_DRIVERS}
+. if defined(WITH_${_d:U})
+DRI_DRIVERS+=	,${_d}
+PLIST_SUB+=	${_d:U}=""
+. else
+PLIST_SUB+=	${_d:U}="@comment "
+. endif
+.endfor
+CONFIGURE_ARGS+=	--with-dri-drivers="${DRI_DRIVERS:C/,//1}"
+
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/graphics/dri/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo	7 Feb 2010 11:51:05 -0000	1.18
+++ distinfo	10 Feb 2011 09:31:04 -0000
@@ -1,6 +1,4 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
 SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
 SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
 SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/dri/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist	7 Feb 2010 11:51:05 -0000	1.12
+++ pkg-plist	10 Feb 2011 08:02:51 -0000
@@ -1,19 +1,19 @@
 include/GL/internal/dri_interface.h
-lib/dri/i810_dri.so
-lib/dri/i915_dri.so
-lib/dri/i965_dri.so
-lib/dri/mach64_dri.so
-lib/dri/mga_dri.so
-lib/dri/r128_dri.so
-lib/dri/r200_dri.so
-lib/dri/r300_dri.so
-%%MESALIB76%%lib/dri/r600_dri.so
-lib/dri/radeon_dri.so
-lib/dri/savage_dri.so
-lib/dri/sis_dri.so
-lib/dri/swrast_dri.so
-lib/dri/tdfx_dri.so
-lib/dri/unichrome_dri.so
+%%I810%%lib/dri/i810_dri.so
+%%I915%%lib/dri/i915_dri.so
+%%I965%%lib/dri/i965_dri.so
+%%MACH64%%lib/dri/mach64_dri.so
+%%MGA%%lib/dri/mga_dri.so
+%%R128%%lib/dri/r128_dri.so
+%%R200%%lib/dri/r200_dri.so
+%%R300%%lib/dri/r300_dri.so
+%%MESALIB76%%%%R600%%lib/dri/r600_dri.so
+%%RADEON%%lib/dri/radeon_dri.so
+%%SAVAGE%%lib/dri/savage_dri.so
+%%SIS%%lib/dri/sis_dri.so
+%%SWRAST%%lib/dri/swrast_dri.so
+%%TDFX%%lib/dri/tdfx_dri.so
+%%UNICHROME%%lib/dri/unichrome_dri.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
 @dirrmtry include/GL/internal


>Release-Note:
>Audit-Trail:
>Unformatted: