Mesa 7.11.2 is a bug fix release which fixes bugs found since the 7.11 release.

Mesa 7.11 implements the OpenGL 2.1 API, but the version reported by glGetString(GL_VERSION) depends on the particular driver being used. Some drivers don't support all the features required in OpenGL 2.1.

See the Compiling/Installing page for prerequisites for DRI hardware acceleration.
MD5 checksums

New features

	None.

Bug fixes

This list is likely incomplete.

    Bug 43143 - Mesa 7.11.1 fails to build at main/dlist.c:4532 with error message: "format not a string literal and no format arguments"
    Incorrect handling of CopyTexImage from RGBA window to LA texture.

Changes

The full set of changes can be viewed by using the following GIT command:

  git log mesa-7.11.1..mesa-7.11.2

Brian Paul (4):

    mesa: stop using ctx->Driver.CopyTexImage1D/2D() hooks
    mesa: fix format selection for meta CopyTexSubImage()
    docs: update news.html and relnotes.html for 7.11.1 release
    mesa: use format string in _mesa_error() call to silence warning

Chad Versace (3):

    intel: Simplify stencil detiling arithmetic
    intel: Fix region dimensions for stencil buffers received from DDX
    intel: Fix separate stencil in builtin DRI2 backend

Ian Romanick (3):

    docs: Add 7.11.1 release md5sums
    mesa: set version string to 7.11.2-devel
    mesa: Bump version to 7.11.2 (final)

3 files changed, 21 insertions, 82 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 2d99694e794..bd14615a99e 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.73 2012/10/23 10:24:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.74 2013/05/16 05:04:56 richard Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -22,10 +22,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.mesa3d.org/
 
 WRKSRC=			${WRKDIR}/Mesa-${MESA_VERSION}
-BUILDING_MESA=		yes
-NO_CONFIGURE=		yes
 DIST_SUBDIR=		Mesa-${MESA_PKGVERSION}
 
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib
index 01d51ba7291..65d2f0c4fc9 100644
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.14 2012/06/13 11:57:42 obache Exp $
+# $NetBSD: Makefile.lib,v 1.15 2013/05/16 05:04:56 richard Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -12,35 +12,27 @@
 
 DISTFILES+=	MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
 DISTFILES+=	MesaGLUT-${MESA_VERSION}${EXTRACT_SUFX}
-DISTFILES+=	MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
+#DISTFILES+=	MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-LIBTOOL=		${PKG_SHLIBTOOL}
-USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c99 c++
+USE_TOOLS+=		automake bison flex gmake pkg-config makedepend
+
+PYTHON_FOR_BUILD_ONLY=  yes
+.include "../../lang/python/tool.mk"
+BUILDLINK_DEPMETHOD.libxml2?=   build
+.include "../../textproc/libxml2/buildlink3.mk"
 
 PATCHDIR=		${.CURDIR}/../MesaLib/patches
 DISTINFO_FILE=		${.CURDIR}/../MesaLib/distinfo
 
-COPTS?= 	 	# empty
-COPTS+= 	 	-prefer-pic 	# Make sure to build PIC libraries.
-
 MAKE_ENV+=		MAKE=${GMAKE:Q}
-MAKE_ENV+=		COPTS=${COPTS:M*:Q}
-MAKE_ENV+=		MKDEP=${TRUE:Q}
-
-#.if ${X11_TYPE} == "modular"
-#.  if defined(PKG_BUILD_OPTIONS.libX11) && \
-#	!empty(PKG_BUILD_OPTIONS.libX11:Mxcb)
-#MAKE_ENV+=		USE_XCB=yes
-#.  endif
-#.endif
 
-#.if empty(MAKE_ENV:MUSE_XCB=*)
-MAKE_ENV+=		USE_XCB=no
-#.endif
+CONFIGURE_ARGS+=        --with-gallium-drivers=""
+CONFIGURE_ARGS+=        --disable-gallium-llvm
+CONFIGURE_ARGS+=        --disable-egl
 
 .include "../../mk/compiler.mk"
 
@@ -48,58 +40,5 @@ MAKE_ENV+=		USE_XCB=no
 CFLAGS+=	-D__FUNCTION__=__FILE__
 .endif
 
-MESA_HZ?=	100
-MAKE_ENV+=	MESA_HZ=${MESA_HZ:Q}
-.if ${OPSYS} == "NetBSD" && exists(/sbin/sysctl)
-tmphz=\
-	${/sbin/sysctl kern.clockrate || ${TRUE}\
-	:L:sh:ts,:S/,//gW:C/([^[0-9]]*)(=|[^ hz])*([^[0-9])//g:M[0-9]*}
-.  if !empty(tmphz) && (${tmphz} > 50) && (${tmphz} < 2001)
-MESA_HZ=	${tmphz}
-.  endif
-.endif
-###
-### XXX do we still want this?
-###
-.if ${OPSYS} == "Interix"
-BUILD_TARGET=		interix3
-.else
-BUILD_TARGET?=		pkgsrc
-.endif
-
-RM_PATCH_BACKUP_DIRS= 	docs src/mesa src/glut/glx \
- 	 	 	progs/demos progs/xdemos progs/glsl
-pre-patch:
-	for fn in ${RM_PATCH_BACKUP_DIRS}; do \
-		${RM} -f ${WRKSRC}/$${fn}/*.orig; \
-	done
-
-post-patch:
-	${CP} ${.CURDIR}/../MesaLib/files/configs/[d-z]* ${WRKSRC}/configs
-
-post-install: install-headers
-###
-### XXX MesaLib installs headers into GL/internal, and this directory is
-###	created there by the pre-install target.  TODO: unify these targets.
-###
-.PHONY: install-headers
-.if empty(PKGNAME:M*MesaDemos*)
-install-headers:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
-.for hdr in ${MESA_HEADERS}
-	if [ -f ${WRKSRC}/include/GL/${hdr:Q} ]; then \
-	    ${INSTALL_DATA} ${WRKSRC}/include/GL/${hdr:Q} \
-	    ${DESTDIR}${PREFIX}/include/GL/${hdr:Q}; \
-	fi;
-.endfor
-.else
-install-headers:
-	@${DO_NADA}
-.endif
-
-SUBST_CLASSES+=                 fix-paths
-SUBST_STAGE.fix-paths=          pre-configure
-SUBST_MESSAGE.fix-paths=        Fixing absolute paths.
-SUBST_FILES.fix-paths=          src/*.c
-SUBST_FILES.fix-paths+=         scripts/*.sh
-SUBST_SED.fix-paths=            -e 's,"/usr/local,"${PREFIX},g'
+pre-configure:
+	cd ${WRKSRC} && ${MAKE} configure
diff --git a/graphics/Mesa/Makefile.version b/graphics/Mesa/Makefile.version
index d6a8903d8fa..92434f934c7 100644
--- a/graphics/Mesa/Makefile.version
+++ b/graphics/Mesa/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.8 2012/06/13 11:30:38 obache Exp $
+# $NetBSD: Makefile.version,v 1.9 2013/05/16 05:04:56 richard Exp $
 #
 # When changing this version, please run "make distinfo" in the following
 # package directories:
@@ -9,7 +9,7 @@
 # used by graphics/Mesa/Makefile.common
 
 MESA_DISTNAME= 		MesaLib-${MESA_VERSION}
-MESA_SITES=		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+MESA_SITES=		ftp://freedesktop.org/pub/mesa/${MESA_VERSION}/
 
-MESA_VERSION=		7.4.4
+MESA_VERSION=		7.11.2
 MESA_PKGVERSION=	${MESA_VERSION}