aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/dri
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/dri')
-rw-r--r--graphics/dri/Makefile37
-rw-r--r--graphics/dri/distinfo4
-rw-r--r--graphics/dri/pkg-plist20
3 files changed, 31 insertions, 30 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index de1200fee370..9407bd12e9dc 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -1,4 +1,4 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
# $FreeBSD$
PORTNAME= dri
@@ -10,27 +10,30 @@ CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for the DRI
LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \
- expat.6:${PORTSDIR}/textproc/expat2
+ expat:${PORTSDIR}/textproc/expat2
USES= pkgconfig
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
-ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
- SAVAGE SIS SWRAST TDFX UNICHROME
+ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
+
+.if ! defined(WITH_NEW_XORG)
+ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
+.endif
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.if ${ARCH} == "ia64"
-BROKEN= does not install on ia64
-.endif
+OPTIONS_DEFINE_i386= ${ALL_DRI_DRIVERS}
+OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
-.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
+.if defined(WITH_NEW_XORG)
+OPTIONS_DEFINE_powerpc= RADEON SWRAST
+OPTIONS_DEFINE_sparc64= RADEON SWRAST
+.else
+OPTIONS_DEFINE_powerpc= MACH64 RADEON SWRAST TDFX
+OPTIONS_DEFINE_sparc64= MACH64 RADEON SWRAST
.endif
+
OPTIONS_DEFAULT=${OPTIONS_DEFINE}
I810_DESC= Include DRI support for Intel i810
@@ -42,7 +45,7 @@ R128_DESC= Include DRI support for AMD/ATI R128
R200_DESC= Include DRI support for AMD/ATI R200
R300_DESC= Include DRI support for AMD/ATI R300
R600_DESC= Include DRI support for AMD/ATI R600
-RADEON_DESC= Include DRI support for AMD/ATI R100
+RADEON_DESC= Include DRI support for AMD/ATI RADEON
SAVAGE_DESC= Include DRI support for S3/Via Savage
SIS_DESC= Include DRI support for SiS 300 and 6326
SWRAST_DESC= Include generic software DRI support
@@ -61,7 +64,9 @@ 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
@@ -71,4 +76,4 @@ CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"
do-install:
cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
deleted file mode 100644
index 106ab0bf5805..000000000000
--- a/graphics/dri/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 9442cdbae298..43e5ab1a8ade 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,19 +1,19 @@
include/GL/internal/dri_interface.h
-%%I810_DRIVER%%lib/dri/i810_dri.so
+%%OLD%%%%I810_DRIVER%%lib/dri/i810_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
-%%R128_DRIVER%%lib/dri/r128_dri.so
+%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%OLD%%%%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
+%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
+%%OLD%%%%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
+%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
+%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
-%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
+%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
+%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
libdata/pkgconfig/dri.pc
@dirrm lib/dri
@dirrmtry include/GL/internal