Add revision to the 9.1.7 version of mesa thats +1 higher than

currently in ports.
Make sure to test WITH_NEW_MESA _after_ bsd.mesalib.mk is included
so bsd.mesalib.mk can set it.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/experimental@1527 058c260c-8361-11dd-a0ac-aa2bafec7d09

6 files changed, 37 insertions, 9 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 5f182c5..d677f69 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -56,7 +56,7 @@ DRI_DRIVERS=	${ALL_DRI_DRIVERS}
 DRIREVISION=	0
 PLIST=	${.CURDIR}/pkg-plist
 .else
-DRIREVISION=	4
+DRIREVISION=	6
 PLIST=	${.CURDIR}/pkg-plist-old
 .endif
 
@@ -96,7 +96,7 @@ PLIST_SUB+=	VDPAU="@comment "
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 DRI_DRIVERS=	RADEON SWRAST
 .endif
-.if ${ARCH} == sparc64
+.if ${ARCH} == sparc64 || ${ARCH} == armv6
 DRI_DRIVERS=	SWRAST
 .endif
 
diff --git a/graphics/gbm/Makefile b/graphics/gbm/Makefile
index c33f917..c2c08e1 100644
--- a/graphics/gbm/Makefile
+++ b/graphics/gbm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gbm
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	${GBM_REVISION}
 CATEGORIES=	graphics
 
 COMMENT=	gbm library
@@ -24,6 +25,12 @@ INSTALL_WRKSRC=	${WRKSRC}/src/gbm
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
+.if defined(WITH_NEW_MESA)
+GBM_REVISION=	0
+.else
+GBM_REVISION=	0
+.endif
+
 pre-build:
 .if defined(WITH_NEW_MESA)
 	@cd ${WRKSRC}/src/mapi/ && ${MAKE_CMD} ${_MAKE_JOBS}
diff --git a/graphics/libEGL/Makefile b/graphics/libEGL/Makefile
index 087219b..9819cd9 100644
--- a/graphics/libEGL/Makefile
+++ b/graphics/libEGL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libEGL
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	${LIBEGL_REVISION}
 CATEGORIES=	graphics
 
 COMMENT=	OpenEGL library
@@ -18,6 +19,9 @@ USE_XORG=	x11 xau xcb xdmcp
 USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
 		xshmfence
 
+.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+
 .if defined(WITH_NEW_MESA)
 BUILD_WRKSRC=	src/egl/drivers/dri2 src/egl/main
 INSTALL_WRKSRC=	src/egl/drivers/dri2 src/egl/main
@@ -26,8 +30,11 @@ BUILD_WRKSRC=	${WRKSRC}/src/egl
 INSTALL_WRKSRC=	${WRKSRC}/src/egl
 .endif
 
-.include <bsd.port.options.mk>
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.if defined(WITH_NEW_MESA)
+LIBEGL_REVISION=	0
+.else
+LIBEGL_REVISION=	4
+.endif
 
 .if defined(WITH_NEW_MESA)
 do-build: egl-do-build
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 1c38f2b..eb3855e 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -18,15 +18,14 @@ USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
 SUB_FILES=	pkg-install pkg-deinstall
 
 .include <bsd.port.options.mk>
+.include "${.CURDIR}/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
 LIBGLREVISION=	0
 .else
-LIBGLREVISION=	0
+LIBGLREVISION=	3
 .endif
 
-.include "${.CURDIR}/bsd.mesalib.mk"
-
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
 CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
diff --git a/graphics/libglapi/Makefile b/graphics/libglapi/Makefile
index 91a95d6..f5346c3 100644
--- a/graphics/libglapi/Makefile
+++ b/graphics/libglapi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libglapi
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	${LIBGLAPI_REVISION}
 CATEGORIES=	graphics
 
 COMMENT=	Common GL api libary used by Mesa based ports.
@@ -17,6 +18,15 @@ USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
 LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libdrm.so:${PORTSDIR}/graphics/libdrm
 
+.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+
+.if defined (WITH_NEW_MESA)
+LIBGLAPI_REVISION=	0
+.else
+LIBGLAPI_REVISION=	2
+.endif
+
 .if defined (WITH_NEW_MESA)
 BUILD_WRKSRC=	${WRKSRC}/src/mapi
 INSTALL_WRKSRC=	${WRKSRC}/src/mapi
@@ -25,6 +35,4 @@ BUILD_WRKSRC=	${WRKSRC}/src/mapi/shared-glapi
 INSTALL_WRKSRC=	${WRKSRC}/src/mapi/shared-glapi
 .endif
 
-.include <bsd.port.options.mk>
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile
index 31a657d..4829157 100644
--- a/graphics/libglesv2/Makefile
+++ b/graphics/libglesv2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libglesv2
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	${LIBGLES_REVISION}
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL ES v2 library
@@ -19,6 +20,12 @@ USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
+LIBGLES_REVISION=	0
+.else
+LIBGLES_REVISION=	3
+.endif
+
+.if defined(WITH_NEW_MESA)
 BUILD_WRKSRC=	${WRKSRC}/src/mapi
 INSTALL_WRKSRC=	${WRKSRC}/src/mapi
 .else