Date: Fri, 8 Mar 2013 01:01:12 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313610 - head/graphics/dri Message-ID: <201303080101.r2811CLx084246@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Mar 8 01:01:11 2013 New Revision: 313610 URL: http://svnweb.freebsd.org/changeset/ports/313610 Log: Fix packaging and simplify. Modified: head/graphics/dri/Makefile head/graphics/dri/pkg-plist Modified: head/graphics/dri/Makefile ============================================================================== --- head/graphics/dri/Makefile Thu Mar 7 22:45:57 2013 (r313609) +++ head/graphics/dri/Makefile Fri Mar 8 01:01:11 2013 (r313610) @@ -15,11 +15,23 @@ LIB_DEPENDS= drm:${PORTSDIR}/graphics/li USE_PKGCONFIG= build USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto -OPTIONS_DEFINE= I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \ +ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \ SAVAGE SIS SWRAST TDFX UNICHROME -OPTIONS_DEFAULT=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \ - SAVAGE SIS SWRAST TDFX UNICHROME +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" + +.if ${ARCH} == "ia64" +BROKEN= does not install on ia64 +.endif + +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +OPTIONS_DEFINE= ${ALL_DRI_DRIVERS} +.elif ${ARCH} == "powerpc" +OPTIONS_DEFINE= MACH64 RADEON SWRAST TDFX +.elif ${ARCH} == "sparc64" +OPTIONS_DEFINE= MACH64 RADEON SWRAST +.endif +OPTIONS_DEFAULT=${OPTIONS_DEFINE} I810_DESC= Include DRI support for Intel i810 I915_DESC= Include DRI support for Intel i915 @@ -37,116 +49,26 @@ SWRAST_DESC= Include generic software DR TDFX_DESC= Include DRI support for 3dfx Voodoo UNICHROME_DESC= Include DRI support for S3/Via Unichrome -do-install: - cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri +.include <bsd.port.options.mk> -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +DRI_DRIVERS= +.for _d in ${ALL_DRI_DRIVERS} +.if ${PORT_OPTIONS:M${_d}} +DRI_DRIVERS+= ${_d} +PLIST_SUB+= ${_d}_DRIVER="" +.else +PLIST_SUB+= ${_d}_DRIVER="@comment " +.endif +.endfor .include <bsd.port.pre.mk> -.if ${ARCH} == "ia64" -BROKEN= Does not install on ia64 -.endif - .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel .endif +CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}" -.if ${ARCH} == "amd64" -PLIST_SUB+= I810_DRIVER="" -PLIST_SUB+= I9X5_DRIVER="" -PLIST_SUB+= MACH64_DRIVER="" -PLIST_SUB+= MGA_DRIVER="" -PLIST_SUB+= NOUVEAU_DRIVER="" -PLIST_SUB+= RADEON_DRIVERS="" -PLIST_SUB+= SAVAGE_DRIVER="" -PLIST_SUB+= SIS_DRIVER="" -PLIST_SUB+= SWRAST_DRIVER="" -PLIST_SUB+= TDFX_DRIVER="" -PLIST_SUB+= UNICHROME_DRIVER="" -.endif - -.if ${ARCH} == "arm" -PLIST_SUB+= I810_DRIVER="@comment " -PLIST_SUB+= I9X5_DRIVER="@comment " -PLIST_SUB+= MACH64_DRIVER="@comment " -PLIST_SUB+= MGA_DRIVER="@comment " -PLIST_SUB+= NOUVEAU_DRIVER="@comment " -PLIST_SUB+= RADEON_DRIVERS="@comment " -PLIST_SUB+= SAVAGE_DRIVER="@comment " -PLIST_SUB+= SIS_DRIVER="@comment " -PLIST_SUB+= SWRAST_DRIVER="@comment " -PLIST_SUB+= TDFX_DRIVER="@comment " -PLIST_SUB+= UNICHROME_DRIVER="@comment " -.endif - -.if ${ARCH} == "i386" -PLIST_SUB+= I810_DRIVER="" -PLIST_SUB+= I9X5_DRIVER="" -PLIST_SUB+= MACH64_DRIVER="" -PLIST_SUB+= MGA_DRIVER="" -PLIST_SUB+= NOUVEAU_DRIVER="" -PLIST_SUB+= RADEON_DRIVERS="" -PLIST_SUB+= SAVAGE_DRIVER="" -PLIST_SUB+= SIS_DRIVER="" -PLIST_SUB+= SWRAST_DRIVER="" -PLIST_SUB+= TDFX_DRIVER="" -PLIST_SUB+= UNICHROME_DRIVER="" -.endif - -.if ${ARCH} == "mips" -PLIST_SUB+= I810_DRIVER="@comment " -PLIST_SUB+= I9X5_DRIVER="@comment " -PLIST_SUB+= MACH64_DRIVER="@comment " -PLIST_SUB+= MGA_DRIVER="@comment " -PLIST_SUB+= NOUVEAU_DRIVER="@comment " -PLIST_SUB+= RADEON_DRIVERS="@comment " -PLIST_SUB+= SAVAGE_DRIVER="@comment " -PLIST_SUB+= SIS_DRIVER="@comment " -PLIST_SUB+= SWRAST_DRIVER="@comment " -PLIST_SUB+= TDFX_DRIVER="@comment " -PLIST_SUB+= UNICHROME_DRIVER="@comment " -.endif - -.if ${ARCH} == "powerpc" -PLIST_SUB+= I810_DRIVER="@comment " -PLIST_SUB+= I9X5_DRIVER="@comment " -PLIST_SUB+= MACH64_DRIVER="" -PLIST_SUB+= MGA_DRIVER="@comment " -PLIST_SUB+= NOUVEAU_DRIVER="@comment " -PLIST_SUB+= RADEON_DRIVERS="" -PLIST_SUB+= SAVAGE_DRIVER="@comment " -PLIST_SUB+= SIS_DRIVER="@comment " -PLIST_SUB+= SWRAST_DRIVER="" -PLIST_SUB+= TDFX_DRIVER="" -PLIST_SUB+= UNICHROME_DRIVER="@comment " -.endif - -.if ${ARCH} == "sparc64" -PLIST_SUB+= I810_DRIVER="@comment " -PLIST_SUB+= I9X5_DRIVER="@comment " -PLIST_SUB+= MACH64_DRIVER="" -PLIST_SUB+= MGA_DRIVER="@comment " -PLIST_SUB+= NOUVEAU_DRIVER="@comment " -PLIST_SUB+= RADEON_DRIVERS="" -PLIST_SUB+= SAVAGE_DRIVER="@comment " -PLIST_SUB+= SIS_DRIVER="@comment " -PLIST_SUB+= SWRAST_DRIVER="" -PLIST_SUB+= TDFX_DRIVER="@comment " -PLIST_SUB+= UNICHROME_DRIVER="@comment " -.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 ${PORT_OPTIONS:M${_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}" +do-install: + cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri .include <bsd.port.post.mk> Modified: head/graphics/dri/pkg-plist ============================================================================== --- head/graphics/dri/pkg-plist Thu Mar 7 22:45:57 2013 (r313609) +++ head/graphics/dri/pkg-plist Fri Mar 8 01:01:11 2013 (r313610) @@ -1,14 +1,14 @@ include/GL/internal/dri_interface.h %%I810_DRIVER%%lib/dri/i810_dri.so -%%I9X5_DRIVER%%lib/dri/i915_dri.so -%%I9X5_DRIVER%%lib/dri/i965_dri.so +%%I915_DRIVER%%lib/dri/i915_dri.so +%%I965_DRIVER%%lib/dri/i965_dri.so %%MACH64_DRIVER%%lib/dri/mach64_dri.so %%MGA_DRIVER%%lib/dri/mga_dri.so -%%RADEON_DRIVERS%%lib/dri/r128_dri.so -%%RADEON_DRIVERS%%lib/dri/r200_dri.so -%%RADEON_DRIVERS%%lib/dri/r300_dri.so -%%RADEON_DRIVERS%%lib/dri/r600_dri.so -%%RADEON_DRIVERS%%lib/dri/radeon_dri.so +%%R128_DRIVER%%lib/dri/r128_dri.so +%%R200_DRIVER%%lib/dri/r200_dri.so +%%R300_DRIVER%%lib/dri/r300_dri.so +%%R600_DRIVER%%lib/dri/r600_dri.so +%%RADEON_DRIVER%%lib/dri/radeon_dri.so %%SAVAGE_DRIVER%%lib/dri/savage_dri.so %%SIS_DRIVER%%lib/dri/sis_dri.so %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303080101.r2811CLx084246>