diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/dri-devel/Makefile | 36 | ||||
| -rw-r--r-- | graphics/dri-devel/distinfo | 10 | ||||
| -rw-r--r-- | graphics/dri-devel/files/patch-host.def | 25 | ||||
| -rw-r--r-- | graphics/dri-devel/pkg-plist | 10 |
4 files changed, 48 insertions, 33 deletions
diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile index 7c62c31795ce..0ee67b64098b 100644 --- a/graphics/dri-devel/Makefile +++ b/graphics/dri-devel/Makefile @@ -6,36 +6,31 @@ # PORTNAME= dri -PORTVERSION= 5.1 -PORTREVISION= 1 +PORTVERSION= 6.1.p20040507 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= anholt/dri-devel -DISTFILES= ${PORTNAME}-20031209.tar.bz2 \ - Mesa-newtree-5.1.tar.bz2 +DISTFILES= dri-20040507.tar.bz2 \ + Mesa-20040507.tar.bz2 \ + drm-20040507.tar.bz2 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= anholt@FreeBSD.org COMMENT= OpenGL hardware acceleration drivers snapshot for XFree86 WRKSRC= ${WRKDIR}/xc BUILD_WRKSRC= ${WRKSRC}/lib/GL +INSTALL_WRKSRC= ${WRKSRC}/lib/GL/mesa/drivers/dri USE_BZIP2= yes USE_X_PREFIX= yes MAKE_ENV= FBSDCFLAGS="${CFLAGS}" FBSDCC="${CC}" FBSDCXX="${CXX}" LATEST_LINK= ${PORTNAME}-devel -DRILIST= ffb gamma i810 i830 mga r128 r200 radeon sis tdfx - ONLY_FOR_ARCHS= alpha i386 -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" -BROKEN= "Install fails on alpha" -.endif - do-configure: + @${RM} -f ${WRKSRC}/config/cf/projectroot.def + @${ECHO} "#define ProjectRoot ${X11BASE}" > ${WRKSRC}/config/cf/projectroot.def @${RM} -f ${WRKSRC}/config/cf/version.def @${RM} -f ${WRKSRC}/config/cf/date.def @${TOUCH} ${WRKSRC}/config/cf/version.def @@ -49,14 +44,11 @@ pre-build: cd ${WRKSRC}/config && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} -do-install: -.for i in ${DRILIST} - ${INSTALL_DATA} ${WRKSRC}/lib/GL/mesa/drivers/dri/${i}/${i}_dri.so \ - ${PREFIX}/lib/modules/dri -.endfor - -# Create package list: - @cd ${PREFIX} && ${FIND} lib/modules/dri -type f | ${SORT} \ - >>${TMPPLIST} +.include <bsd.port.pre.mk> +.if ${ARCH} == i386 +PLIST_SUB+= I386="" +.else +PLIST_SUB+= I386="@comment " +.endif .include <bsd.port.post.mk> diff --git a/graphics/dri-devel/distinfo b/graphics/dri-devel/distinfo index 81a6622d9a73..d514023d2b44 100644 --- a/graphics/dri-devel/distinfo +++ b/graphics/dri-devel/distinfo @@ -1,4 +1,6 @@ -MD5 (dri-20031209.tar.bz2) = 07c2d6d771aabac1b487bb89da47c4ee -SIZE (dri-20031209.tar.bz2) = 12088901 -MD5 (Mesa-newtree-5.1.tar.bz2) = 62c02bbc1c1379c9f6b73350cec04fe3 -SIZE (Mesa-newtree-5.1.tar.bz2) = 3537481 +MD5 (dri-20040507.tar.bz2) = afe7a89d0a3d1af7b5c97bde907299c1 +SIZE (dri-20040507.tar.bz2) = 11944635 +MD5 (Mesa-20040507.tar.bz2) = dbced63f1c7193120271f8324505f86e +SIZE (Mesa-20040507.tar.bz2) = 3975988 +MD5 (drm-20040507.tar.bz2) = 4787712ca544ba16a273d9d7f3f07158 +SIZE (drm-20040507.tar.bz2) = 246769 diff --git a/graphics/dri-devel/files/patch-host.def b/graphics/dri-devel/files/patch-host.def index 259080b860a0..258ca8d83ddf 100644 --- a/graphics/dri-devel/files/patch-host.def +++ b/graphics/dri-devel/files/patch-host.def @@ -1,15 +1,17 @@ ---- config/cf/host.def.orig Tue Dec 9 17:50:12 2003 -+++ config/cf/host.def Tue Dec 9 23:06:33 2003 -@@ -5,7 +5,7 @@ +--- config/cf/host.def.orig Fri May 7 20:22:03 2004 ++++ config/cf/host.def Wed May 12 21:58:55 2004 +@@ -5,8 +5,8 @@ #define XFree86CustomVersion "DRI trunk" /* You need this now */ --#define MesaSrcDir /X11R6/SourceForge/Mesanew/Mesa-newtree -+#define MesaSrcDir $(TOP)/../Mesa-newtree +-#define MesaSrcDir /X11R6/SourceForge/Mesanew/Mesa +-#define DRMSrcDir /X11R6/SourceForge/DRI-freedesktop/drm ++#define MesaSrcDir $(TOP)/../Mesa ++#define DRMSrcDir $(TOP)/../drm /* Don't use any special flags by default, but leave this here commented out -@@ -24,6 +24,13 @@ +@@ -25,6 +25,13 @@ #endif */ @@ -23,7 +25,7 @@ #define BuildXFree86ConfigTools YES -@@ -46,15 +53,17 @@ +@@ -52,15 +59,17 @@ #if defined(FreeBSDArchitecture) && defined(HasGcc3) && HasGcc3 #define NoSystemWarn -Wno-system-headers @@ -42,3 +44,12 @@ #define NormalLibGlx NO +@@ -87,7 +96,7 @@ + /* Optionally turn this on to change the place where you install the build. + * Warning: trailing blanks will cause build failures. + */ +-/* #define ProjectRoot /usr/X11R6-DRI */ ++#include "projectroot.def" + + /* #define UsrLibDir /usr/X11R6/lib */ + diff --git a/graphics/dri-devel/pkg-plist b/graphics/dri-devel/pkg-plist new file mode 100644 index 000000000000..863e3c81130c --- /dev/null +++ b/graphics/dri-devel/pkg-plist @@ -0,0 +1,10 @@ +lib/modules/dri/ffb_dri.so +lib/modules/dri/gamma_dri.so +%%I386%%lib/modules/dri/i810_dri.so +%%I386%%lib/modules/dri/i830_dri.so +lib/modules/dri/mga_dri.so +lib/modules/dri/r128_dri.so +lib/modules/dri/r200_dri.so +lib/modules/dri/radeon_dri.so +%%I386%%lib/modules/dri/sis_dri.so +lib/modules/dri/tdfx_dri.so |