Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/graphics/Cenon/Makefile
+++ b/graphics/Cenon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2014/10/07 16:47:26 adam Exp $
+# $NetBSD: Makefile,v 1.25 2015/04/06 08:17:28 adam Exp $
 #

 DISTNAME=		Cenon-3.9.6
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		graphics cad gnustep
 MASTER_SITES=		http://www.vhf-group.com/vhfInterservice/download/source/
 EXTRACT_SUFX=		.tar.bz2
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:06 tnn Exp $

 DISTNAME=		Coin-3.1.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		https://bitbucket.org/Coin3D/coin/downloads/

--- a/graphics/Coin/buildlink3.mk
+++ b/graphics/Coin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2015/04/25 14:23:06 tnn Exp $

 BUILDLINK_TREE+=	Coin

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	Coin
 COIN_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.Coin+=		Coin>=3.1.3
-BUILDLINK_ABI_DEPENDS.Coin+=		Coin>=3.1.3nb2
+BUILDLINK_ABI_DEPENDS.Coin+=		Coin>=3.1.3nb3
 BUILDLINK_PKGSRCDIR.Coin?=		../../graphics/Coin

 .include "../../graphics/simage/buildlink3.mk"
--- a/graphics/GUIlib/Makefile
+++ b/graphics/GUIlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2014/09/13 11:44:44 shattered Exp $
+# $NetBSD: Makefile,v 1.20 2015/04/25 14:23:06 tnn Exp $
 #

 DISTNAME=	GUIlib-1.2.1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/GUIlib/src/

--- a/graphics/GUIlib/buildlink3.mk
+++ b/graphics/GUIlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2015/04/25 14:23:06 tnn Exp $

 BUILDLINK_TREE+=	GUIlib

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	GUIlib
 GUILIB_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.GUIlib+=	GUIlib>=1.1.0nb2
-BUILDLINK_ABI_DEPENDS.GUIlib+=	GUIlib>=1.1.0nb7
+BUILDLINK_ABI_DEPENDS.GUIlib+=	GUIlib>=1.2.1nb1
 BUILDLINK_PKGSRCDIR.GUIlib?=	../../graphics/GUIlib

 .include "../../devel/SDL/buildlink3.mk"
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2014/08/18 11:13:45 adam Exp $
+# $NetBSD: Makefile,v 1.70 2015/06/12 10:50:08 wiz Exp $

+PKGREVISION= 1
 .include "Makefile.common"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.215 2015/03/05 11:09:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.218 2015/06/12 10:50:08 wiz Exp $

+PKGREVISION= 1
 .include "Makefile.common"

 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	1

 MAINTAINER=	adam@NetBSD.org
 COMMENT=	Package for display and interactive manipulation of images
@@ -32,9 +32,6 @@ PKGCONFIG_OVERRIDE+=	wand/Wand.pc.in

 GCC_REQD+=		2.95.3

-PLIST_SUBST+=		IM_MAJOR_VER=${IM_MAJOR_VER:Q}
-PLIST_SUBST+=		IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q}
-
 TEST_TARGET=		check

 .include "options.mk"
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.112 2015/02/08 22:36:51 snj Exp $
+# $NetBSD: Makefile.common,v 1.114 2015/06/07 09:13:11 wiz Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile

-IM_MAJOR_VER=		6.9.0
-IM_MINOR_VER=		5
+IM_MAJOR_VER=		6.9.1
+IM_MINOR_VER=		4
 IM_MAJOR_LIB_VER=	6

 .if (${IM_MINOR_VER} != NONE)
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.130 2015/02/08 22:36:51 snj Exp $
+$NetBSD: distinfo,v 1.132 2015/06/07 09:13:11 wiz Exp $

-SHA1 (ImageMagick-6.9.0-5.tar.xz) = 51fb1e4955f8548107f0a126bf541fbf4ed2c96b
-RMD160 (ImageMagick-6.9.0-5.tar.xz) = 9e79a3b6e634b571a8f144ab37ea6723e9a9205e
-Size (ImageMagick-6.9.0-5.tar.xz) = 7914344 bytes
+SHA1 (ImageMagick-6.9.1-4.tar.xz) = ed0743e1a999461433a45a10f8afe6bf2c62a884
+RMD160 (ImageMagick-6.9.1-4.tar.xz) = 506b22aa5ab9e453a7894a24a2abb0e6406ec7ef
+Size (ImageMagick-6.9.1-4.tar.xz) = 7978216 bytes
--- a/graphics/ImageViewer/Makefile
+++ b/graphics/ImageViewer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2014/10/07 16:47:26 adam Exp $
+# $NetBSD: Makefile,v 1.36 2015/04/06 08:17:28 adam Exp $

 DISTNAME=	ImageViewer-0.6.3
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://www.nice.ch/~phip/

--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.699 2015/03/17 21:30:01 joerg Exp $
+# $NetBSD: Makefile,v 1.709 2015/05/27 22:06:54 markd Exp $
 #

 COMMENT=	Graphics tools and libraries
@@ -15,6 +15,7 @@ SUBDIR+=	ImageViewer
 SUBDIR+=	Mesa
 SUBDIR+=	MesaDemos
 SUBDIR+=	MesaLib
+SUBDIR+=	MesaLib7
 SUBDIR+=	Ngraph
 SUBDIR+=	OpenRM
 SUBDIR+=	PanoTools
@@ -79,6 +80,7 @@ SUBDIR+=	dvipng
 SUBDIR+=	dx
 SUBDIR+=	dxsamples
 SUBDIR+=	edje
+SUBDIR+=	elementary-xfce-icon-theme
 SUBDIR+=	enblend-enfuse
 SUBDIR+=	eog
 SUBDIR+=	eog-plugins
@@ -107,6 +109,7 @@ SUBDIR+=	f-spot
 SUBDIR+=	f4l
 SUBDIR+=	fbm
 SUBDIR+=	feh
+SUBDIR+=	flickrnet
 SUBDIR+=	flphoto
 SUBDIR+=	fly
 SUBDIR+=	fnlib
@@ -114,6 +117,7 @@ SUBDIR+=	fotoxx
 SUBDIR+=	frameworks
 SUBDIR+=	freeglut
 SUBDIR+=	freeimage
+SUBDIR+=	freeimageplus
 SUBDIR+=	freetype
 SUBDIR+=	freetype-lib
 SUBDIR+=	freetype-utils
@@ -264,6 +268,7 @@ SUBDIR+=	lib3ds
 SUBDIR+=	libart
 SUBDIR+=	libbpg
 SUBDIR+=	libcaca
+SUBDIR+=	libepoxy
 SUBDIR+=	libexif
 SUBDIR+=	libexif-gtk
 SUBDIR+=	libgdiplus
@@ -468,21 +473,85 @@ SUBDIR+=	tango-icon-theme
 SUBDIR+=	tesseract
 SUBDIR+=	tex-a2ping
 SUBDIR+=	tex-a2ping-doc
+SUBDIR+=	tex-animate
+SUBDIR+=	tex-animate-doc
 SUBDIR+=	tex-asyfig
 SUBDIR+=	tex-asyfig-doc
 SUBDIR+=	tex-auto-pst-pdf
 SUBDIR+=	tex-auto-pst-pdf-doc
+SUBDIR+=	tex-automata
+SUBDIR+=	tex-automata-doc
+SUBDIR+=	tex-bbcard
+SUBDIR+=	tex-bbcard-doc
+SUBDIR+=	tex-blockdraw_mp
+SUBDIR+=	tex-blockdraw_mp-doc
+SUBDIR+=	tex-bpolynomial
+SUBDIR+=	tex-bpolynomial-doc
+SUBDIR+=	tex-cmarrows
+SUBDIR+=	tex-cmarrows-doc
+SUBDIR+=	tex-drv
+SUBDIR+=	tex-drv-doc
+SUBDIR+=	tex-dviincl
+SUBDIR+=	tex-dviincl-doc
 SUBDIR+=	tex-dvipng-doc
 SUBDIR+=	tex-eepic
 SUBDIR+=	tex-eepic-doc
+SUBDIR+=	tex-emp
+SUBDIR+=	tex-emp-doc
+SUBDIR+=	tex-epsincl
+SUBDIR+=	tex-epsincl-doc
 SUBDIR+=	tex-epstopdf
 SUBDIR+=	tex-epstopdf-doc
+SUBDIR+=	tex-expressg
+SUBDIR+=	tex-expressg-doc
+SUBDIR+=	tex-exteps
+SUBDIR+=	tex-exteps-doc
+SUBDIR+=	tex-featpost
+SUBDIR+=	tex-featpost-doc
+SUBDIR+=	tex-feynmf
+SUBDIR+=	tex-feynmf-doc
+SUBDIR+=	tex-feynmp-auto
+SUBDIR+=	tex-feynmp-auto-doc
+SUBDIR+=	tex-garrigues
+SUBDIR+=	tex-garrigues-doc
+SUBDIR+=	tex-gmp
+SUBDIR+=	tex-gmp-doc
+SUBDIR+=	tex-graphics-pln
+SUBDIR+=	tex-graphics-pln-doc
+SUBDIR+=	tex-hatching
+SUBDIR+=	tex-hatching-doc
+SUBDIR+=	tex-latexmp
+SUBDIR+=	tex-latexmp-doc
+SUBDIR+=	tex-metago
+SUBDIR+=	tex-metago-doc
+SUBDIR+=	tex-metaobj
+SUBDIR+=	tex-metaobj-doc
+SUBDIR+=	tex-metaplot
+SUBDIR+=	tex-metaplot-doc
 SUBDIR+=	tex-metapost
 SUBDIR+=	tex-metapost-doc
+SUBDIR+=	tex-metauml
+SUBDIR+=	tex-metauml-doc
+SUBDIR+=	tex-mfpic
+SUBDIR+=	tex-mfpic-doc
+SUBDIR+=	tex-mfpic4ode
+SUBDIR+=	tex-mfpic4ode-doc
+SUBDIR+=	tex-mp3d
+SUBDIR+=	tex-mp3d-doc
+SUBDIR+=	tex-mpattern
+SUBDIR+=	tex-mpattern-doc
+SUBDIR+=	tex-mpcolornames
+SUBDIR+=	tex-mpcolornames-doc
+SUBDIR+=	tex-mpgraphics
+SUBDIR+=	tex-mpgraphics-doc
 SUBDIR+=	tex-mptopdf
 SUBDIR+=	tex-mptopdf-doc
 SUBDIR+=	tex-pdfcrop
 SUBDIR+=	tex-pdfcrop-doc
+SUBDIR+=	tex-pictex
+SUBDIR+=	tex-pictex-doc
+SUBDIR+=	tex-piechartmp
+SUBDIR+=	tex-piechartmp-doc
 SUBDIR+=	tex-psgo
 SUBDIR+=	tex-psgo-doc
 SUBDIR+=	tex-pst-2dplot
@@ -537,8 +606,21 @@ SUBDIR+=	tex-pstricks
 SUBDIR+=	tex-pstricks-add
 SUBDIR+=	tex-pstricks-add-doc
 SUBDIR+=	tex-pstricks-doc
+SUBDIR+=	tex-repere
+SUBDIR+=	tex-repere-doc
+SUBDIR+=	tex-roex
+SUBDIR+=	tex-slideshow
+SUBDIR+=	tex-slideshow-doc
+SUBDIR+=	tex-splines
+SUBDIR+=	tex-splines-doc
+SUBDIR+=	tex-suanpan
+SUBDIR+=	tex-suanpan-doc
 SUBDIR+=	tex-tex-ps
 SUBDIR+=	tex-tex-ps-doc
+SUBDIR+=	tex-textpath
+SUBDIR+=	tex-textpath-doc
+SUBDIR+=	tex-threeddice
+SUBDIR+=	tex-threeddice-doc
 SUBDIR+=	tex-xypic
 SUBDIR+=	tex-xypic-doc
 SUBDIR+=	tgif
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2009/04/08 23:05:45 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2015/04/03 02:29:40 tnn Exp $

-PKGNAME=	Mesa-${MESA_PKGVERSION}
+PKGNAME=	Mesa-7.11.2
 MASTER_SITES=	# empty
 DISTFILES=	# empty
+CATEGORIES=	graphics

 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Graphics library meta package, similar to SGI's OpenGL
@@ -11,8 +12,6 @@ META_PACKAGE=	# empty

 CONFLICTS=	Mesa-glx-[0-9]*

-.include "Makefile.common"
-
 # The ordering is important here as glut/buildlink3.mk sets the version
 # of Mesa required.
 .include "../../graphics/glut/buildlink3.mk"
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile.common,v 1.76 2014/10/05 16:41:07 wiz Exp $
-#
-# This Makefile fragment is included either directly or indirectly (through
-# Makefile.lib) by all packages that are built from the Mesa sources.
-#
-# used by graphics/Mesa/Makefile.lib
-# used by graphics/glx-utils/Makefile
-
-.include "../../graphics/Mesa/Makefile.version"
-
-DISTNAME?=	${MESA_DISTNAME}
-EXTRACT_SUFX=	.tar.bz2
-CATEGORIES=	graphics
-MASTER_SITES=	${MESA_SITES}
-
-# When changing this version, please run "make distinfo" in the following
-# package directories:
-#
-#	graphics/MesaLib
-#	graphics/glx-utils
-#
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.mesa3d.org/
-
-WRKSRC=			${WRKDIR}/Mesa-${MESA_VERSION}
-DIST_SUBDIR=		Mesa-${MESA_PKGVERSION}
-
-BUILDLINK_API_DEPENDS.glproto+=	glproto>=1.4.11
-.include "../../x11/glproto/buildlink3.mk"
-.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"
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile.lib,v 1.20 2015/02/14 06:54:14 riastradh Exp $
-#
-# This Makefile fragment is included by all packages that build libraries
-# from the Mesa sources.
-#
-# used by graphics/glu/Makefile
-# used by graphics/glut/Makefile
-# used by graphics/MesaDemos/Makefile
-# used by graphics/MesaLib/Makefile
-
-.include "../../graphics/Mesa/Makefile.common"
-
-DISTFILES+=	MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
-DISTFILES+=	MesaGLUT-${MESA_VERSION}${EXTRACT_SUFX}
-#DISTFILES+=	MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
-
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c99 c++
-USE_TOOLS+=		automake bison flex gmake pkg-config makedepend
-
-PYTHON_FOR_BUILD_ONLY=  tool
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 7.11.2
-.include "../../lang/python/tool.mk"
-BUILDLINK_DEPMETHOD.libxml2?=   build
-.include "../../textproc/libxml2/buildlink3.mk"
-
-PATCHDIR=		${.CURDIR}/../MesaLib/patches
-DISTINFO_FILE=		${.CURDIR}/../MesaLib/distinfo
-
-MAKE_ENV+=		MAKE=${GMAKE:Q}
-
-CONFIGURE_ARGS+=        --with-gallium-drivers=""
-CONFIGURE_ARGS+=        --disable-gallium-llvm
-CONFIGURE_ARGS+=        --disable-egl
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mccc)
-CFLAGS+=	-D__FUNCTION__=__FILE__
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
-.endif
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-# XXX This is not quite enough: we will need to patch the makefile
-# because it bogusly tries to reuse objects for native tools and target
-# libraries, and for cross-compiling the objects need to be built
-# separately.  Alternatively, we could just update Mesa to something
-# less prehistoric...
-SUBST_CLASSES+=		nativecc
-SUBST_STAGE.nativecc=	pre-configure
-SUBST_MESSAGE.nativecc=	Fix makefiles to compile tools with native cc.
-SUBST_FILES.nativecc+=	src/glsl/Makefile
-SUBST_SED.nativecc+=	-e 's,$$(CC),$$(APP_CC),g'
-SUBST_SED.nativecc+=	-e 's,$$(CXX),$$(APP_CXX),g'
-MAKE_FLAGS+=		APP_CC=${NATIVE_CC:Q}
-MAKE_FLAGS+=		APP_CXX=${NATIVE_CXX:Q}
-.endif
-
-pre-configure:
-	cd ${WRKSRC} && ${MAKE} configure
--- a/graphics/Mesa/Makefile.version
+++ b/graphics/Mesa/Makefile.version
@@ -1,15 +0,0 @@
-# $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:
-#
-#	graphics/MesaLib
-#	graphics/glx-utils
-#
-# used by graphics/Mesa/Makefile.common
-
-MESA_DISTNAME= 		MesaLib-${MESA_VERSION}
-MESA_SITES=		ftp://freedesktop.org/pub/mesa/${MESA_VERSION}/
-
-MESA_VERSION=		7.11.2
-MESA_PKGVERSION=	${MESA_VERSION}
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,44 +1,24 @@
-# $NetBSD: Makefile,v 1.36 2011/12/20 14:11:33 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/25 14:23:06 tnn Exp $

-PKGNAME=	MesaDemos-${MESA_VERSION}
+DISTNAME=	mesa-demos-8.2.0
+PKGNAME=	${DISTNAME:S/mesa-demos/MesaDemos/}
+PKGREVISION=	1
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://cgit.freedesktop.org/mesa/demos/
 COMMENT=	OpenGL examples and Demos
+#LICENSE=	# Similar to mit but with SGI advertising clause.

+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES=	c c++

-# We include Makefile.lib here to pull in the configuration machinery.
-#
-.include "../../graphics/Mesa/Makefile.lib"
-
-USE_TOOLS+=	pax
-BUILD_DIRS=	progs
-BUILD_TARGET=	default
-EGDIR=		${PREFIX}/share/examples/${PKGNAME_NOREV}
-
-AUTO_MKDIRS=	yes
-
-.include "../../graphics/Mesa/buildlink3.mk"
-
-pre-build:
-	cd ${WRKSRC} && ${RM} -fr src
-	${CP} ${WRKSRC}/configs/pkgsrc ${WRKSRC}/configs/current
-
-do-install:
-	cd ${WRKSRC}/progs && pax		\
-		-s ',^./.*Makefile.*,,'	\
-		-s ',^./CVS.*,,'		\
-		-s ',^./.*\.o$$,,'		\
-		-s ',^./\.libs.*,,'		\
-		-s ',^./\.deps.*,,'		\
-		-s ',^./.*\.orig$$,,'		\
-		-rw . ${DESTDIR}${EGDIR}/${dir}
-	${CHMOD} -R a+rX ${DESTDIR}${EGDIR}
-
-###
-### XXX remove this when it's unnecessary
-###
-post-install:
-	${CHMOD} -x ${DESTDIR}${EGDIR}/demos/glslnoise.c
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,497 +1,321 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:59:05 joerg Exp $
-share/examples/${PKGNAME}/beos/GLInfo.cpp
-share/examples/${PKGNAME}/beos/demo.cpp
-share/examples/${PKGNAME}/beos/sample.cpp
-share/examples/${PKGNAME}/demos/README
-share/examples/${PKGNAME}/demos/arbfplight
-share/examples/${PKGNAME}/demos/arbfplight.c
-share/examples/${PKGNAME}/demos/arbfslight
-share/examples/${PKGNAME}/demos/arbfslight.c
-share/examples/${PKGNAME}/demos/arbocclude
-share/examples/${PKGNAME}/demos/arbocclude.c
-share/examples/${PKGNAME}/demos/bounce
-share/examples/${PKGNAME}/demos/bounce.c
-share/examples/${PKGNAME}/demos/clearspd
-share/examples/${PKGNAME}/demos/clearspd.c
-share/examples/${PKGNAME}/demos/copypix
-share/examples/${PKGNAME}/demos/copypix.c
-share/examples/${PKGNAME}/demos/cubemap
-share/examples/${PKGNAME}/demos/cubemap.c
-share/examples/${PKGNAME}/demos/descrip.mms
-share/examples/${PKGNAME}/demos/drawpix
-share/examples/${PKGNAME}/demos/drawpix.c
-share/examples/${PKGNAME}/demos/engine
-share/examples/${PKGNAME}/demos/engine.c
-share/examples/${PKGNAME}/demos/extfuncs.h
-share/examples/${PKGNAME}/demos/fbo_firecube
-share/examples/${PKGNAME}/demos/fbo_firecube.c
-share/examples/${PKGNAME}/demos/fire
-share/examples/${PKGNAME}/demos/fire.c
-share/examples/${PKGNAME}/demos/fogcoord
-share/examples/${PKGNAME}/demos/fogcoord.c
-share/examples/${PKGNAME}/demos/fplight
-share/examples/${PKGNAME}/demos/fplight.c
-share/examples/${PKGNAME}/demos/fslight
-share/examples/${PKGNAME}/demos/fslight.c
-share/examples/${PKGNAME}/demos/gamma
-share/examples/${PKGNAME}/demos/gamma.c
-share/examples/${PKGNAME}/demos/gearbox
-share/examples/${PKGNAME}/demos/gearbox.c
-share/examples/${PKGNAME}/demos/gears
-share/examples/${PKGNAME}/demos/gears.c
-share/examples/${PKGNAME}/demos/geartrain
-share/examples/${PKGNAME}/demos/geartrain.c
-share/examples/${PKGNAME}/demos/geartrain.dat
-share/examples/${PKGNAME}/demos/glinfo
-share/examples/${PKGNAME}/demos/glinfo.c
-share/examples/${PKGNAME}/demos/gloss
-share/examples/${PKGNAME}/demos/gloss.c
-share/examples/${PKGNAME}/demos/glslnoise
-share/examples/${PKGNAME}/demos/glslnoise.c
-share/examples/${PKGNAME}/demos/gltestperf
-share/examples/${PKGNAME}/demos/gltestperf.c
-share/examples/${PKGNAME}/demos/glutfx
-share/examples/${PKGNAME}/demos/glutfx.c
-share/examples/${PKGNAME}/demos/ipers
-share/examples/${PKGNAME}/demos/ipers.c
-share/examples/${PKGNAME}/demos/isosurf
-share/examples/${PKGNAME}/demos/isosurf.c
-share/examples/${PKGNAME}/demos/isosurf.dat
-share/examples/${PKGNAME}/demos/lodbias
-share/examples/${PKGNAME}/demos/lodbias.c
-share/examples/${PKGNAME}/demos/morph3d
-share/examples/${PKGNAME}/demos/morph3d.c
-share/examples/${PKGNAME}/demos/multiarb
-share/examples/${PKGNAME}/demos/multiarb.c
-share/examples/${PKGNAME}/demos/occlude.c
-share/examples/${PKGNAME}/demos/paltex
-share/examples/${PKGNAME}/demos/paltex.c
-share/examples/${PKGNAME}/demos/particles.cxx
-share/examples/${PKGNAME}/demos/particles.h
-share/examples/${PKGNAME}/demos/pointblast
-share/examples/${PKGNAME}/demos/pointblast.c
-share/examples/${PKGNAME}/demos/rain
-share/examples/${PKGNAME}/demos/rain.cxx
-share/examples/${PKGNAME}/demos/ray
-share/examples/${PKGNAME}/demos/ray.c
-share/examples/${PKGNAME}/demos/readpix
-share/examples/${PKGNAME}/demos/readpix.c
-share/examples/${PKGNAME}/demos/readtex.c
-share/examples/${PKGNAME}/demos/readtex.h
-share/examples/${PKGNAME}/demos/reflect
-share/examples/${PKGNAME}/demos/reflect.c
-share/examples/${PKGNAME}/demos/renormal
-share/examples/${PKGNAME}/demos/renormal.c
-share/examples/${PKGNAME}/demos/shadowtex
-share/examples/${PKGNAME}/demos/shadowtex.c
-share/examples/${PKGNAME}/demos/showbuffer.c
-share/examples/${PKGNAME}/demos/showbuffer.h
-share/examples/${PKGNAME}/demos/singlebuffer
-share/examples/${PKGNAME}/demos/singlebuffer.c
-share/examples/${PKGNAME}/demos/spectex
-share/examples/${PKGNAME}/demos/spectex.c
-share/examples/${PKGNAME}/demos/spriteblast
-share/examples/${PKGNAME}/demos/spriteblast.c
-share/examples/${PKGNAME}/demos/stex3d
-share/examples/${PKGNAME}/demos/stex3d.c
-share/examples/${PKGNAME}/demos/streaming_rect
-share/examples/${PKGNAME}/demos/streaming_rect.c
-share/examples/${PKGNAME}/demos/teapot
-share/examples/${PKGNAME}/demos/teapot.c
-share/examples/${PKGNAME}/demos/terrain
-share/examples/${PKGNAME}/demos/terrain.c
-share/examples/${PKGNAME}/demos/terrain.dat
-share/examples/${PKGNAME}/demos/tessdemo
-share/examples/${PKGNAME}/demos/tessdemo.c
-share/examples/${PKGNAME}/demos/texcyl
-share/examples/${PKGNAME}/demos/texcyl.c
-share/examples/${PKGNAME}/demos/texdown
-share/examples/${PKGNAME}/demos/texdown.c
-share/examples/${PKGNAME}/demos/texenv
-share/examples/${PKGNAME}/demos/texenv.c
-share/examples/${PKGNAME}/demos/texobj
-share/examples/${PKGNAME}/demos/texobj.c
-share/examples/${PKGNAME}/demos/trackball.c
-share/examples/${PKGNAME}/demos/trackball.h
-share/examples/${PKGNAME}/demos/trispd
-share/examples/${PKGNAME}/demos/trispd.c
-share/examples/${PKGNAME}/demos/tunnel
-share/examples/${PKGNAME}/demos/tunnel.c
-share/examples/${PKGNAME}/demos/tunnel2
-share/examples/${PKGNAME}/demos/tunnel2.c
-share/examples/${PKGNAME}/demos/tunneldat.h
-share/examples/${PKGNAME}/demos/vao_demo
-share/examples/${PKGNAME}/demos/vao_demo.c
-share/examples/${PKGNAME}/demos/winpos
-share/examples/${PKGNAME}/demos/winpos.c
-share/examples/${PKGNAME}/fbdev/glfbdevtest.c
-share/examples/${PKGNAME}/ggi/asc-view.c
-share/examples/${PKGNAME}/ggi/gears.c
-share/examples/${PKGNAME}/ggi/gears2.c
-share/examples/${PKGNAME}/glsl/CH06-brick.frag
-share/examples/${PKGNAME}/glsl/CH06-brick.vert
-share/examples/${PKGNAME}/glsl/CH11-bumpmap.frag
-share/examples/${PKGNAME}/glsl/CH11-bumpmap.vert
-share/examples/${PKGNAME}/glsl/CH11-toyball.frag
-share/examples/${PKGNAME}/glsl/CH11-toyball.vert
-share/examples/${PKGNAME}/glsl/CH18-mandel.frag
-share/examples/${PKGNAME}/glsl/CH18-mandel.vert
-share/examples/${PKGNAME}/glsl/bitmap
-share/examples/${PKGNAME}/glsl/bitmap.c
-share/examples/${PKGNAME}/glsl/brick
-share/examples/${PKGNAME}/glsl/brick.c
-share/examples/${PKGNAME}/glsl/bump
-share/examples/${PKGNAME}/glsl/bump.c
-share/examples/${PKGNAME}/glsl/convolution.frag
-share/examples/${PKGNAME}/glsl/convolution.vert
-share/examples/${PKGNAME}/glsl/convolutions
-share/examples/${PKGNAME}/glsl/convolutions.c
-share/examples/${PKGNAME}/glsl/cubemap.frag
-share/examples/${PKGNAME}/glsl/deriv
-share/examples/${PKGNAME}/glsl/deriv.c
-share/examples/${PKGNAME}/glsl/extfuncs.h
-share/examples/${PKGNAME}/glsl/fragcoord
-share/examples/${PKGNAME}/glsl/fragcoord.c
-share/examples/${PKGNAME}/glsl/mandelbrot
-share/examples/${PKGNAME}/glsl/mandelbrot.c
-share/examples/${PKGNAME}/glsl/multinoise
-share/examples/${PKGNAME}/glsl/multinoise.c
-share/examples/${PKGNAME}/glsl/multitex
-share/examples/${PKGNAME}/glsl/multitex.c
-share/examples/${PKGNAME}/glsl/multitex.frag
-share/examples/${PKGNAME}/glsl/multitex.vert
-share/examples/${PKGNAME}/glsl/noise
-share/examples/${PKGNAME}/glsl/noise.c
-share/examples/${PKGNAME}/glsl/pointcoord
-share/examples/${PKGNAME}/glsl/pointcoord.c
-share/examples/${PKGNAME}/glsl/points
-share/examples/${PKGNAME}/glsl/points.c
-share/examples/${PKGNAME}/glsl/readtex.c
-share/examples/${PKGNAME}/glsl/readtex.h
-share/examples/${PKGNAME}/glsl/reflect.vert
-share/examples/${PKGNAME}/glsl/samplers
-share/examples/${PKGNAME}/glsl/samplers.c
-share/examples/${PKGNAME}/glsl/shaderutil.c
-share/examples/${PKGNAME}/glsl/shaderutil.h
-share/examples/${PKGNAME}/glsl/shadowtex.frag
-share/examples/${PKGNAME}/glsl/simple.vert
-share/examples/${PKGNAME}/glsl/skinning
-share/examples/${PKGNAME}/glsl/skinning.c
-share/examples/${PKGNAME}/glsl/skinning.frag
-share/examples/${PKGNAME}/glsl/skinning.vert
-share/examples/${PKGNAME}/glsl/texdemo1
-share/examples/${PKGNAME}/glsl/texdemo1.c
-share/examples/${PKGNAME}/glsl/toyball
-share/examples/${PKGNAME}/glsl/toyball.c
-share/examples/${PKGNAME}/glsl/trirast
-share/examples/${PKGNAME}/glsl/trirast.c
-share/examples/${PKGNAME}/glsl/twoside
-share/examples/${PKGNAME}/glsl/twoside.c
-share/examples/${PKGNAME}/glsl/vert-or-frag-only
-share/examples/${PKGNAME}/glsl/vert-or-frag-only.c
-share/examples/${PKGNAME}/glsl/vert-tex
-share/examples/${PKGNAME}/glsl/vert-tex.c
-share/examples/${PKGNAME}/images/arch.rgb
-share/examples/${PKGNAME}/images/bw.rgb
-share/examples/${PKGNAME}/images/girl.rgb
-share/examples/${PKGNAME}/images/girl2.rgb
-share/examples/${PKGNAME}/images/reflect.rgb
-share/examples/${PKGNAME}/images/s128.rgb
-share/examples/${PKGNAME}/images/tile.rgb
-share/examples/${PKGNAME}/images/tree2.rgba
-share/examples/${PKGNAME}/images/tree3.rgb
-share/examples/${PKGNAME}/images/wrs_logo.rgb
-share/examples/${PKGNAME}/osdemos/osdemo.c
-share/examples/${PKGNAME}/osdemos/osdemo16.c
-share/examples/${PKGNAME}/osdemos/osdemo32.c
-share/examples/${PKGNAME}/osdemos/ostest1.c
-share/examples/${PKGNAME}/redbook/README
-share/examples/${PKGNAME}/redbook/aaindex
-share/examples/${PKGNAME}/redbook/aaindex.c
-share/examples/${PKGNAME}/redbook/aapoly
-share/examples/${PKGNAME}/redbook/aapoly.c
-share/examples/${PKGNAME}/redbook/aargb
-share/examples/${PKGNAME}/redbook/aargb.c
-share/examples/${PKGNAME}/redbook/accanti
-share/examples/${PKGNAME}/redbook/accanti.c
-share/examples/${PKGNAME}/redbook/accpersp
-share/examples/${PKGNAME}/redbook/accpersp.c
-share/examples/${PKGNAME}/redbook/alpha
-share/examples/${PKGNAME}/redbook/alpha.c
-share/examples/${PKGNAME}/redbook/alpha3D
-share/examples/${PKGNAME}/redbook/alpha3D.c
-share/examples/${PKGNAME}/redbook/anti
-share/examples/${PKGNAME}/redbook/anti.c
-share/examples/${PKGNAME}/redbook/bezcurve
-share/examples/${PKGNAME}/redbook/bezcurve.c
-share/examples/${PKGNAME}/redbook/bezmesh
-share/examples/${PKGNAME}/redbook/bezmesh.c
-share/examples/${PKGNAME}/redbook/checker
-share/examples/${PKGNAME}/redbook/checker.c
-share/examples/${PKGNAME}/redbook/clip
-share/examples/${PKGNAME}/redbook/clip.c
-share/examples/${PKGNAME}/redbook/colormat
-share/examples/${PKGNAME}/redbook/colormat.c
-share/examples/${PKGNAME}/redbook/cube
-share/examples/${PKGNAME}/redbook/cube.c
-share/examples/${PKGNAME}/redbook/depthcue
-share/examples/${PKGNAME}/redbook/depthcue.c
-share/examples/${PKGNAME}/redbook/dof
-share/examples/${PKGNAME}/redbook/dof.c
-share/examples/${PKGNAME}/redbook/double
-share/examples/${PKGNAME}/redbook/double.c
-share/examples/${PKGNAME}/redbook/drawf
-share/examples/${PKGNAME}/redbook/drawf.c
-share/examples/${PKGNAME}/redbook/feedback
-share/examples/${PKGNAME}/redbook/feedback.c
-share/examples/${PKGNAME}/redbook/fog
-share/examples/${PKGNAME}/redbook/fog.c
-share/examples/${PKGNAME}/redbook/fogindex
-share/examples/${PKGNAME}/redbook/fogindex.c
-share/examples/${PKGNAME}/redbook/font
-share/examples/${PKGNAME}/redbook/font.c
-share/examples/${PKGNAME}/redbook/hello
-share/examples/${PKGNAME}/redbook/hello.c
-share/examples/${PKGNAME}/redbook/image
-share/examples/${PKGNAME}/redbook/image.c
-share/examples/${PKGNAME}/redbook/jitter.h
-share/examples/${PKGNAME}/redbook/light
-share/examples/${PKGNAME}/redbook/light.c
-share/examples/${PKGNAME}/redbook/lines
-share/examples/${PKGNAME}/redbook/lines.c
-share/examples/${PKGNAME}/redbook/list
-share/examples/${PKGNAME}/redbook/list.c
-share/examples/${PKGNAME}/redbook/material
-share/examples/${PKGNAME}/redbook/material.c
-share/examples/${PKGNAME}/redbook/mipmap
-share/examples/${PKGNAME}/redbook/mipmap.c
-share/examples/${PKGNAME}/redbook/model
-share/examples/${PKGNAME}/redbook/model.c
-share/examples/${PKGNAME}/redbook/movelight
-share/examples/${PKGNAME}/redbook/movelight.c
-share/examples/${PKGNAME}/redbook/nurbs
-share/examples/${PKGNAME}/redbook/nurbs.c
-share/examples/${PKGNAME}/redbook/pickdepth
-share/examples/${PKGNAME}/redbook/pickdepth.c
-share/examples/${PKGNAME}/redbook/picksquare
-share/examples/${PKGNAME}/redbook/picksquare.c
-share/examples/${PKGNAME}/redbook/plane
-share/examples/${PKGNAME}/redbook/plane.c
-share/examples/${PKGNAME}/redbook/planet
-share/examples/${PKGNAME}/redbook/planet.c
-share/examples/${PKGNAME}/redbook/polyoff
-share/examples/${PKGNAME}/redbook/polyoff.c
-share/examples/${PKGNAME}/redbook/polys
-share/examples/${PKGNAME}/redbook/polys.c
-share/examples/${PKGNAME}/redbook/quadric
-share/examples/${PKGNAME}/redbook/quadric.c
-share/examples/${PKGNAME}/redbook/robot
-share/examples/${PKGNAME}/redbook/robot.c
-share/examples/${PKGNAME}/redbook/sccolorlight
-share/examples/${PKGNAME}/redbook/sccolorlight.c
-share/examples/${PKGNAME}/redbook/scene
-share/examples/${PKGNAME}/redbook/scene.c
-share/examples/${PKGNAME}/redbook/scenebamb
-share/examples/${PKGNAME}/redbook/scenebamb.c
-share/examples/${PKGNAME}/redbook/sceneflat
-share/examples/${PKGNAME}/redbook/sceneflat.c
-share/examples/${PKGNAME}/redbook/select
-share/examples/${PKGNAME}/redbook/select.c
-share/examples/${PKGNAME}/redbook/smooth
-share/examples/${PKGNAME}/redbook/smooth.c
-share/examples/${PKGNAME}/redbook/stencil
-share/examples/${PKGNAME}/redbook/stencil.c
-share/examples/${PKGNAME}/redbook/stroke
-share/examples/${PKGNAME}/redbook/stroke.c
-share/examples/${PKGNAME}/redbook/surface
-share/examples/${PKGNAME}/redbook/surface.c
-share/examples/${PKGNAME}/redbook/teaambient
-share/examples/${PKGNAME}/redbook/teaambient.c
-share/examples/${PKGNAME}/redbook/teapots
-share/examples/${PKGNAME}/redbook/teapots.c
-share/examples/${PKGNAME}/redbook/tess
-share/examples/${PKGNAME}/redbook/tess.c
-share/examples/${PKGNAME}/redbook/tesswind
-share/examples/${PKGNAME}/redbook/tesswind.c
-share/examples/${PKGNAME}/redbook/texbind
-share/examples/${PKGNAME}/redbook/texbind.c
-share/examples/${PKGNAME}/redbook/texgen
-share/examples/${PKGNAME}/redbook/texgen.c
-share/examples/${PKGNAME}/redbook/texprox
-share/examples/${PKGNAME}/redbook/texprox.c
-share/examples/${PKGNAME}/redbook/texsub
-share/examples/${PKGNAME}/redbook/texsub.c
-share/examples/${PKGNAME}/redbook/texturesurf
-share/examples/${PKGNAME}/redbook/texturesurf.c
-share/examples/${PKGNAME}/redbook/torus
-share/examples/${PKGNAME}/redbook/torus.c
-share/examples/${PKGNAME}/redbook/trim
-share/examples/${PKGNAME}/redbook/trim.c
-share/examples/${PKGNAME}/redbook/unproject
-share/examples/${PKGNAME}/redbook/unproject.c
-share/examples/${PKGNAME}/redbook/varray
-share/examples/${PKGNAME}/redbook/varray.c
-share/examples/${PKGNAME}/redbook/wrap
-share/examples/${PKGNAME}/redbook/wrap.c
-share/examples/${PKGNAME}/samples/README
-share/examples/${PKGNAME}/samples/accum
-share/examples/${PKGNAME}/samples/accum.c
-share/examples/${PKGNAME}/samples/bitmap1
-share/examples/${PKGNAME}/samples/bitmap1.c
-share/examples/${PKGNAME}/samples/bitmap2
-share/examples/${PKGNAME}/samples/bitmap2.c
-share/examples/${PKGNAME}/samples/blendeq
-share/examples/${PKGNAME}/samples/blendeq.c
-share/examples/${PKGNAME}/samples/blendxor
-share/examples/${PKGNAME}/samples/blendxor.c
-share/examples/${PKGNAME}/samples/copy
-share/examples/${PKGNAME}/samples/copy.c
-share/examples/${PKGNAME}/samples/cursor
-share/examples/${PKGNAME}/samples/cursor.c
-share/examples/${PKGNAME}/samples/depth
-share/examples/${PKGNAME}/samples/depth.c
-share/examples/${PKGNAME}/samples/eval
-share/examples/${PKGNAME}/samples/eval.c
-share/examples/${PKGNAME}/samples/fog
-share/examples/${PKGNAME}/samples/fog.c
-share/examples/${PKGNAME}/samples/font
-share/examples/${PKGNAME}/samples/font.c
-share/examples/${PKGNAME}/samples/line
-share/examples/${PKGNAME}/samples/line.c
-share/examples/${PKGNAME}/samples/loadppm.c
-share/examples/${PKGNAME}/samples/logo
-share/examples/${PKGNAME}/samples/logo.c
-share/examples/${PKGNAME}/samples/nurb
-share/examples/${PKGNAME}/samples/nurb.c
-share/examples/${PKGNAME}/samples/oglinfo.c
-share/examples/${PKGNAME}/samples/olympic
-share/examples/${PKGNAME}/samples/olympic.c
-share/examples/${PKGNAME}/samples/overlay
-share/examples/${PKGNAME}/samples/overlay.c
-share/examples/${PKGNAME}/samples/point
-share/examples/${PKGNAME}/samples/point.c
-share/examples/${PKGNAME}/samples/prim
-share/examples/${PKGNAME}/samples/prim.c
-share/examples/${PKGNAME}/samples/quad
-share/examples/${PKGNAME}/samples/quad.c
-share/examples/${PKGNAME}/samples/readtex.c
-share/examples/${PKGNAME}/samples/readtex.h
-share/examples/${PKGNAME}/samples/rgbtoppm.c
-share/examples/${PKGNAME}/samples/select
-share/examples/${PKGNAME}/samples/select.c
-share/examples/${PKGNAME}/samples/shape
-share/examples/${PKGNAME}/samples/shape.c
-share/examples/${PKGNAME}/samples/sphere
-share/examples/${PKGNAME}/samples/sphere.c
-share/examples/${PKGNAME}/samples/star
-share/examples/${PKGNAME}/samples/star.c
-share/examples/${PKGNAME}/samples/stencil
-share/examples/${PKGNAME}/samples/stencil.c
-share/examples/${PKGNAME}/samples/stretch
-share/examples/${PKGNAME}/samples/stretch.c
-share/examples/${PKGNAME}/samples/texture
-share/examples/${PKGNAME}/samples/texture.c
-share/examples/${PKGNAME}/samples/tkmap.c
-share/examples/${PKGNAME}/samples/tri
-share/examples/${PKGNAME}/samples/tri.c
-share/examples/${PKGNAME}/samples/wave
-share/examples/${PKGNAME}/samples/wave.c
-share/examples/${PKGNAME}/util/README
-share/examples/${PKGNAME}/util/dumpstate.c
-share/examples/${PKGNAME}/util/errcheck.c
-share/examples/${PKGNAME}/util/extfuncs.h
-share/examples/${PKGNAME}/util/glstate.c
-share/examples/${PKGNAME}/util/glstate.h
-share/examples/${PKGNAME}/util/glutskel.c
-share/examples/${PKGNAME}/util/idproj.c
-share/examples/${PKGNAME}/util/imagesgi.h
-share/examples/${PKGNAME}/util/matrix.c
-share/examples/${PKGNAME}/util/mwmborder.c
-share/examples/${PKGNAME}/util/readtex.c
-share/examples/${PKGNAME}/util/readtex.h
-share/examples/${PKGNAME}/util/shaderutil.c
-share/examples/${PKGNAME}/util/shaderutil.h
-share/examples/${PKGNAME}/util/showbuffer.c
-share/examples/${PKGNAME}/util/showbuffer.h
-share/examples/${PKGNAME}/util/trackball.c
-share/examples/${PKGNAME}/util/trackball.h
-share/examples/${PKGNAME}/util/winpos.c
-share/examples/${PKGNAME}/windml/readtex.c
-share/examples/${PKGNAME}/windml/uglaccum.c
-share/examples/${PKGNAME}/windml/uglalldemos.c
-share/examples/${PKGNAME}/windml/uglbounce.c
-share/examples/${PKGNAME}/windml/uglcube.c
-share/examples/${PKGNAME}/windml/ugldrawpix.c
-share/examples/${PKGNAME}/windml/uglflip.c
-share/examples/${PKGNAME}/windml/uglgears.c
-share/examples/${PKGNAME}/windml/uglicotorus.c
-share/examples/${PKGNAME}/windml/uglline.c
-share/examples/${PKGNAME}/windml/uglolympic.c
-share/examples/${PKGNAME}/windml/uglpoint.c
-share/examples/${PKGNAME}/windml/uglstencil.c
-share/examples/${PKGNAME}/windml/uglteapot.c
-share/examples/${PKGNAME}/windml/ugltexcube.c
-share/examples/${PKGNAME}/windml/ugltexcyl.c
-share/examples/${PKGNAME}/windml/wrs_logo.bmp
-share/examples/${PKGNAME}/xdemos/corender
-share/examples/${PKGNAME}/xdemos/corender.c
-share/examples/${PKGNAME}/xdemos/descrip.mms
-share/examples/${PKGNAME}/xdemos/glsync
-share/examples/${PKGNAME}/xdemos/glsync.c
-share/examples/${PKGNAME}/xdemos/glthreads
-share/examples/${PKGNAME}/xdemos/glthreads.c
-share/examples/${PKGNAME}/xdemos/glxcontexts
-share/examples/${PKGNAME}/xdemos/glxcontexts.c
-share/examples/${PKGNAME}/xdemos/glxdemo
-share/examples/${PKGNAME}/xdemos/glxdemo.c
-share/examples/${PKGNAME}/xdemos/glxgears
-share/examples/${PKGNAME}/xdemos/glxgears.c
-share/examples/${PKGNAME}/xdemos/glxgears_fbconfig
-share/examples/${PKGNAME}/xdemos/glxgears_fbconfig.c
-share/examples/${PKGNAME}/xdemos/glxgears_pixmap
-share/examples/${PKGNAME}/xdemos/glxgears_pixmap.c
-share/examples/${PKGNAME}/xdemos/glxheads
-share/examples/${PKGNAME}/xdemos/glxheads.c
-share/examples/${PKGNAME}/xdemos/glxinfo
-share/examples/${PKGNAME}/xdemos/glxinfo.c
-share/examples/${PKGNAME}/xdemos/glxpbdemo
-share/examples/${PKGNAME}/xdemos/glxpbdemo.c
-share/examples/${PKGNAME}/xdemos/glxpixmap
-share/examples/${PKGNAME}/xdemos/glxpixmap.c
-share/examples/${PKGNAME}/xdemos/glxsnoop
-share/examples/${PKGNAME}/xdemos/glxsnoop.c
-share/examples/${PKGNAME}/xdemos/glxswapcontrol
-share/examples/${PKGNAME}/xdemos/glxswapcontrol.c
-share/examples/${PKGNAME}/xdemos/ipc.c
-share/examples/${PKGNAME}/xdemos/ipc.h
-share/examples/${PKGNAME}/xdemos/manywin
-share/examples/${PKGNAME}/xdemos/manywin.c
-share/examples/${PKGNAME}/xdemos/offset
-share/examples/${PKGNAME}/xdemos/offset.c
-share/examples/${PKGNAME}/xdemos/opencloseopen.c
-share/examples/${PKGNAME}/xdemos/overlay
-share/examples/${PKGNAME}/xdemos/overlay.c
-share/examples/${PKGNAME}/xdemos/pbdemo
-share/examples/${PKGNAME}/xdemos/pbdemo.c
-share/examples/${PKGNAME}/xdemos/pbinfo
-share/examples/${PKGNAME}/xdemos/pbinfo.c
-share/examples/${PKGNAME}/xdemos/pbutil.c
-share/examples/${PKGNAME}/xdemos/pbutil.h
-share/examples/${PKGNAME}/xdemos/shape.c
-share/examples/${PKGNAME}/xdemos/sharedtex
-share/examples/${PKGNAME}/xdemos/sharedtex.c
-share/examples/${PKGNAME}/xdemos/texture_from_pixmap
-share/examples/${PKGNAME}/xdemos/texture_from_pixmap.c
-share/examples/${PKGNAME}/xdemos/vgears.c
-share/examples/${PKGNAME}/xdemos/vindex.c
-share/examples/${PKGNAME}/xdemos/vtest.c
-share/examples/${PKGNAME}/xdemos/wincopy
-share/examples/${PKGNAME}/xdemos/wincopy.c
-share/examples/${PKGNAME}/xdemos/xdemo.c
-share/examples/${PKGNAME}/xdemos/xfont
-share/examples/${PKGNAME}/xdemos/xfont.c
-share/examples/${PKGNAME}/xdemos/xrotfontdemo
-share/examples/${PKGNAME}/xdemos/xrotfontdemo.c
-share/examples/${PKGNAME}/xdemos/xuserotfont.c
-share/examples/${PKGNAME}/xdemos/xuserotfont.h
-share/examples/${PKGNAME}/xdemos/yuvrect_client.c
+@comment $NetBSD: PLIST,v 1.15 2015/04/03 01:57:40 tnn Exp $
+bin/arbfplight
+bin/arbfslight
+bin/arbocclude
+bin/arbocclude2
+bin/array
+bin/bezier
+bin/bitmap
+bin/blinking-teapot
+bin/bounce
+bin/brick
+bin/bump
+bin/clear-color
+bin/clear-fbo
+bin/clear-fbo-scissor
+bin/clear-fbo-tex
+bin/clear-random
+bin/clear-repeat
+bin/clear-scissor
+bin/clear-undefined
+bin/clearspd
+bin/convolutions
+bin/copypix
+bin/copytex
+bin/corender
+bin/createwin
+bin/cubemap
+bin/cuberender
+bin/deriv
+bin/dinoshade
+bin/dissolve
+bin/dlist-begin-call-end
+bin/dlist-dangling
+bin/dlist-degenerate
+bin/dlist-edgeflag
+bin/dlist-edgeflag-dangling
+bin/dlist-flat-tri
+bin/dlist-mat-tri
+bin/dlist-recursive-call
+bin/dlist-tri-flat-tri
+bin/dlist-tri-mat-tri
+bin/draw2arrays
+bin/drawarrays
+bin/drawelements
+bin/drawelements-large
+bin/drawoverhead
+bin/drawpix
+bin/drawrange
+bin/engine
+bin/fbo_firecube
+bin/fbobind
+bin/fbotexture
+bin/fill
+bin/fire
+bin/flat-clip
+bin/fogcoord
+bin/fplight
+bin/fragcoord
+bin/fs-tri
+bin/fslight
+bin/fsraytrace
+bin/gamma
+bin/gearbox
+bin/gears
+bin/geartrain
+bin/genmipmap
+bin/geom-outlining-130
+bin/geom-outlining-150
+bin/geom-sprites
+bin/geom-stipple-lines
+bin/geom-wide-lines
+bin/glinfo
+bin/gloss
+bin/glslstateschange
+bin/glsync
+bin/gltestperf
+bin/glthreads
+bin/glxcontexts
+bin/glxdemo
+bin/glxgears
+bin/glxgears_fbconfig
+bin/glxgears_pixmap
+bin/glxheads
+bin/glxinfo
+bin/glxpbdemo
+bin/glxpixmap
+bin/glxsnoop
+bin/glxswapcontrol
+bin/gs-tri
+bin/gsraytrace
+bin/identity
+bin/ipers
+bin/isosurf
+bin/line
+bin/line-clip
+bin/line-cull
+bin/line-flat
+bin/line-smooth
+bin/line-stipple-wide
+bin/line-userclip
+bin/line-userclip-clip
+bin/line-userclip-nop
+bin/line-userclip-nop-clip
+bin/line-wide
+bin/line-xor
+bin/lineloop
+bin/lineloop-clip
+bin/lineloop-elts
+bin/linestrip
+bin/linestrip-clip
+bin/linestrip-flat-stipple
+bin/linestrip-stipple
+bin/linestrip-stipple-wide
+bin/linktest
+bin/lodbias
+bin/long-fixed-func
+bin/mandelbrot
+bin/manywin
+bin/morph3d
+bin/multiarb
+bin/multictx
+bin/multinoise
+bin/multitex
+bin/noise
+bin/noise2
+bin/offset
+bin/overlay
+bin/paltex
+bin/pbdemo
+bin/pbinfo
+bin/pgon-mode
+bin/pixeltest
+bin/point
+bin/point-clip
+bin/point-param
+bin/point-sprite
+bin/point-wide
+bin/point-wide-smooth
+bin/pointblast
+bin/pointcoord
+bin/points
+bin/poly
+bin/poly-flat
+bin/poly-flat-clip
+bin/poly-flat-unfilled-clip
+bin/poly-unfilled
+bin/projtex
+bin/quad
+bin/quad-clip
+bin/quad-clip-all-vertices
+bin/quad-clip-nearplane
+bin/quad-degenerate
+bin/quad-flat
+bin/quad-offset-factor
+bin/quad-offset-unfilled
+bin/quad-offset-units
+bin/quad-tex-2d
+bin/quad-tex-3d
+bin/quad-tex-alpha
+bin/quad-tex-pbo
+bin/quad-tex-sub
+bin/quad-unfilled
+bin/quad-unfilled-clip
+bin/quad-unfilled-stipple
+bin/quads
+bin/quadstrip
+bin/quadstrip-clip
+bin/quadstrip-cont
+bin/quadstrip-flat
+bin/ray
+bin/readpix
+bin/readpixels
+bin/reflect
+bin/renormal
+bin/samplers
+bin/samplers_array
+bin/shadow_sampler
+bin/shadowtex
+bin/shape
+bin/sharedtex
+bin/sharedtex_mt
+bin/shtest
+bin/simplex-noise
+bin/singlebuffer
+bin/skinning
+bin/spectex
+bin/spriteblast
+bin/stex3d
+bin/sub-tex
+bin/swapbuffers
+bin/teapot
+bin/terrain
+bin/tessdemo
+bin/tex-quads
+bin/texaaline
+bin/texcyl
+bin/texdemo1
+bin/texenv
+bin/teximage
+bin/texture_from_pixmap
+bin/textures
+bin/toyball
+bin/tri
+bin/tri-2101010
+bin/tri-2101010-dlist
+bin/tri-alpha
+bin/tri-alpha-tex
+bin/tri-array-interleaved
+bin/tri-blend
+bin/tri-blend-color
+bin/tri-blend-max
+bin/tri-blend-min
+bin/tri-blend-revsub
+bin/tri-blend-sub
+bin/tri-clear
+bin/tri-clip
+bin/tri-cull
+bin/tri-cull-both
+bin/tri-dlist
+bin/tri-edgeflag
+bin/tri-edgeflag-array
+bin/tri-edgeflag-pv
+bin/tri-fbo
+bin/tri-fbo-tex
+bin/tri-fbo-tex-mip
+bin/tri-flat
+bin/tri-flat-clip
+bin/tri-fog
+bin/tri-fp
+bin/tri-fp-const-imm
+bin/tri-lit
+bin/tri-lit-material
+bin/tri-logicop-none
+bin/tri-logicop-xor
+bin/tri-mask-tri
+bin/tri-multitex-vbo
+bin/tri-orig
+bin/tri-point-line-clipped
+bin/tri-query
+bin/tri-repeat
+bin/tri-rotate
+bin/tri-scissor-tri
+bin/tri-square
+bin/tri-stencil
+bin/tri-stipple
+bin/tri-tex
+bin/tri-tex-1d
+bin/tri-tex-3d
+bin/tri-tri
+bin/tri-unfilled
+bin/tri-unfilled-clip
+bin/tri-unfilled-edgeflag
+bin/tri-unfilled-fog
+bin/tri-unfilled-point
+bin/tri-unfilled-smooth
+bin/tri-unfilled-tri
+bin/tri-unfilled-tri-lit
+bin/tri-unfilled-userclip
+bin/tri-unfilled-userclip-stip
+bin/tri-userclip
+bin/tri-viewport
+bin/tri-z
+bin/tri-z-9
+bin/tri-z-clip
+bin/tri-z-eq
+bin/trifan
+bin/trifan-flat
+bin/trifan-flat-clip
+bin/trifan-flat-unfilled-clip
+bin/trifan-unfilled
+bin/trirast
+bin/trispd
+bin/tristrip
+bin/tristrip-clip
+bin/tristrip-flat
+bin/tunnel
+bin/tunnel2
+bin/twoside
+bin/vao_demo
+bin/vbo
+bin/vbo-drawarrays
+bin/vbo-drawarrays-2101010
+bin/vbo-drawelements
+bin/vbo-drawrange
+bin/vbo-noninterleaved
+bin/vbo-tri
+bin/vert-or-frag-only
+bin/vert-tex
+bin/vertexrate
+bin/vp-array
+bin/vp-array-hf
+bin/vp-array-int
+bin/vp-clip
+bin/vp-line-clip
+bin/vp-tri
+bin/vp-tri-cb
+bin/vp-tri-cb-pos
+bin/vp-tri-cb-tex
+bin/vp-tri-imm
+bin/vp-tri-invariant
+bin/vp-tri-swap
+bin/vp-tri-tex
+bin/vp-unfilled
+bin/vsraytrace
+bin/wincopy
+bin/winpos
+bin/xfont
+bin/xrotfontdemo
+share/mesa-demos/arch.rgb
+share/mesa-demos/bw.rgb
+share/mesa-demos/geartrain.dat
+share/mesa-demos/girl.rgb
+share/mesa-demos/girl2.rgb
+share/mesa-demos/isosurf.dat
+share/mesa-demos/reflect.rgb
+share/mesa-demos/s128.rgb
+share/mesa-demos/terrain.dat
+share/mesa-demos/tile.rgb
+share/mesa-demos/tree2.rgba
+share/mesa-demos/tree3.rgb
+share/mesa-demos/wrs_logo.rgb
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.22 2015/04/13 14:00:17 tnn Exp $
+
+SHA1 (mesa-demos-8.2.0.tar.bz2) = e1a66ac63eebba4f950f95d830f34a6005167116
+RMD160 (mesa-demos-8.2.0.tar.bz2) = e6804e480ed5d227ba689cb9b3ea95cc85353889
+Size (mesa-demos-8.2.0.tar.bz2) = 10071635 bytes
+SHA1 (patch-src_xdemos_glinfo__common.c) = 1f657daf58f2ae08a161cd7ab73285af441f17b0
--- a/graphics/MesaDemos/patches/patch-src_xdemos_glinfo__common.c
+++ b/graphics/MesaDemos/patches/patch-src_xdemos_glinfo__common.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_xdemos_glinfo__common.c,v 1.1 2015/04/13 14:00:17 tnn Exp $
+
+--- src/xdemos/glinfo_common.c.orig	2014-07-05 08:17:06.000000000 +0000
+++ src/xdemos/glinfo_common.c
+@@ -569,7 +569,7 @@ print_limits(const char *extensions, con
+      { 1, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT, "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", "GL_EXT_transform_feedback", },
+      { 1, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT, "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS", "GL_EXT_transform_feedback" },
+ #endif
+-#if defined (GL_ARB_texture_buffer_object)
+#if defined (GL_ARB_texture_buffer_object) && defined(GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT)
+       { 1, GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT, "GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT", "GL_ARB_texture_buffer_object" },
+       { 1, GL_MAX_TEXTURE_BUFFER_SIZE, "GL_MAX_TEXTURE_BUFFER_SIZE", "GL_ARB_texture_buffer_object" },
+ #endif
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,77 +1,83 @@
-# $NetBSD: Makefile,v 1.98 2015/03/09 19:54:44 tnn Exp $
+# $NetBSD: Makefile,v 1.104 2015/06/07 15:48:12 tnn Exp $

-PKGNAME=	MesaLib-${MESA_PKGVERSION}
-PKGREVISION=	6
-COMMENT=	Graphics library similar to SGI's OpenGL
+DISTNAME=	mesa-10.5.7
+PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
+CATEGORIES=	graphics x11
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
+EXTRACT_SUFX=	.tar.xz

-CONFLICTS+=	xf86driproto<2.0.4
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.mesa3d.org/
+COMMENT=	The Mesa 3D Graphics Library
+LICENSE=	mit

-PLIST_VARS=		dri nodri
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config gmake
+USE_LANGUAGES=	c99 c++
+USE_LIBTOOL=	yes

+GCC_REQD+=	4.2
+
+PKGCONFIG_OVERRIDE+=	src/egl/main/egl.pc.in
+PKGCONFIG_OVERRIDE+=	src/egl/wayland/wayland-egl/wayland-egl.pc.in
+PKGCONFIG_OVERRIDE+=	src/gallium/targets/d3dadapter9/d3d.pc.in
+PKGCONFIG_OVERRIDE+=	src/gallium/targets/osmesa/osmesa.pc.in
+PKGCONFIG_OVERRIDE+=	src/gallium/targets/xa/xatracker.pc.in
+PKGCONFIG_OVERRIDE+=	src/gbm/main/gbm.pc.in
+PKGCONFIG_OVERRIDE+=	src/mapi/es1api/glesv1_cm.pc.in
+PKGCONFIG_OVERRIDE+=	src/mapi/es2api/glesv2.pc.in
+PKGCONFIG_OVERRIDE+=	src/mapi/vgapi/vg.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/drivers/dri/dri.pc.in
+PKGCONFIG_OVERRIDE+=	src/mesa/drivers/osmesa/osmesa.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/gl.pc.in
-PKGCONFIG_OVERRIDE+=	src/mesa/osmesa.pc.in
-PKGCONFIG_OVERRIDE+=	src/glw/glw.pc.in

-CONFIGURE_ARGS+=        --disable-glu
-CONFIGURE_ARGS+=        --disable-glut
-CONFIGURE_ARGS+=        --disable-motif
+# Work around a buildlink and/or libtool bug:
+# In the libtool install/relink stage, if we want to link with two static
+# archives named libglapi.la but in different directories, bad things happen.
+SUBST_CLASSES+=			wrapper-bug
+SUBST_STAGE.wrapper-bug=	pre-configure
+SUBST_MESSAGE.wrapper-bug=	Renaming glapi-shared/libglapi in Makefiles
+SUBST_FILES.wrapper-bug=	src/gbm/Makefile.in
+SUBST_FILES.wrapper-bug+=	src/glx/Makefile.in
+SUBST_FILES.wrapper-bug+=	src/mapi/Makefile.in
+SUBST_FILES.wrapper-bug+=	src/mesa/drivers/x11/Makefile.in
+SUBST_SED.wrapper-bug=		-e 's,shared-glapi/libglapi.la,shared-glapi/libglapi_shared.la,g'
+SUBST_SED.wrapper-bug+=		-e 's,libglapi.la,libglapi_static.la,g'
+SUBST_SED.wrapper-bug+=		-e 's,libglapi_shared.la,libglapi.la,g'

-.include "glx-config.mk"
-.include "../../graphics/Mesa/Makefile.lib"
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
 .include "options.mk"

-.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
-##
-## NetBSD 2.x and earlier require pthread stubs
-##
-.  include "../../devel/pthread-stublib/buildlink3.mk"
-PTHREAD_STUBLIB= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthstub
-.elif !empty(MACHINE_PLATFORM:MNetBSD-*)
-##
-## NetBSD 3.x and later have pthread stubs in libc
-##
-PTHREAD_STUBLIB=
-.else
-##
-## Other platforms may or may not have stubs provided by libc, but pulling in
-## threading support via the pthread.buildlink3.mk definitions will provide
-## all the necessary interfaces.  This matches the standard configuration for
-## most platforms as they appear in "${WRKSRC}/configs", and is necessary
-## for successful linking with libGL under many platforms.
-##
-.include "../../mk/pthread.buildlink3.mk"
-PTHREAD_STUBLIB= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-.endif
-PKGSRC_MAKE_ENV+=	PTHREAD_STUBLIB=${PTHREAD_STUBLIB:Q}
-MAKE_ENV+=		PTHREAD_STUBLIB=${PTHREAD_STUBLIB:Q}
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-MAKE_ENV+=	CROSS_COMPILING=yes
-.endif
-
-post-extract:
-.if !empty(PKG_OPTIONS:Mdri) && (${OPSYS} == "SunOS")
-	${CP} ${FILESDIR}/mapfile.externs ${WRKSRC}/src/mesa/drivers/dri/
-.endif
-	${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86
-	${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86
-	${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh
-
-#
-# remove include files installed respectively by ../glu and ../glut
-#
-pre-install:
-	${RM} -f ${WRKSRC}/include/GL/glu*.h
-
-.include "../../mk/compiler.mk"
-
 .if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+=	-no-integrated-as -fvisibility=hidden
+SUBST_CLASSES+=		tr1
+SUBST_STAGE.tr1=	pre-configure
+SUBST_MESSAGE.tr1=	Fixing TR1 C++ namespace
+SUBST_FILES.tr1=	src/gallium/drivers/nouveau/codegen/*.h
+SUBST_FILES.tr1+=	src/gallium/drivers/nouveau/codegen/*.cpp
+SUBST_SED.tr1=		-e 's,std::tr1::,std::,g'
+SUBST_SED.tr1+=		-e 's,include <tr1/,include <,g'
 .endif

-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+PYTHON_FOR_BUILD_ONLY=	yes
+BUILD_DEPENDS+=		${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+.include "../../lang/python/tool.mk"
+
+# On NetBSD < 6 we need to compile with GCC from pkgsrc.
+# But GCC from pkgsrc does not add implicit -lc like base GCC does,
+# which breaks the build with -Wl,--no-undefined.
+# So we piggy back on -lpthread and inject -lc after it.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*)
+BUILDLINK_TRANSFORM+=   l:pthread:pthread:c
 .endif

+# Handle platforms without exp2
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*)
+CPPFLAGS+=	-Dexp2\(x\)=exp\(\(x\)\*M_LN2\)
+CPPFLAGS+=	-Dexp2f\(x\)=expf\(\(x\)\*M_LN2\)
+.endif
+
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,46 +1,40 @@
-@comment $NetBSD: PLIST,v 1.26 2013/05/20 06:59:18 sbd Exp $
-include/GL/GLwDrawA.h
-include/GL/GLwDrawAP.h
-include/GL/GLwMDrawA.h
-include/GL/GLwMDrawAP.h
+@comment $NetBSD: PLIST,v 1.27 2015/04/25 11:19:18 tnn Exp $
+include/EGL/egl.h
+include/EGL/eglext.h
+include/EGL/eglextchromium.h
+include/EGL/eglmesaext.h
+include/EGL/eglplatform.h
 include/GL/gl.h
 include/GL/gl_mangle.h
+include/GL/glcorearb.h
 include/GL/glext.h
-include/GL/glfbdev.h
 include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/glxext.h
 ${PLIST.dri}include/GL/internal/dri_interface.h
-include/GL/mesa_wgl.h
 include/GL/osmesa.h
-include/GL/vms_x_fix.h
 include/GL/wglext.h
 include/GL/wmesa.h
-lib/libGL.so
-lib/libGL.so.1
-lib/libGL.so.1.2
-lib/libGLw.so
-lib/libGLw.so.1
-lib/libGLw.so.1.0.0
-${PLIST.nodri}lib/libOSMesa.so
-${PLIST.nodri}lib/libOSMesa.so.7
-${PLIST.nodri}lib/libOSMesa.so.7.11.0
-${PLIST.dri}lib/dri/i810_dri.so
-${PLIST.dri}lib/dri/i915_dri.so
-${PLIST.dri}lib/dri/i965_dri.so
-${PLIST.dri}lib/dri/mach64_dri.so
-${PLIST.dri}lib/dri/mga_dri.so
-${PLIST.dri}lib/dri/r128_dri.so
-${PLIST.dri}lib/dri/r200_dri.so
-${PLIST.dri}lib/dri/r300_dri.so
-${PLIST.dri}lib/dri/r600_dri.so
-${PLIST.dri}lib/dri/radeon_dri.so
-${PLIST.dri}lib/dri/savage_dri.so
-${PLIST.dri}lib/dri/sis_dri.so
-${PLIST.dri}lib/dri/swrast_dri.so
-${PLIST.dri}lib/dri/tdfx_dri.so
-${PLIST.dri}lib/dri/unichrome_dri.so
+include/KHR/khrplatform.h
+${PLIST.dri}include/gbm.h
+${PLIST.i915_dri}lib/dri/i915_dri.so
+${PLIST.i965_dri}lib/dri/i965_dri.so
+${PLIST.ilo}lib/dri/ilo_dri.so
+${PLIST.swrast}lib/dri/kms_swrast_dri.so
+${PLIST.nouveau}lib/dri/nouveau_dri.so
+${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so
+${PLIST.r200_dri}lib/dri/r200_dri.so
+${PLIST.r300}lib/dri/r300_dri.so
+${PLIST.r600}lib/dri/r600_dri.so
+${PLIST.radeon_dri}lib/dri/radeon_dri.so
+${PLIST.radeonsi}lib/dri/radeonsi_dri.so
+${PLIST.swrast_dri}lib/dri/swrast_dri.so
+${PLIST.svga}lib/dri/vmwgfx_dri.so
+lib/libEGL.la
+lib/libGL.la
+${PLIST.dri}lib/libgbm.la
+${PLIST.dri}lib/libglapi.la
 ${PLIST.dri}lib/pkgconfig/dri.pc
+lib/pkgconfig/egl.pc
+${PLIST.dri}lib/pkgconfig/gbm.pc
 lib/pkgconfig/gl.pc
-lib/pkgconfig/glw.pc
-${PLIST.nodri}lib/pkgconfig/osmesa.pc
--- a/graphics/MesaLib/TODO
+++ b/graphics/MesaLib/TODO
@@ -1,28 +0,0 @@
- $NetBSD: TODO,v 1.3 2013/05/16 05:22:02 richard Exp $
-
- Here is a [possibly non-exhaustive] list of issues to resolve prior 
- to the next quarterly freeze:
-
- - Add/verify platform-specific values to use when restoring the FPU
-   control word.
-
- - The Mesa master branch uses autoconf.  Unfortunately, last I checked, 
-   they do not use it to enable the heap allocator, nor use of floating-point 
-   functions in libm, etc.  Perhaps we should take a field trip to the 
-   autoconf archive and write some of the m4 code required to implement 
-   these tests.  After all, pkgsrc is uncommon in that we do not 
-   assume the entire world conforms to the behavior of (recent?) Linux 
-   "distros".
-
- - I have not packaged the new MesaDemos yet due to lack of time.
-
- - verify and update BUILDLINK_API_DEPENDS
-
- - the following platforms are dealt with in PLIST for the libGL.so and 
-   libGLw.so: 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD'
-   and 'SunOS'.  Any other platforms may need to have a look in
-   ${WRKSRC}/bin/mklib and perhaps notice how SunOS was updated via the
-   patchfile patch-bin_mklib.
-
-   --bjs
-   and updated by richard
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2013/05/16 05:22:02 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2015/04/25 11:19:18 tnn Exp $

 BUILDLINK_TREE+=	MesaLib

@@ -11,6 +11,14 @@ BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib

 .include "../../mk/bsd.fast.prefs.mk"

+.if ${X11_TYPE} == "modular"
+BUILDLINK_ABI_DEPENDS.MesaLib+=	MesaLib>=10.5.3
+# This is needed to avoid linking conflicting libstdc++ versions
+.if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
+GCC_REQD+=	4.2
+.endif
+.endif
+
 # See <http://developer.apple.com/qa/qa2007/qa1567.html>.
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
 BUILDLINK_LDFLAGS.MesaLib+=	-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,37 +1,36 @@
-$NetBSD: distinfo,v 1.89 2015/01/29 22:35:43 nat Exp $
+$NetBSD: distinfo,v 1.96 2015/06/07 15:48:12 tnn Exp $

-SHA1 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 2e6e730204800a0748b301a5f58b86332699788b
-RMD160 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = bb2b140375aa13df79fcdb60a7ad0a63622dc531
-Size (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 201575 bytes
-SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9
-RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea
-Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes
-SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba
-SHA1 (patch-bin_mklib) = 8c54bf5382541cab9d971b0e0e627035db1af468
-SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61
-SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0
-SHA1 (patch-src_gallium_auxiliary_util_u__atomic.h) = 68ba9694aca506add2aa96a6892a7227481c2c11
-SHA1 (patch-src_gallium_include_pipe_p__config.h) = 34f4c2a033dd7a494dd3f51db407002a3388f84e
-SHA1 (patch-src_glsl_ir__constant__expression.cpp) = 281e281f51afed244b1a29b92942d572fc095124
-SHA1 (patch-src_glsl_ralloc.c) = 40885fac898058f8e83852a79ca50a74b61121ab
-SHA1 (patch-src_glu_sgi_glu.exports) = 66609d2ea59b02fc46b41311b0042fe4a2da517f
-SHA1 (patch-src_glu_sgi_libtess_sweep.c) = 6ee6d67b2178d23e1b7848d64eede6349f46ee96
-SHA1 (patch-src_glx_XF86dri.c) = b69b7cf5e0d617eca129f0d7f0b06c7603d00db0
-SHA1 (patch-src_mesa_drivers_dri_common_dri__util.h) = 53e63dcc6243b1872f4e4816b46e92910cf97edc
-SHA1 (patch-src_mesa_drivers_dri_common_mmio.h) = b6da48111fb2792b1c71eb7549d0f03adceec9f1
-SHA1 (patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c) = fec8b1a9f6888e9a4225861ea5bda776ecc5f054
-SHA1 (patch-src_mesa_drivers_dri_i915_intel__tris.c) = 74a2ca9f9c865db9b6212087e442f65bb0621227
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw.c) = ce12dc2d2391300d32776a06f5d0096448019c6b
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw__upload.c) = 44162ca546072669b85093981728e635dda69e55
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__misc__state.c) = d37f967dea0fc3bd32566d6a26fd434ca9564081
-SHA1 (patch-src_mesa_drivers_dri_i965_gen6__vs__state.c) = c918b5a91b339e49850d718c957d7e717c2dc130
-SHA1 (patch-src_mesa_drivers_dri_i965_gen6__wm__state.c) = a8ecf943525888b22ec99fe454b08f43c5d8a911
-SHA1 (patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c) = 653c87e1123ce9a27b71221fff4119df34abe15f
-SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.c) = 21d3c08a27817a6358b88101f889120869eebcce
-SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.h) = 6d394e704636134768a6cb5a200ebcc7bc3f52ed
-SHA1 (patch-src_mesa_drivers_dri_mach64_mach64__context.h) = fe95c6610de4c1482c568463aca82f53ed0df900
-SHA1 (patch-src_mesa_drivers_x11_Makefile) = 17b72d2b74d89fbd8db05491cfcf253bb856b139
-SHA1 (patch-src_mesa_main_compiler.h) = b164781b541cb83b64597facbb7a7e21d8bdb686
-SHA1 (patch-src_mesa_main_context.c) = 6b6f1e3ad4ea189291fcf221d4b8bfbd650f8908
-SHA1 (patch-src_mesa_main_imports.c) = d0c50004c749e4c5c136ac2ed50a6989ca90065f
-SHA1 (patch-src_mesa_main_imports.h) = f5a96195b3a14294ca3389c9fe17a6076c46db8a
+SHA1 (mesa-10.5.7.tar.xz) = b600f09ccaeab9f6bb5b98091cf01732bab854a2
+RMD160 (mesa-10.5.7.tar.xz) = 0e15cf97678ecdc95996b598169130dcfd239533
+Size (mesa-10.5.7.tar.xz) = 6992848 bytes
+SHA1 (patch-configure) = 3fc150370e36fc49382b491d907608f00cf99a72
+SHA1 (patch-include_EGL_eglplatform.h) = c34bac7386fd93ee8d0b83a748ae14dc4742d776
+SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e
+SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
+SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = b126390d4a8ee495edfb4c3b1dfdab981445969e
+SHA1 (patch-src_gallium_auxiliary_util_u__network.c) = 283f505af780071dc9fd7914f8065e3fb7d8a4fd
+SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677
+SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc
+SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = ae1b6eb4df3e4db0f37e44118cdf69b16f3c471e
+SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
+SHA1 (patch-src_gallium_include_pipe_p__config.h) = 1698482bb7b468c6fa5f9bb553f9065cecc33f0d
+SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280
+SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a
+SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 4b2ae565377b1a0396c8bf6b2663c261592b8e5e
+SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = e4b891e8b4ebe5b8e8c7b8c2c1dbed11b9c417df
+SHA1 (patch-src_gbm_main_gbm.c) = 70225ab7352f123c9efc68b6d4ff0d9675b6f9dc
+SHA1 (patch-src_glsl_ralloc.c) = 7443d00ff05ee1e1dcfa2b76972b55abadebcad8
+SHA1 (patch-src_mapi_entry__x86-64__tls.h) = c722ce4a22911d9a3d04e1a4fd6ab1a5ddd81cf0
+SHA1 (patch-src_mapi_entry__x86__tls.h) = 51d6ef1aa3db69b23eea6fe145a54c0e7e265190
+SHA1 (patch-src_mapi_entry__x86__tsd.h) = 62501b6e609fa81e33fd826a694e9d9752a7ba21
+SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = b016b3f9324b05e4206e1c23150bd1cde9b9e100
+SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 5e160f7d92c2e9f3fa36e52a082a496af67e634e
+SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = 8c8e748397bcdc9b9abbd14604af5d79de08dfbf
+SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fd8436e4e3a69250256c2cddf8138effb16bd7b3
+SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 7c1a1e5c549f64d4c390e0c87984c44a88d4abfe
+SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = b8a6cca517e1cccbdb2c59cf67a6d2481cdfebd4
+SHA1 (patch-src_mesa_main_compiler.h) = fc0e2b6be8afa9e21ddca1d1a14608a1687bddd8
+SHA1 (patch-src_mesa_main_context.c) = 30c3796865372aa16297c2aaa647ddb49958fa64
+SHA1 (patch-src_mesa_main_shader__query.cpp) = 6273c74161f045363c58f38adeb672287f6a0898
+SHA1 (patch-src_mesa_x86_common__x86.c) = f8b36603f7495b7712943c4a86459bcdd733d6a2
+SHA1 (patch-src_util_u__atomic.h) = 4a567b6fe5bf67fb7f386fa5f37bedb66d593085
--- a/graphics/MesaLib/dri.mk
+++ b/graphics/MesaLib/dri.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.8 2014/03/14 07:19:36 obache Exp $
+# $NetBSD: dri.mk,v 1.11 2015/06/22 22:45:06 jperkin Exp $
 #
 # Currently, this is for convenience only.
 #
@@ -25,4 +25,14 @@ BUILDLINK_API_DEPENDS.libdrm+=		libdrm>=2.4.24
 .  include "../../x11/libXxf86vm/buildlink3.mk"
 .  include "../../x11/xf86driproto/buildlink3.mk"
 .  include "../../x11/xf86vidmodeproto/buildlink3.mk"
+# Linux supports dri3
+.  if ${OPSYS} == "Linux"
+.    if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.56
+BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.9.3
+.    endif
+.    include "../../x11/dri3proto/buildlink3.mk"
+.    include "../../x11/presentproto/buildlink3.mk"
+.    include "../../x11/libxshmfence/buildlink3.mk"
+.  endif
 .endif
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,66 +1,129 @@
-# $NetBSD: options.mk,v 1.27 2015/03/09 19:54:44 tnn Exp $
+# $NetBSD: options.mk,v 1.32 2015/05/28 21:09:07 tnn Exp $

-PKG_OPTIONS_VAR=	PKG_OPTIONS.MesaLib
-PKG_SUPPORTED_OPTIONS=
+PKG_OPTIONS_VAR=		PKG_OPTIONS.MesaLib
+PKG_SUPPORTED_OPTIONS=		llvm dri
+PKG_SUGGESTED_OPTIONS=

-# Assembler code build configurations
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
-    ${OPSYS} != "Darwin"
-#PKG_SUPPORTED_OPTIONS+=		${MACHINE_ARCH}
-#PKG_SUGGESTED_OPTIONS+=		${MACHINE_ARCH}
-.endif
-###
-### XXX  There are [probably] others, but let's not get crazy just yet.
-### 	 This will take a while to test for the myriad platforms we
-### 	 support.
-###
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-     ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \
-     ${MACHINE_ARCH} == "sparc64") && \
-    (${OPSYS} == "NetBSD" || \
-     ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
-     ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
-     ${OPSYS} == "SunOS")
-PKG_SUPPORTED_OPTIONS+=		dri
-.endif
-.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*)
-PKG_SUGGESTED_OPTIONS+=		dri
-.endif
-.if !empty(MACHINE_PLATFORM:MLinux-*-*86*)
-PKG_SUGGESTED_OPTIONS+=		dri
+.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) && (	\
+	${MACHINE_ARCH} == "i386" ||			\
+	${MACHINE_ARCH} == "x86_64" ||			\
+	${MACHINE_ARCH} == "sparc64" ||			\
+	${MACHINE_ARCH} == "powerpc" ||			\
+	!empty(MACHINE_ARCH:M*arm*))
+#PKG_SUGGESTED_OPTIONS+=		llvm
 .endif

-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || (${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11")
+.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" ||		\
+	${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" ||	\
+	${OPSYS} == "SunOS") || ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=		dri
 .endif

 .include "../../mk/bsd.options.mk"
-###
-### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much.
-###	NOTE: there is no assembler code built with libOSMesa.
-#.if (!empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)) && \
-#     !empty(PKG_OPTIONS:Mdri)
-#BUILD_TARGET_SUFFIX=	-${MACHINE_ARCH}
-#.else
-#BUILD_TARGET_SUFFIX=	# empty
-#.endif
+
+# gallium
+PLIST_VARS+=		swrast svga ilo i915 i965 nouveau r300 r600 radeonsi
+# classic DRI
+PLIST_VARS+=		dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri

 .if !empty(PKG_OPTIONS:Mdri)
-CONFIGURE_ARGS+=        --with-driver=dri
+
+# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
+# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported
+CONFIGURE_ARGS+=	--disable-glx-tls
+
 PLIST.dri=	yes
-BUILDLINK_DEPMETHOD.libpciaccess=	full
-.  include "../../sysutils/libpciaccess/buildlink3.mk"
-USE_BUILTIN.MesaLib=	no
-.  include "../../graphics/MesaLib/dri.mk"
-CONFIGURE_ARGS+=        --with-dri-drivers="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome"
+
+BUILDLINK_DEPMETHOD.libpciaccess=      full
+.include "../../sysutils/libpciaccess/buildlink3.mk"
+.include "../../graphics/MesaLib/dri.mk"
+
+# Linux supports dri3
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--enable-dri3
+# DRI on Linux needs either sysfs or udev
+CONFIGURE_ARGS+=	--enable-sysfs
 .else
-CONFIGURE_ARGS+=        --with-driver=xlib
-PLIST.nodri=	yes
-.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*)
-PKG_FAIL_REASON=	"The dri option needs to be enabled for this to build on NetBSD."
+CONFIGURE_ARGS+=	--disable-dri3
 .endif
-###
-### XXX building libOSMesa breaks with -j, and GNU make has no .WAIT
-###
-#MAKE_JOBS_SAFE=			no
+
+DRI_DRIVERS=		#
+PLIST.swrast_dri=	yes
+DRI_DRIVERS+=		swrast
+
+# Software rasterizer
+GALLIUM_DRIVERS=	#
+PLIST.swrast=		yes
+GALLIUM_DRIVERS+=	swrast
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+# svga / VMWare driver
+PLIST.svga=		yes
+GALLIUM_DRIVERS+=	svga
+
+# Intel chipsets, x86 only
+PLIST.i915=		yes
+GALLIUM_DRIVERS+=	i915
+PLIST.i915_dri=		yes
+DRI_DRIVERS+=		i915
+
+# Experimental Intel driver
+PLIST.ilo=		yes
+GALLIUM_DRIVERS+=	ilo
+
+PLIST.i965_dri=		yes
+DRI_DRIVERS+=		i965
+.endif
+
+# AMD Radeon r600
+PLIST.r600=		yes
+GALLIUM_DRIVERS+=	r600
+
+# Qualcomm SnapDragon, libdrm_freedreno.pc
+# GALLIUM_DRIVERS+=	freedreno
+
+# Broadcom VideoCore 4
+# GALLIUM_DRIVERS+=	vc4
+
+# nVidia
+PLIST.nouveau=		yes
+GALLIUM_DRIVERS+=	nouveau
+
+# classic DRI radeon
+PLIST.radeon_dri=	yes
+DRI_DRIVERS+=		radeon
+
+# classic DRI r200
+PLIST.r200_dri=		yes
+DRI_DRIVERS+=		r200
+
+# classic DRI nouveau
+PLIST.nouveau_dri=	yes
+DRI_DRIVERS+=		nouveau
+
+CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm
+CONFIGURE_ARGS+=	--with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
+CONFIGURE_ARGS+=	--with-dri-drivers=${DRI_DRIVERS:ts,}
+
+.if !empty(PKG_OPTIONS:Mllvm)
+# AMD Radeon r300
+PLIST.r300=		yes
+GALLIUM_DRIVERS+=	r300
+# AMD Canary Islands GPUs
+PLIST.radeonsi=		yes
+GALLIUM_DRIVERS+=	radeonsi
+CONFIGURE_ARGS+=	--enable-gallium-llvm
+CONFIGURE_ARGS+=	--enable-r600-llvm-compiler
+.include "../../lang/libLLVM/buildlink3.mk"
+CONFIGURE_ENV+=		ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
+.else # !llvm
+CONFIGURE_ARGS+=	--disable-gallium-llvm
+CONFIGURE_ARGS+=	--disable-r600-llvm-compiler
+.endif # llvm
+.else # !dri
+CONFIGURE_ARGS+=	--with-gallium-drivers=
+CONFIGURE_ARGS+=	--with-dri-drivers=
+CONFIGURE_ARGS+=	--disable-dri
+CONFIGURE_ARGS+=	--disable-dri3
+CONFIGURE_ARGS+=	--enable-xlib-glx
 .endif
--- a/graphics/MesaLib/patches/patch-configure
+++ b/graphics/MesaLib/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Make sure toolchain can assemble SSE stuff in addition to having intrinsics.
+
+--- configure.orig	2015-03-28 18:43:34.000000000 +0000
+++ configure
+@@ -19578,7 +19578,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #include <smmintrin.h>
+ int main () {
+     __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
+-    c = _mm_max_epu32(a, b);
+    c = _mm_max_epu32(a, b); asm volatile ("movntdqa (%esi),%xmm3\n");
+     return 0;
+ }
+ _ACEOF
+@@ -23563,7 +23563,7 @@ if test "x$enable_nine" = xyes; then
+     if ! echo "$with_gallium_drivers" | grep -q 'swrast'; then
+         as_fn_error $? "nine requires the gallium swrast driver" "$LINENO" 5
+     fi
+-    if test "x$with_gallium_drivers" == xswrast; then
+    if test "x$with_gallium_drivers" = xswrast; then
+         as_fn_error $? "nine requires at least one non-swrast gallium driver" "$LINENO" 5
+     fi
+     if test "x$enable_dri3" = xno; then
--- a/graphics/MesaLib/patches/patch-include_EGL_eglplatform.h
+++ b/graphics/MesaLib/patches/patch-include_EGL_eglplatform.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-include_EGL_eglplatform.h,v 1.1 2015/05/16 16:39:52 tnn Exp $
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90249
+
+From 5b31c5cdcdb09d12e3dc5180ab5c80250e8dd2bd Mon Sep 17 00:00:00 2001
+From: Julien Isorce <j.isorce@samsung.com>
+Date: Thu, 30 Apr 2015 08:36:50 +0100
+Subject: [PATCH] egl: use unix defines on osx with clang
+
+CC       egl_dri2.lo
+include/EGL/eglplatform.h:135:2:
+  error: "Platform not recognized"
+include/EGL/eglplatform.h:140:9:
+  error: unknown type name 'EGLNativeDisplayType'
+typedef EGLNativeDisplayType NativeDisplayType;
+
+Signed-off-by: Julien Isorce <j.isorce@samsung.com>
+---
+ include/EGL/eglplatform.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
+index 2eb6865..672119e 100644
+--- include/EGL/eglplatform.h
+++ include/EGL/eglplatform.h
+@@ -104,7 +104,7 @@ typedef struct ANativeWindow        *EGLNativeWindowType;
+ typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
+ typedef void                        *EGLNativeDisplayType;
+ 
+-#elif defined(__unix__)
+#elif defined(__unix__) || defined(__APPLE__)
+ 
+ #if defined(MESA_EGL_NO_X11_HEADERS)
--- a/graphics/MesaLib/patches/patch-include_GL_glxext.h
+++ b/graphics/MesaLib/patches/patch-include_GL_glxext.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_GL_glxext.h,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Make sure the GLsizeiptr and GLintptr types are defined
+
+--- include/GL/glxext.h.orig	2014-10-03 03:59:50.000000000 +0000
+++ include/GL/glxext.h
+@@ -477,6 +477,10 @@ Bool glXSet3DfxModeMESA (int mode);
+ 
+ #ifndef GLX_NV_copy_buffer
+ #define GLX_NV_copy_buffer 1
+#ifndef GL_VERSION_1_5
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+#endif
+ typedef void ( *PFNGLXCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+ typedef void ( *PFNGLXNAMEDCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+ #ifdef GLX_GLXEXT_PROTOTYPES
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_uformattests.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_uformattests.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_gallium_auxiliary_util_u__format__tests.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+On old NetBSD, NAN in math.h is __nanf.__val. Which is not constant.
+
+--- src/gallium/auxiliary/util/u_format_tests.c.orig	2014-09-12 21:30:32.000000000 +0000
+++ src/gallium/auxiliary/util/u_format_tests.c
+@@ -28,6 +28,10 @@
+ 
+ #include <math.h>
+ #include <float.h>
+#if defined(__NetBSD__) && __NetBSD_Version__ < 600000000
+#undef NAN
+#define NAN __builtin_nanf("")
+#endif
+ 
+ #include "pipe/p_config.h"
+ #include "u_memory.h"
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_gallium_auxiliary_util_u__math.h,v 1.2 2015/05/11 21:33:58 tnn Exp $
+
+The C99 "restrict" keyword is not valid in C++, but most compilers will
+understand __restrict.
+
+--- src/gallium/auxiliary/util/u_math.h.orig   2015-03-28 18:20:39.000000000 +0000
+++ src/gallium/auxiliary/util/u_math.h
+@@ -528,7 +528,10 @@ unsigned ffs( unsigned u )
+ 
+    return i;
+ }
+-#elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
+#elif defined(__NetBSD__)
+#include <sys/bitops.h>
+#define ffsll ffs64
+#elif defined(__GNUC__)
+ #define ffs __builtin_ffs
+ #define ffsll __builtin_ffsll
+ #endif
+@@ -821,6 +824,11 @@ util_bswap16(uint16_t n)
+           (n << 8);
+ }
+ 
+#if defined(__cplusplus) && !defined(restrict)
+#define undef_restrict
+#define restrict __restrict
+#endif
+
+ static INLINE void*
+ util_memcpy_cpu_to_le32(void * restrict dest, const void * restrict src, size_t n)
+ {
+@@ -839,6 +847,11 @@ util_memcpy_cpu_to_le32(void * restrict 
+ #endif
+ }
+ 
+#if defined(undef_restrict)
+#undef undef_restrict
+#undef restrict
+#endif
+
+ /**
+  * Clamp X to [MIN, MAX].
+  * This is a macro to allow float, int, uint, etc. types.
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__network.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__network.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_gallium_auxiliary_util_u__network.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+BSD has sockets, silence warning about missing implementation.
+
+--- src/gallium/auxiliary/util/u_network.c.orig	2014-09-12 21:30:32.000000000 +0000
+++ src/gallium/auxiliary/util/u_network.c
+@@ -7,7 +7,7 @@
+ #  include <winsock2.h>
+ #  include <windows.h>
+ #elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
+-   defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
+   defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_BSD)
+ #  include <sys/socket.h>
+ #  include <netinet/in.h>
+ #  include <unistd.h>
+@@ -56,7 +56,7 @@ u_socket_close(int s)
+       return;
+ 
+ #if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) \
+-    || defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS)
+    || defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_BSD)
+    shutdown(s, SHUT_RDWR);
+    close(s);
+ #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
+@@ -172,7 +172,7 @@ void
+ u_socket_block(int s, boolean block)
+ {
+ #if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) \
+-    || defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS)
+    || defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_BSD)
+    int old = fcntl(s, F_GETFL, 0);
+    if (old == -1)
+       return;
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__network.h
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__network.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gallium_auxiliary_util_u__network.h,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+BSD has sockets, silence warning about missing implementation.
+
+--- src/gallium/auxiliary/util/u_network.h.orig	2014-09-12 21:30:32.000000000 +0000
+++ src/gallium/auxiliary/util/u_network.h
+@@ -7,7 +7,7 @@
+ #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
+ #  define PIPE_HAVE_SOCKETS
+ #elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
+-    defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS)
+    defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_BSD)
+ #  define PIPE_HAVE_SOCKETS
+ #endif
+ 
--- a/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_codegen_nv50irpeephole.cpp
+++ b/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_codegen_nv50irpeephole.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+The C99 "restrict" keyword is not valid in C++, but most compilers will
+understand __restrict.
+
+--- src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+@@ -1530,7 +1530,7 @@ private:
+ 
+    bool replaceLdFromLd(Instruction *ld, Record *ldRec);
+    bool replaceLdFromSt(Instruction *ld, Record *stRec);
+-   bool replaceStFromSt(Instruction *restrict st, Record *stRec);
+   bool replaceStFromSt(Instruction *__restrict st, Record *stRec);
+ 
+    void addRecord(Instruction *ldst);
+    void purgeRecords(Instruction *const st, DataFile);
+@@ -1817,7 +1817,7 @@ MemoryOpt::replaceLdFromLd(Instruction *
+ }
+ 
+ bool
+-MemoryOpt::replaceStFromSt(Instruction *restrict st, Record *rec)
+MemoryOpt::replaceStFromSt(Instruction *__restrict st, Record *rec)
+ {
+    const Instruction *const ri = rec->insn;
+    Value *extra[3];
--- a/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_nouveauvp3video.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_nouveauvp3video.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Fix build on platforms without close-on-exec.
+
+--- src/gallium/drivers/nouveau/nouveau_vp3_video.c.orig	2014-09-12 21:30:32.000000000 +0000
+++ src/gallium/drivers/nouveau/nouveau_vp3_video.c
+@@ -292,7 +292,11 @@ nouveau_vp3_load_firmware(struct nouveau
+    if (nouveau_bo_map(dec->fw_bo, NOUVEAU_BO_WR, dec->client))
+       return 1;
+ 
+#ifdef O_CLOEXEC
+    fd = open(path, O_RDONLY | O_CLOEXEC);
+#else
+   fd = open(path, O_RDONLY);
+#endif
+    if (fd < 0) {
+       fprintf(stderr, "opening firmware file %s failed: %m\n", path);
+       return 1;
--- a/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_nv50_nv84__video.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_nv50_nv84__video.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_gallium_drivers_nouveau_nv50_nv84__video.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Fix build on platforms without close-on-exec.
+
+--- src/gallium/drivers/nouveau/nv50/nv84_video.c.orig	2015-03-21 00:51:18.000000000 +0000
+++ src/gallium/drivers/nouveau/nv50/nv84_video.c
+@@ -34,7 +34,11 @@
+ static int
+ nv84_copy_firmware(const char *path, void *dest, ssize_t len)
+ {
+#ifdef O_CLOEXEC
+    int fd = open(path, O_RDONLY | O_CLOEXEC);
+#else
+   int fd = open(path, O_RDONLY);
+#endif
+    ssize_t r;
+    if (fd < 0) {
+       fprintf(stderr, "opening firmware file %s failed: %m\n", path);
--- a/graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h
+++ b/graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h
@@ -1,44 +1,15 @@
-$NetBSD: patch-src_gallium_include_pipe_p__config.h,v 1.4 2014/05/03 19:03:59 ryoon Exp $
+$NetBSD: patch-src_gallium_include_pipe_p__config.h,v 1.5 2015/04/25 11:19:18 tnn Exp $

-Adjust Endianness for PowerPC, NetBSD, OpenBSD or SunOS.
+Fix endian detection on NetBSD.

--- src/gallium/include/pipe/p_config.h.orig	2011-10-15 00:43:58.000000000 +0000
+--- src/gallium/include/pipe/p_config.h.orig	2015-01-17 14:53:45.000000000 +0000
 +++ src/gallium/include/pipe/p_config.h
-@@ -99,7 +99,7 @@
- #endif
- #endif
- 
-#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__)
-+#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__) || defined(__powerpc__)
- #define PIPE_ARCH_PPC
- #if defined(__ppc64__) || defined(__PPC64__)
- #define PIPE_ARCH_PPC_64
-@@ -129,6 +129,28 @@
+@@ -157,7 +157,7 @@
 # define PIPE_ARCH_BIG_ENDIAN
 #endif
 
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__)
-+#include <sys/endian.h>
-+#else /* OpenBSD */
-+#include <machine/endian.h>
-+#endif
-+
-+#if _BYTE_ORDER == _LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif _BYTE_ORDER == _BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
-+#elif defined(__sun)
-+#include <sys/isa_defs.h>
-+
-+#if defined(_LITTLE_ENDIAN)
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif defined(_BIG_ENDIAN)
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #else
+-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #include <machine/endian.h>
 
- #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
--- a/graphics/MesaLib/patches/patch-src_gallium_targets_dri_Makefile.in
+++ b/graphics/MesaLib/patches/patch-src_gallium_targets_dri_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gallium_targets_dri_Makefile.in,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+DRI drivers need explicit linkage to glapi. FDO bug 57702. We only need to do
+this for the "mega" drivers since that's where final linking takes place.
+
+--- src/gallium/targets/dri/Makefile.in.orig	2015-03-28 18:43:38.000000000 +0000
+++ src/gallium/targets/dri/Makefile.in
+@@ -735,6 +735,7 @@ GALLIUM_TARGET_CFLAGS = \
+ 	$(VISIBILITY_CFLAGS)
+ 
+ GALLIUM_COMMON_LIB_DEPS = \
+	$(top_srcdir)/src/mapi/shared-glapi/libglapi.la \
+ 	-lm \
+ 	$(CLOCK_LIB) \
+ 	$(PTHREAD_LIBS) \
--- a/graphics/MesaLib/patches/patch-src_gallium_winsys_radeon_drm_radeondrmwinsys.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_winsys_radeon_drm_radeondrmwinsys.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Don't create pipe thread on NetBSD. It triggers some kernel bug.
+kern/49838.
+
+--- src/gallium/winsys/radeon/drm/radeon_drm_winsys.c.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+@@ -704,8 +704,10 @@ radeon_drm_winsys_create(int fd, radeon_
+ 
+     ws->ncs = 0;
+     pipe_semaphore_init(&ws->cs_queued, 0);
+#if !defined(__NetBSD__)
+     if (ws->num_cpus > 1 && debug_get_option_thread())
+         ws->thread = pipe_thread_create(radeon_drm_cs_emit_ioctl, ws);
+#endif
+ 
+     /* Create the screen at the end. The winsys must be initialized
+      * completely.
--- a/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Solaris needs sys/mkdev.h for major(2).
+
+--- src/gallium/winsys/svga/drm/vmw_screen.c.orig	2014-09-12 21:30:32.000000000 +0000
+++ src/gallium/winsys/svga/drm/vmw_screen.c
+@@ -32,6 +32,9 @@
+ #include "pipe/p_compiler.h"
+ #include "util/u_hash_table.h"
+ #include <sys/types.h>
+#ifdef __sun
+#include <sys/mkdev.h> /* for major(2) */
+#endif
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
--- a/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmwscreenioctl.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmwscreenioctl.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c,v 1.3 2015/05/15 14:27:42 nros Exp $
+
+Make sure ERESTART gets defined.
+
+--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig	2015-04-24 21:09:35.000000000 +0000
+++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
+@@ -48,6 +48,25 @@
+ 
+ #include "os/os_mman.h"
+ 
+#if defined(__NetBSD__)
+#define _KMEMUSER
+#include <errno.h>
+#if !defined(ERESTART)
+#define ERESTART -3
+#endif
+#endif
+
+#if defined(__FreeBSD__)
+#include <errno.h>
+#if !defined(ERESTART)
+#define ERESTART -1
+#endif
+#endif
+
+#if defined(__DragonFly__)
+#define _KERNEL_STRUCTURES 1
+#endif
+
+ #include <errno.h>
+ #include <unistd.h>
+ 
--- a/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c
+++ b/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_gbm_main_gbm.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Solaris needs sys/mkdev.h for major(2).
+
+--- src/gbm/main/gbm.c.orig	2015-03-21 00:51:18.000000000 +0000
+++ src/gbm/main/gbm.c
+@@ -35,6 +35,9 @@
+ #include <stdint.h>
+ 
+ #include <sys/types.h>
+#ifdef __sun
+#include <sys/mkdev.h> /* for major(2) */
+#endif
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <errno.h>
--- a/graphics/MesaLib/patches/patch-src_glsl_ralloc.c
+++ b/graphics/MesaLib/patches/patch-src_glsl_ralloc.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_glsl_ralloc.c,v 1.2 2014/08/06 10:25:14 wiz Exp $
+$NetBSD: patch-src_glsl_ralloc.c,v 1.3 2015/04/25 11:19:18 tnn Exp $

 * Fix exit time segfault of qt5 application with modular xorg

--- src/glsl/ralloc.c.orig	2011-10-15 00:43:58.000000000 +0000
-+++ src/glsl/ralloc.c
-@@ -272,7 +272,7 @@ ralloc_parent(const void *ptr)
+--- src/util/ralloc.c.orig	2014-10-03 03:59:51.000000000 +0000
+++ src/util/ralloc.c
+@@ -285,7 +285,7 @@ ralloc_parent(const void *ptr)
 
 static void *autofree_context = NULL;
 
@@ -13,7 +13,7 @@ $NetBSD: patch-src_glsl_ralloc.c,v 1.2 2014/08/06 10:25:14 wiz Exp $
 autofree(void)
 {
    ralloc_free(autofree_context);
-@@ -283,7 +283,6 @@ ralloc_autofree_context(void)
+@@ -296,7 +296,6 @@ ralloc_autofree_context(void)
 {
    if (unlikely(autofree_context == NULL)) {
       autofree_context = ralloc_context(NULL);
--- a/graphics/MesaLib/patches/patch-src_mapi_entryx86-64tls.h
+++ b/graphics/MesaLib/patches/patch-src_mapi_entryx86-64tls.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mapi_entry__x86-64__tls.h,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Fix --enable-glx-tls with clang. From FreeBSD.
+
+--- src/mapi/entry_x86-64_tls.h.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/mapi/entry_x86-64_tls.h
+@@ -62,8 +62,8 @@ entry_patch_public(void)
+ {
+ }
+ 
+-static char
+-x86_64_entry_start[];
+extern char
+x86_64_entry_start[] __attribute__((visibility("hidden")));
+ 
+ mapi_func
+ entry_get_public(int slot)
--- a/graphics/MesaLib/patches/patch-src_mapi_entryx86tls.h
+++ b/graphics/MesaLib/patches/patch-src_mapi_entryx86tls.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mapi_entry__x86__tls.h,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Fix --enable-glx-tls with clang. From FreeBSD.
+
+--- src/mapi/entry_x86_tls.h.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/mapi/entry_x86_tls.h
+@@ -72,8 +72,8 @@ __asm__(".text");
+ extern unsigned long
+ x86_current_tls();
+ 
+-static char x86_entry_start[];
+-static char x86_entry_end[];
+extern char x86_entry_start[] __attribute__((visibility("hidden")));
+extern char x86_entry_end[] __attribute__((visibility("hidden")));
+ 
+ void
+ entry_patch_public(void)
--- a/graphics/MesaLib/patches/patch-src_mapi_entryx86tsd.h
+++ b/graphics/MesaLib/patches/patch-src_mapi_entryx86tsd.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mapi_entry__x86__tsd.h,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Fix --enable-glx-tls with clang. From FreeBSD.
+
+--- src/mapi/entry_x86_tsd.h.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/mapi/entry_x86_tsd.h
+@@ -59,8 +59,8 @@ __asm__(".balign 32\n"
+ #include <string.h>
+ #include "u_execmem.h"
+ 
+-static const char x86_entry_start[];
+-static const char x86_entry_end[];
+extern const char x86_entry_start[] __attribute__((visibility("hidden")));
+extern const char x86_entry_end[] __attribute__((visibility("hidden")));
+ 
+ void
+ entry_patch_public(void)
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_Makefile.in
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mesa_drivers_dri_Makefile.in,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+DRI drivers need explicit linkage to glapi. FDO bug 57702. We only need to do
+this for the "mega" drivers since that's where final linking takes place.
+
+--- src/mesa/drivers/dri/Makefile.in.orig	2015-03-28 18:43:41.000000000 +0000
+++ src/mesa/drivers/dri/Makefile.in
+@@ -581,6 +581,7 @@ mesa_dri_drivers_la_LIBADD = \
+         common/libdricommon.la \
+         $(MEGADRIVERS_DEPS) \
+         $(DRI_LIB_DEPS) \
+         $(top_srcdir)/src/mapi/shared-glapi/libglapi.la \
+         $()
+ 
+ @NEED_MEGADRIVER_TRUE@dri_LTLIBRARIES = mesa_dri_drivers.la
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_Makefile.in
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mesa_drivers_dri_common_Makefile.in,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Don't install the sysconf directory for now.
+
+--- src/mesa/drivers/dri/common/Makefile.in.orig	2015-02-28 00:06:10.000000000 +0000
+++ src/mesa/drivers/dri/common/Makefile.in
+@@ -710,6 +710,9 @@ mostlyclean-libtool:
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-sysconfDATA: $(sysconf_DATA)
+	true
+
+disabled-install-sysconfDATA:
+ 	@$(NORMAL_INSTALL)
+ 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ 	if test -n "$$list"; then \
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mesa_drivers_dri_common_xmlconfig.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Fix broken ifdef.
+
+--- src/mesa/drivers/dri/common/xmlconfig.c.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/mesa/drivers/dri/common/xmlconfig.c
+@@ -53,7 +53,7 @@ extern char *program_invocation_name, *p
+ #        include <stdlib.h>
+ #        define GET_PROGRAM_NAME() getprogname()
+ #    endif
+-#elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)
+#elif defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
+ #    include <stdlib.h>
+ #    define GET_PROGRAM_NAME() getprogname()
+ #elif defined(__APPLE__)
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_mesa_drivers_dri_i915_intel__screen.c,v 1.2 2015/06/07 15:48:12 tnn Exp $
+
+Fix build on older NetBSD w/o _SC_PHYS_PAGES.
+
+--- src/mesa/drivers/dri/i915/intel_screen.c.orig	2015-06-07 10:06:53.000000000 +0000
+++ src/mesa/drivers/dri/i915/intel_screen.c
+@@ -41,6 +41,10 @@
+ #include "utils.h"
+ #include "xmlpool.h"
+ 
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
+
+ static const __DRIconfigOptionsExtension i915_config_options = {
+    .base = { __DRI_CONFIG_OPTIONS, 1 },
+    .xml =
+@@ -732,6 +736,13 @@ i915_query_renderer_integer(__DRIscreen 
+       const unsigned gpu_mappable_megabytes =
+          (aper_size / (1024 * 1024)) * 3 / 4;
+ 
+#if defined(HW_PHYSMEM64)
+      int mib[2] = { CTL_HW, HW_PHYSMEM64 };
+      uint64_t system_memory_bytes;
+      size_t len = sizeof(system_memory_bytes);
+      if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
+         return -1;
+#else
+       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
+       const long system_page_size = sysconf(_SC_PAGE_SIZE);
+ 
+@@ -740,6 +751,7 @@ i915_query_renderer_integer(__DRIscreen 
+ 
+       const uint64_t system_memory_bytes = (uint64_t) system_memory_pages
+          * (uint64_t) system_page_size;
+#endif
+ 
+       const unsigned system_memory_megabytes =
+          (unsigned) (system_memory_bytes / (1024 * 1024));
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_intel__screen.c,v 1.2 2015/06/07 15:48:12 tnn Exp $
+
+Fix build on older NetBSD w/o _SC_PHYS_PAGES.
+
+--- src/mesa/drivers/dri/i965/intel_screen.c.orig	2015-06-07 10:06:53.000000000 +0000
+++ src/mesa/drivers/dri/i965/intel_screen.c
+@@ -42,6 +42,10 @@
+ #include "utils.h"
+ #include "xmlpool.h"
+ 
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
+
+ static const __DRIconfigOptionsExtension brw_config_options = {
+    .base = { __DRI_CONFIG_OPTIONS, 1 },
+    .xml =
+@@ -829,6 +833,13 @@ brw_query_renderer_integer(__DRIscreen *
+       const unsigned gpu_mappable_megabytes =
+          (aper_size / (1024 * 1024)) * 3 / 4;
+ 
+#if defined(HW_PHYSMEM64)
+      int mib[2] = { CTL_HW, HW_PHYSMEM64 };
+      const uint64_t system_memory_bytes;
+      size_t len = sizeof(system_memory_bytes);
+      if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
+         return -1;
+#else
+       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
+       const long system_page_size = sysconf(_SC_PAGE_SIZE);
+ 
+@@ -837,6 +848,7 @@ brw_query_renderer_integer(__DRIscreen *
+ 
+       const uint64_t system_memory_bytes = (uint64_t) system_memory_pages
+          * (uint64_t) system_page_size;
+#endif
+ 
+       const unsigned system_memory_megabytes =
+          (unsigned) (system_memory_bytes / (1024 * 1024));
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_swrast_swrast.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_swrast_swrast.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_mesa_drivers_dri_swrast_swrast.c,v 1.2 2015/06/07 15:48:12 tnn Exp $
+
+Fix build on older NetBSD w/o _SC_PHYS_PAGES.
+
+--- src/mesa/drivers/dri/swrast/swrast.c.orig	2015-06-07 10:06:53.000000000 +0000
+++ src/mesa/drivers/dri/swrast/swrast.c
+@@ -150,6 +150,12 @@ swrast_query_renderer_integer(__DRIscree
+         size_t len = sizeof(system_memory_bytes);
+         if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
+             return -1;
+#elif defined(HW_PHYSMEM64)
+        int mib[2] = { CTL_HW, HW_PHYSMEM64 };
+        uint64_t system_memory_bytes;
+        size_t len = sizeof(system_memory_bytes);
+        if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
+            return -1;
+ #elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGE_SIZE)
+       /* XXX: Do we want to return the full amount of system memory ? */
+       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
--- a/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h
@@ -1,47 +1,20 @@
-$NetBSD: patch-src_mesa_main_compiler.h,v 1.3 2013/06/16 04:16:59 obache Exp $
+$NetBSD: patch-src_mesa_main_compiler.h,v 1.4 2015/04/25 11:19:18 tnn Exp $

--- src/mesa/main/compiler.h.orig	2011-11-23 01:09:52.000000000 +0000
+i386 FPU control word defaults.
+
+--- src/mesa/main/compiler.h.orig	2015-03-28 18:20:39.000000000 +0000
 +++ src/mesa/main/compiler.h
-@@ -248,7 +248,26 @@ extern "C" {
-  * Try to use a runtime test instead.
-  * For now, only used by some DRI hardware drivers for color/texel packing.
+@@ -285,7 +285,13 @@ static inline GLuint CPU_TO_LE32(GLuint 
+ /* Hardware default: All exceptions masked, extended double precision,
+  * round to nearest (IEEE compliant):
  */
-#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
-+#ifdef __sun
-+#include <sys/isa_defs.h>
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
-+#include <machine/endian.h>
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
+#if defined(__NetBSD__)
+#define DEFAULT_X86_FPU		0x127f	/* __NetBSD_NPXCW__ */
+#elif defined(__FreeBSD__)
+#define DEFAULT_X86_FPU		0x1272	/* __FreeBSD_NPXCW__ */
+#else
+ #define DEFAULT_X86_FPU		0x037f
 +#endif
-+
-+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN)
-+#  if BYTE_ORDER == BIG_ENDIAN
-+#define MESA_BIG_ENDIAN 1
-+#  endif
-+#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN)
-+#  if _BYTE_ORDER == _BIG_ENDIAN
-+#define MESA_BIG_ENDIAN 1
-+#  endif
-+#elif defined(__sun) && defined(_BIG_ENDIAN)
-+#define MESA_BIG_ENDIAN 1
-+#endif
-+#if MESA_BIG_ENDIAN == 1
- #if defined(__linux__)
- #include <byteswap.h>
- #define CPU_TO_LE32( x )	bswap_32( x )
-@@ -263,11 +282,13 @@ static INLINE GLuint CPU_TO_LE32(GLuint 
-            ((x & 0x00ff0000) >>  8) |
-            ((x & 0xff000000) >> 24));
- }
-+#elif defined(__sun)
-+#include <sys/byteorder.h>
-+#define CPU_TO_LE32( x )        BSWAP_32( x )
- #else /*__linux__ */
- #include <sys/endian.h>
- #define CPU_TO_LE32( x )	bswap32( x )
- #endif /*__linux__*/
-#define MESA_BIG_ENDIAN 1
- #else
- #define CPU_TO_LE32( x )	( x )
- #define MESA_LITTLE_ENDIAN 1
+ /* All exceptions masked, single precision, round to nearest:
+  */
+ #define FAST_X86_FPU		0x003f
--- a/graphics/MesaLib/patches/patch-src_mesa_main_context.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_context.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_mesa_main_context.c,v 1.1 2014/08/06 10:25:14 wiz Exp $
+$NetBSD: patch-src_mesa_main_context.c,v 1.2 2015/04/25 11:19:18 tnn Exp $

 * Fix exit time segfault of qt5 application with modular xorg

--- src/mesa/main/context.c.orig	2011-10-15 00:43:58.000000000 +0000
+--- src/mesa/main/context.c.orig	2015-03-28 18:20:39.000000000 +0000
 +++ src/mesa/main/context.c
-@@ -383,10 +383,10 @@ _glthread_DECLARE_STATIC_MUTEX(OneTimeLo
+@@ -378,10 +378,10 @@ mtx_t OneTimeLock = _MTX_INITIALIZER_NP;
  *
  * \sa _math_init().
  */
@@ -14,11 +14,11 @@ $NetBSD: patch-src_mesa_main_context.c,v 1.1 2014/08/06 10:25:14 wiz Exp $
 {
 -   static GLbitfield api_init_mask = 0x0;
 
-    _glthread_LOCK_MUTEX(OneTimeLock);
+    mtx_lock(&OneTimeLock);
 
-@@ -441,14 +441,16 @@ one_time_init( struct gl_context *ctx )
+@@ -428,14 +428,16 @@ one_time_init( struct gl_context *ctx )
 
-    _glthread_UNLOCK_MUTEX(OneTimeLock);
+    mtx_unlock(&OneTimeLock);
 
 -   /* Hopefully atexit() is widely available.  If not, we may need some
 -    * #ifdef tests here.
--- a/graphics/MesaLib/patches/patch-src_mesa_main_shader__query.cpp
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_shader__query.cpp
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_mesa_main_shader__query.cpp,v 1.1 2015/05/16 16:39:52 tnn Exp $
+
+https://bugs.freedesktop.org/show_bug.cgi?id=66346
+
+From c4a1fec68d2508ff0c4fc2831465aca8c4ca783a Mon Sep 17 00:00:00 2001
+From: Julien Isorce <j.isorce@samsung.com>
+Date: Wed, 22 Apr 2015 23:04:42 +0100
+Subject: [PATCH 1/2] shader_query: convert GLhandleARB to uintptr_t before
+ troncating to GLuint
+
+Fixes compiler error on OSX as GLhandleARB is defined as void* if __APPLE__.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=66346
+---
+ src/mesa/main/shader_query.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp
+index bc6fec5..22d9e0f 100644
+--- src/mesa/main/shader_query.cpp
+++ src/mesa/main/shader_query.cpp
+@@ -68,7 +68,7 @@ _mesa_BindAttribLocation(GLhandleARB program, GLuint index,
+    GET_CURRENT_CONTEXT(ctx);
+ 
+    struct gl_shader_program *const shProg =
+-      _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation");
+      _mesa_lookup_shader_program_err(ctx, (GLuint)(uintptr_t)program, "glBindAttribLocation");
+    if (!shProg)
+       return;
+ 
+@@ -136,7 +136,7 @@ _mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index,
+       return;
+    }
+ 
+-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
+   shProg = _mesa_lookup_shader_program_err(ctx, (GLuint)(uintptr_t)program, "glGetActiveAttrib");
+    if (!shProg)
+       return;
+ 
+@@ -250,7 +250,7 @@ _mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name)
+ {
+    GET_CURRENT_CONTEXT(ctx);
+    struct gl_shader_program *const shProg =
+-      _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
+      _mesa_lookup_shader_program_err(ctx, (GLuint)(uintptr_t)program, "glGetAttribLocation");
+ 
+    if (!shProg) {
+       return -1;
--- a/graphics/MesaLib/patches/patch-src_mesa_x86_common__x86.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_x86_common__x86.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mesa_x86_common__x86.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Treat NetBSD like OpenBSD.
+
+--- src/mesa/x86/common_x86.c.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/mesa/x86/common_x86.c
+@@ -42,7 +42,7 @@
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
+-#if defined(USE_SSE_ASM) && defined(__OpenBSD__)
+#if defined(USE_SSE_ASM) && (defined(__OpenBSD__) || defined(__NetBSD__))
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <machine/cpu.h>
--- a/graphics/MesaLib/patches/patch-src_util_u__atomic.h
+++ b/graphics/MesaLib/patches/patch-src_util_u__atomic.h
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_util_u__atomic.h,v 1.1 2015/04/25 11:19:18 tnn Exp $
+
+Fix SunOS atomic macros.
+
+--- src/util/u_atomic.h.orig	2015-03-28 18:20:39.000000000 +0000
+++ src/util/u_atomic.h
+@@ -175,7 +175,7 @@ char _InterlockedCompareExchange8(char v
+    sizeof(*v) == sizeof(uint16_t) ? atomic_inc_16((uint16_t *)(v)) : \
+    sizeof(*v) == sizeof(uint32_t) ? atomic_inc_32((uint32_t *)(v)) : \
+    sizeof(*v) == sizeof(uint64_t) ? atomic_inc_64((uint64_t *)(v)) : \
+-                                    (assert(!"should not get here"), 0))
+                                    (assert(!"should not get here"), (void)0))
+ 
+ #define p_atomic_inc_return(v) ((__typeof(*v)) \
+    sizeof(*v) == sizeof(uint8_t)  ? atomic_inc_8_nv ((uint8_t  *)(v)) : \
+@@ -184,12 +184,12 @@ char _InterlockedCompareExchange8(char v
+    sizeof(*v) == sizeof(uint64_t) ? atomic_inc_64_nv((uint64_t *)(v)) : \
+                                     (assert(!"should not get here"), 0))
+ 
+-#define p_atomic_dec(v) ((void) \
+#define p_atomic_dec(v) (void) (\
+    sizeof(*v) == sizeof(uint8_t)  ? atomic_dec_8 ((uint8_t  *)(v)) : \
+    sizeof(*v) == sizeof(uint16_t) ? atomic_dec_16((uint16_t *)(v)) : \
+    sizeof(*v) == sizeof(uint32_t) ? atomic_dec_32((uint32_t *)(v)) : \
+    sizeof(*v) == sizeof(uint64_t) ? atomic_dec_64((uint64_t *)(v)) : \
+-                                    (assert(!"should not get here"), 0))
+                                    (assert(!"should not get here"), (void)0))
+ 
+ #define p_atomic_dec_return(v) ((__typeof(*v)) \
+    sizeof(*v) == sizeof(uint8_t)  ? atomic_dec_8_nv ((uint8_t  *)(v)) : \
--- a/graphics/MesaLib7/DESCR
+++ b/graphics/MesaLib7/DESCR
@@ -0,0 +1,5 @@
+MesaLib is a 3-D graphics library with an API which is very similar to
+that of OpenGL*.  To the extent that Mesa utilizes the OpenGL command syntax
+or state machine, it is being used with authorization from Silicon Graphics,
+Inc.  However, the author makes no claim that Mesa is in any way a
+compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
--- a/graphics/MesaLib7/Makefile
+++ b/graphics/MesaLib7/Makefile
@@ -0,0 +1,145 @@
+# $NetBSD: Makefile,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+DISTNAME?=	${MESA_DISTNAME}
+PKGNAME=	MesaLib7-${MESA_PKGVERSION}
+CATEGORIES=	graphics
+MASTER_SITES=	${MESA_SITES}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.mesa3d.org/
+COMMENT=	Graphics library similar to SGI's OpenGL
+
+INSTALLATION_PREFIX=	${LOCALBASE}/MesaLib7
+
+DISTFILES+=		MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
+MESA_DISTNAME= 		MesaLib-${MESA_VERSION}
+MESA_SITES=		ftp://freedesktop.org/pub/mesa/${MESA_VERSION}/
+MESA_VERSION=		7.11.2
+MESA_PKGVERSION=	${MESA_VERSION}
+
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c99 c++
+USE_TOOLS+=		automake bison flex gmake pkg-config makedepend
+WRKSRC=			${WRKDIR}/Mesa-${MESA_VERSION}
+DIST_SUBDIR=		Mesa-${MESA_PKGVERSION}
+
+CONFLICTS+=	xf86driproto<2.0.4
+
+PLIST_VARS=		dri nodri
+
+PKGCONFIG_OVERRIDE+=	src/mesa/drivers/dri/dri.pc.in
+PKGCONFIG_OVERRIDE+=	src/mesa/gl.pc.in
+PKGCONFIG_OVERRIDE+=	src/mesa/osmesa.pc.in
+PKGCONFIG_OVERRIDE+=	src/glw/glw.pc.in
+
+CONFIGURE_ARGS+=	--disable-glu
+CONFIGURE_ARGS+=	--disable-glut
+CONFIGURE_ARGS+=	--disable-motif
+CONFIGURE_ARGS+=	--with-gallium-drivers=""
+CONFIGURE_ARGS+=	--disable-gallium-llvm
+CONFIGURE_ARGS+=	--disable-egl
+
+.include "glx-config.mk"
+
+PYTHON_FOR_BUILD_ONLY=		tool
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 7.11.2
+
+MAKE_ENV+=		MAKE=${GMAKE:Q}
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mccc)
+CFLAGS+=	-D__FUNCTION__=__FILE__
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+.endif
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+# XXX This is not quite enough: we will need to patch the makefile
+# because it bogusly tries to reuse objects for native tools and target
+# libraries, and for cross-compiling the objects need to be built
+# separately.  Alternatively, we could just update Mesa to something
+# less prehistoric...
+SUBST_CLASSES+=		nativecc
+SUBST_STAGE.nativecc=	pre-configure
+SUBST_MESSAGE.nativecc=	Fix makefiles to compile tools with native cc.
+SUBST_FILES.nativecc+=	src/glsl/Makefile
+SUBST_SED.nativecc+=	-e 's,$$(CC),$$(APP_CC),g'
+SUBST_SED.nativecc+=	-e 's,$$(CXX),$$(APP_CXX),g'
+MAKE_FLAGS+=		APP_CC=${NATIVE_CC:Q}
+MAKE_FLAGS+=		APP_CXX=${NATIVE_CXX:Q}
+.endif
+
+.include "options.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
+##
+## NetBSD 2.x and earlier require pthread stubs
+##
+.  include "../../devel/pthread-stublib/buildlink3.mk"
+PTHREAD_STUBLIB= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthstub
+.elif !empty(MACHINE_PLATFORM:MNetBSD-*)
+##
+## NetBSD 3.x and later have pthread stubs in libc
+##
+PTHREAD_STUBLIB=
+.else
+##
+## Other platforms may or may not have stubs provided by libc, but pulling in
+## threading support via the pthread.buildlink3.mk definitions will provide
+## all the necessary interfaces.  This matches the standard configuration for
+## most platforms as they appear in "${WRKSRC}/configs", and is necessary
+## for successful linking with libGL under many platforms.
+##
+.include "../../mk/pthread.buildlink3.mk"
+PTHREAD_STUBLIB= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+.endif
+PKGSRC_MAKE_ENV+=	PTHREAD_STUBLIB=${PTHREAD_STUBLIB:Q}
+MAKE_ENV+=		PTHREAD_STUBLIB=${PTHREAD_STUBLIB:Q}
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+MAKE_ENV+=	CROSS_COMPILING=yes
+.endif
+
+pre-configure:
+	cd ${WRKSRC} && ${MAKE} configure
+
+post-extract:
+.if !empty(PKG_OPTIONS:Mdri) && (${OPSYS} == "SunOS")
+	${CP} ${FILESDIR}/mapfile.externs ${WRKSRC}/src/mesa/drivers/dri/
+.endif
+	${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86
+	${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86
+	${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh
+
+#
+# remove include files installed respectively by ../glu and ../glut
+#
+pre-install:
+	${RM} -f ${WRKSRC}/include/GL/glu*.h
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+=	-no-integrated-as -fvisibility=hidden
+.endif
+
+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+.endif
+
+.include "../../lang/python/tool.mk"
+BUILDLINK_DEPMETHOD.libxml2?=	build
+.include "../../textproc/libxml2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glproto+=	glproto>=1.4.11
+.include "../../x11/glproto/buildlink3.mk"
+.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"
+.include "../../mk/bsd.pkg.mk"
--- a/graphics/MesaLib7/PLIST
+++ b/graphics/MesaLib7/PLIST
@@ -0,0 +1,46 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/05 17:01:37 tnn Exp $
+include/GL/GLwDrawA.h
+include/GL/GLwDrawAP.h
+include/GL/GLwMDrawA.h
+include/GL/GLwMDrawAP.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glext.h
+include/GL/glfbdev.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/glxext.h
+${PLIST.dri}include/GL/internal/dri_interface.h
+include/GL/mesa_wgl.h
+include/GL/osmesa.h
+include/GL/vms_x_fix.h
+include/GL/wglext.h
+include/GL/wmesa.h
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.2
+lib/libGLw.so
+lib/libGLw.so.1
+lib/libGLw.so.1.0.0
+${PLIST.nodri}lib/libOSMesa.so
+${PLIST.nodri}lib/libOSMesa.so.7
+${PLIST.nodri}lib/libOSMesa.so.7.11.0
+${PLIST.dri}lib/dri/i810_dri.so
+${PLIST.dri}lib/dri/i915_dri.so
+${PLIST.dri}lib/dri/i965_dri.so
+${PLIST.dri}lib/dri/mach64_dri.so
+${PLIST.dri}lib/dri/mga_dri.so
+${PLIST.dri}lib/dri/r128_dri.so
+${PLIST.dri}lib/dri/r200_dri.so
+${PLIST.dri}lib/dri/r300_dri.so
+${PLIST.dri}lib/dri/r600_dri.so
+${PLIST.dri}lib/dri/radeon_dri.so
+${PLIST.dri}lib/dri/savage_dri.so
+${PLIST.dri}lib/dri/sis_dri.so
+${PLIST.dri}lib/dri/swrast_dri.so
+${PLIST.dri}lib/dri/tdfx_dri.so
+${PLIST.dri}lib/dri/unichrome_dri.so
+${PLIST.dri}lib/pkgconfig/dri.pc
+lib/pkgconfig/gl.pc
+lib/pkgconfig/glw.pc
+${PLIST.nodri}lib/pkgconfig/osmesa.pc
--- a/graphics/MesaLib7/buildlink3.mk
+++ b/graphics/MesaLib7/buildlink3.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+BUILDLINK_TREE+=	MesaLib7
+
+.if !defined(MESALIB7_BUILDLINK3_MK)
+MESALIB7_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.MesaLib7+=	MesaLib7>=7.11.2
+BUILDLINK_PKGSRCDIR.MesaLib7?=		../../graphics/MesaLib7
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# See <http://developer.apple.com/qa/qa2007/qa1567.html>.
+.if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
+BUILDLINK_LDFLAGS.MesaLib7+=	-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+.endif
+
+pkgbase:= MesaLib7
+.include "../../mk/pkg-build-options.mk"
+
+.if ${X11_TYPE} == "native" && ${OPSYS} != "Cygwin" && exists(${X11BASE}/lib/pkgconfig/dri.pc)
+PKG_BUILD_OPTIONS.MesaLib7+=	dri
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.MesaLib7:Mdri)
+.  include "../../graphics/MesaLib/dri.mk"
+.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
+.include "../../devel/pthread-stublib/buildlink3.mk"
+.endif
+
+.include "../../x11/libXext/buildlink3.mk"
+.endif # MESALIB7_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-MesaLib7
--- a/graphics/MesaLib7/distinfo
+++ b/graphics/MesaLib7/distinfo
@@ -0,0 +1,34 @@
+$NetBSD: distinfo,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9
+RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea
+Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes
+SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba
+SHA1 (patch-bin_mklib) = 8c54bf5382541cab9d971b0e0e627035db1af468
+SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61
+SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0
+SHA1 (patch-src_gallium_auxiliary_util_u__atomic.h) = 68ba9694aca506add2aa96a6892a7227481c2c11
+SHA1 (patch-src_gallium_include_pipe_p__config.h) = 34f4c2a033dd7a494dd3f51db407002a3388f84e
+SHA1 (patch-src_glsl_ir__constant__expression.cpp) = 281e281f51afed244b1a29b92942d572fc095124
+SHA1 (patch-src_glsl_ralloc.c) = 40885fac898058f8e83852a79ca50a74b61121ab
+SHA1 (patch-src_glu_sgi_glu.exports) = 66609d2ea59b02fc46b41311b0042fe4a2da517f
+SHA1 (patch-src_glu_sgi_libtess_sweep.c) = 6ee6d67b2178d23e1b7848d64eede6349f46ee96
+SHA1 (patch-src_glx_XF86dri.c) = b69b7cf5e0d617eca129f0d7f0b06c7603d00db0
+SHA1 (patch-src_mesa_drivers_dri_common_dri__util.h) = 53e63dcc6243b1872f4e4816b46e92910cf97edc
+SHA1 (patch-src_mesa_drivers_dri_common_mmio.h) = b6da48111fb2792b1c71eb7549d0f03adceec9f1
+SHA1 (patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c) = fec8b1a9f6888e9a4225861ea5bda776ecc5f054
+SHA1 (patch-src_mesa_drivers_dri_i915_intel__tris.c) = 74a2ca9f9c865db9b6212087e442f65bb0621227
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw.c) = ce12dc2d2391300d32776a06f5d0096448019c6b
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw__upload.c) = 44162ca546072669b85093981728e635dda69e55
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__misc__state.c) = d37f967dea0fc3bd32566d6a26fd434ca9564081
+SHA1 (patch-src_mesa_drivers_dri_i965_gen6__vs__state.c) = c918b5a91b339e49850d718c957d7e717c2dc130
+SHA1 (patch-src_mesa_drivers_dri_i965_gen6__wm__state.c) = a8ecf943525888b22ec99fe454b08f43c5d8a911
+SHA1 (patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c) = 653c87e1123ce9a27b71221fff4119df34abe15f
+SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.c) = 21d3c08a27817a6358b88101f889120869eebcce
+SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.h) = 6d394e704636134768a6cb5a200ebcc7bc3f52ed
+SHA1 (patch-src_mesa_drivers_dri_mach64_mach64__context.h) = fe95c6610de4c1482c568463aca82f53ed0df900
+SHA1 (patch-src_mesa_drivers_x11_Makefile) = 17b72d2b74d89fbd8db05491cfcf253bb856b139
+SHA1 (patch-src_mesa_main_compiler.h) = b164781b541cb83b64597facbb7a7e21d8bdb686
+SHA1 (patch-src_mesa_main_context.c) = 6b6f1e3ad4ea189291fcf221d4b8bfbd650f8908
+SHA1 (patch-src_mesa_main_imports.c) = d0c50004c749e4c5c136ac2ed50a6989ca90065f
+SHA1 (patch-src_mesa_main_imports.h) = f5a96195b3a14294ca3389c9fe17a6076c46db8a
--- a/graphics/MesaLib7/files/gen_matypes.awk
+++ b/graphics/MesaLib7/files/gen_matypes.awk
@@ -1,4 +1,4 @@
-# $NetBSD: gen_matypes.awk,v 1.1 2007/08/06 13:47:39 joerg Exp $
+# $NetBSD: gen_matypes.awk,v 1.1 2015/04/05 17:01:37 tnn Exp $

 BEGIN {
 	while (getline) {
--- a/graphics/MesaLib7/files/gen_matypes.sh
+++ b/graphics/MesaLib7/files/gen_matypes.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: gen_matypes.sh,v 1.1 2007/08/06 13:47:39 joerg Exp $
+# $NetBSD: gen_matypes.sh,v 1.1 2015/04/05 17:01:37 tnn Exp $

 test_condition() {
 	cat > gen_matypes_cross.c << EOF
--- a/graphics/MesaLib7/files/mapfile.externs
+++ b/graphics/MesaLib7/files/mapfile.externs
--- a/graphics/MesaLib7/glx-config.mk
+++ b/graphics/MesaLib7/glx-config.mk
@@ -1,6 +1,6 @@
-# $NetBSD: glx-config.mk,v 1.5 2010/05/05 18:33:30 reed Exp $
+# $NetBSD: glx-config.mk,v 1.1 2015/04/05 17:01:37 tnn Exp $
 #
-# used by x11/modular-xorg-server/options.mk
+# used by x11/modular-xorg-server112/options.mk

 .if !defined(GLX_CONFIG_MK)
 GLX_CONFIG_MK=	# empty
--- a/graphics/MesaLib7/options.mk
+++ b/graphics/MesaLib7/options.mk
@@ -0,0 +1,66 @@
+# $NetBSD: options.mk,v 1.2 2015/04/05 17:02:45 tnn Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.MesaLib7
+PKG_SUPPORTED_OPTIONS=
+
+# Assembler code build configurations
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
+    ${OPSYS} != "Darwin"
+#PKG_SUPPORTED_OPTIONS+=		${MACHINE_ARCH}
+#PKG_SUGGESTED_OPTIONS+=		${MACHINE_ARCH}
+.endif
+###
+### XXX  There are [probably] others, but let's not get crazy just yet.
+### 	 This will take a while to test for the myriad platforms we
+### 	 support.
+###
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+     ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \
+     ${MACHINE_ARCH} == "sparc64") && \
+    (${OPSYS} == "NetBSD" || \
+     ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
+     ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
+     ${OPSYS} == "SunOS")
+PKG_SUPPORTED_OPTIONS+=		dri
+.endif
+.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*)
+PKG_SUGGESTED_OPTIONS+=		dri
+.endif
+.if !empty(MACHINE_PLATFORM:MLinux-*-*86*)
+PKG_SUGGESTED_OPTIONS+=		dri
+.endif
+
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || (${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11")
+PKG_SUGGESTED_OPTIONS+=		dri
+.endif
+
+.include "../../mk/bsd.options.mk"
+###
+### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much.
+###	NOTE: there is no assembler code built with libOSMesa.
+#.if (!empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)) && \
+#     !empty(PKG_OPTIONS:Mdri)
+#BUILD_TARGET_SUFFIX=	-${MACHINE_ARCH}
+#.else
+#BUILD_TARGET_SUFFIX=	# empty
+#.endif
+
+.if !empty(PKG_OPTIONS:Mdri)
+CONFIGURE_ARGS+=        --with-driver=dri
+PLIST.dri=	yes
+BUILDLINK_DEPMETHOD.libpciaccess=	full
+.  include "../../sysutils/libpciaccess/buildlink3.mk"
+USE_BUILTIN.MesaLib=	no
+.  include "../../graphics/MesaLib/dri.mk"
+CONFIGURE_ARGS+=        --with-dri-drivers="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome"
+.else
+CONFIGURE_ARGS+=        --with-driver=xlib
+PLIST.nodri=	yes
+.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*)
+PKG_FAIL_REASON=	"The dri option needs to be enabled for this to build on NetBSD."
+.endif
+###
+### XXX building libOSMesa breaks with -j, and GNU make has no .WAIT
+###
+#MAKE_JOBS_SAFE=			no
+.endif
--- a/graphics/MesaLib7/patches/patch-af
+++ b/graphics/MesaLib7/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.13 2010/03/27 12:55:00 tnn Exp $
+$NetBSD: patch-af,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/sis/sis_context.h.orig	2009-01-22 17:38:34.000000000 +0000
 +++ src/mesa/drivers/dri/sis/sis_context.h
--- a/graphics/MesaLib7/patches/patch-bin_mklib
+++ b/graphics/MesaLib7/patches/patch-bin_mklib
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_mklib,v 1.3 2013/11/29 15:27:19 bsiegert Exp $
+$NetBSD: patch-bin_mklib,v 1.1 2015/04/05 17:01:37 tnn Exp $

 Solaris ld seemingly has a hard time swallowing nested archives,
 so flatten them out as is done for linux.
--- a/graphics/MesaLib7/patches/patch-configure.ac
+++ b/graphics/MesaLib7/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-configure.ac,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- configure.ac.orig	2011-10-15 00:43:58.000000000 +0000
 +++ configure.ac
--- a/graphics/MesaLib7/patches/patch-include_GL_gl.h
+++ b/graphics/MesaLib7/patches/patch-include_GL_gl.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_GL_gl.h,v 1.1 2013/06/13 14:16:21 wiz Exp $
+$NetBSD: patch-include_GL_gl.h,v 1.1 2015/04/05 17:01:37 tnn Exp $

 Check for symbol existence with #ifdef, not #if.
 Needed since some other files only #define the symbol without a value.
--- a/graphics/MesaLib7/patches/patch-src_gallium_auxiliary_util_u__atomic.h
+++ b/graphics/MesaLib7/patches/patch-src_gallium_auxiliary_util_u__atomic.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_gallium_auxiliary_util_u__atomic.h,v 1.1 2014/01/10 07:21:16 pho Exp $
+$NetBSD: patch-src_gallium_auxiliary_util_u__atomic.h,v 1.1 2015/04/05 17:01:37 tnn Exp $

 Add atomic operations for PowerPC platforms without GCC >= 4.1. This
 should probably be sent to the upstream.
--- a/graphics/MesaLib7/patches/patch-src_gallium_include_pipe_p__config.h
+++ b/graphics/MesaLib7/patches/patch-src_gallium_include_pipe_p__config.h
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_gallium_include_pipe_p__config.h,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+Adjust Endianness for PowerPC, NetBSD, OpenBSD or SunOS.
+
+--- src/gallium/include/pipe/p_config.h.orig	2011-10-15 00:43:58.000000000 +0000
+++ src/gallium/include/pipe/p_config.h
+@@ -99,7 +99,7 @@
+ #endif
+ #endif
+ 
+-#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__)
+#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__) || defined(__powerpc__)
+ #define PIPE_ARCH_PPC
+ #if defined(__ppc64__) || defined(__PPC64__)
+ #define PIPE_ARCH_PPC_64
+@@ -129,6 +129,28 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+ 
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__)
+#include <sys/endian.h>
+#else /* OpenBSD */
+#include <machine/endian.h>
+#endif
+
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+# define PIPE_ARCH_LITTLE_ENDIAN
+#elif _BYTE_ORDER == _BIG_ENDIAN
+# define PIPE_ARCH_BIG_ENDIAN
+#endif
+
+#elif defined(__sun)
+#include <sys/isa_defs.h>
+
+#if defined(_LITTLE_ENDIAN)
+# define PIPE_ARCH_LITTLE_ENDIAN
+#elif defined(_BIG_ENDIAN)
+# define PIPE_ARCH_BIG_ENDIAN
+#endif
+
+ #else
+ 
+ #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
--- a/graphics/MesaLib7/patches/patch-src_glsl_irconstantexpression.cpp
+++ b/graphics/MesaLib7/patches/patch-src_glsl_irconstantexpression.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_glsl_ir__constant__expression.cpp,v 1.1 2013/05/19 02:03:57 obache Exp $
+$NetBSD: patch-src_glsl_ir__constant__expression.cpp,v 1.1 2015/04/05 17:01:37 tnn Exp $

 * band-aid patch for missing fxp2f(3) on NetBSD<6

--- a/graphics/MesaLib7/patches/patch-src_glsl_ralloc.c
+++ b/graphics/MesaLib7/patches/patch-src_glsl_ralloc.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_glsl_ralloc.c,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+* Fix exit time segfault of qt5 application with modular xorg
+
+--- src/glsl/ralloc.c.orig	2011-10-15 00:43:58.000000000 +0000
+++ src/glsl/ralloc.c
+@@ -272,7 +272,7 @@ ralloc_parent(const void *ptr)
+ 
+ static void *autofree_context = NULL;
+ 
+-static void
+static void __attribute__((__destructor__))
+ autofree(void)
+ {
+    ralloc_free(autofree_context);
+@@ -283,7 +283,6 @@ ralloc_autofree_context(void)
+ {
+    if (unlikely(autofree_context == NULL)) {
+       autofree_context = ralloc_context(NULL);
+-      atexit(autofree);
+    }
+    return autofree_context;
+ }
--- a/graphics/MesaLib7/patches/patch-src_glu_sgi_glu.exports
+++ b/graphics/MesaLib7/patches/patch-src_glu_sgi_glu.exports
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_glu_sgi_glu.exports,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_glu_sgi_glu.exports,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/glu/sgi/glu.exports.orig	2010-02-05 00:10:40.000000000 +0000
 +++ src/glu/sgi/glu.exports
--- a/graphics/MesaLib7/patches/patch-src_glu_sgi_libtess_sweep.c
+++ b/graphics/MesaLib7/patches/patch-src_glu_sgi_libtess_sweep.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_glu_sgi_libtess_sweep.c,v 1.1 2015/01/29 22:35:43 nat Exp $
+$NetBSD: patch-src_glu_sgi_libtess_sweep.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 Fixes segfaults and crashes in applications using libGLU.
 --- src/glu/sgi/libtess/sweep.c.orig	2010-10-05 16:56:51.000000000 +0000
--- a/graphics/MesaLib7/patches/patch-src_glx_XF86dri.c
+++ b/graphics/MesaLib7/patches/patch-src_glx_XF86dri.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_glx_XF86dri.c,v 1.1 2013/12/12 14:44:10 is Exp $
+$NetBSD: patch-src_glx_XF86dri.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/glx/XF86dri.c.orig	2010-10-19 17:58:29.000000000 +0000
 +++ src/glx/XF86dri.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_dri__util.h
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_dri__util.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_common_dri__util.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_common_dri__util.h,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/common/dri_util.h.orig	2011-07-09 01:31:41.000000000 +0000
 +++ src/mesa/drivers/dri/common/dri_util.h
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_mmio.h
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_mmio.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_common_mmio.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_common_mmio.h,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/common/mmio.h.orig	2010-02-05 00:10:40.000000000 +0000
 +++ src/mesa/drivers/dri/common/mmio.h
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i915/intel_batchbuffer.c.orig	2011-10-15 04:29:59.000000000 +0000
 +++ src/mesa/drivers/dri/i915/intel_batchbuffer.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__tris.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__tris.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i915_intel__tris.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i915_intel__tris.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i915/intel_tris.c.orig	2011-10-15 00:43:58.000000000 +0000
 +++ src/mesa/drivers/dri/i915/intel_tris.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__draw.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__draw.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_brw__draw.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__draw.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i965/brw_draw.c.orig	2013-04-23 05:46:06.246377394 +0000
 +++ src/mesa/drivers/dri/i965/brw_draw.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brwdrawupload.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brwdrawupload.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_brw__draw__upload.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__draw__upload.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i965/brw_draw_upload.c.orig	2011-10-15 00:43:58.000000000 +0000
 +++ src/mesa/drivers/dri/i965/brw_draw_upload.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brwmiscstate.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brwmiscstate.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_brw__misc__state.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__misc__state.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i965/brw_misc_state.c.orig	2013-04-23 05:46:06.246006959 +0000
 +++ src/mesa/drivers/dri/i965/brw_misc_state.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6vsstate.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6vsstate.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_gen6__vs__state.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i965_gen6__vs__state.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i965/gen6_vs_state.c.orig	2011-11-23 01:09:52.000000000 +0000
 +++ src/mesa/drivers/dri/i965/gen6_vs_state.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6wmstate.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6wmstate.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_gen6__wm__state.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i965_gen6__wm__state.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i965/gen6_wm_state.c.orig	2011-10-15 00:43:58.000000000 +0000
 +++ src/mesa/drivers/dri/i965/gen6_wm_state.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/i965/intel_batchbuffer.c.orig	2011-10-15 04:29:59.000000000 +0000
 +++ src/mesa/drivers/dri/i965/intel_batchbuffer.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_intel_intel__context.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_intel_intel__context.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/intel/intel_context.c.orig	2011-11-23 01:10:52.000000000 +0000
 +++ src/mesa/drivers/dri/intel/intel_context.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.h
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_intel_intel__context.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_drivers_dri_intel_intel__context.h,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/intel/intel_context.h.orig	2011-10-15 00:43:58.000000000 +0000
 +++ src/mesa/drivers/dri/intel/intel_context.h
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_mach64_mach64__context.h
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_mach64_mach64__context.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_dri_mach64_mach64__context.h,v 1.2 2013/05/18 05:57:10 obache Exp $
+$NetBSD: patch-src_mesa_drivers_dri_mach64_mach64__context.h,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2011-10-15 00:43:58.000000000 +0000
 +++ src/mesa/drivers/dri/mach64/mach64_context.h
--- a/graphics/MesaLib7/patches/patch-src_mesa_drivers_x11_Makefile
+++ b/graphics/MesaLib7/patches/patch-src_mesa_drivers_x11_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_drivers_x11_Makefile,v 1.1 2013/05/20 06:59:18 sbd Exp $
+$NetBSD: patch-src_mesa_drivers_x11_Makefile,v 1.1 2015/04/05 17:01:37 tnn Exp $

 Build the x11 version libGL.so with version numbering major 1 and minor 2,
 the same a the glx version of libGL (simplifies PLIST handling).
--- a/graphics/MesaLib7/patches/patch-src_mesa_main_compiler.h
+++ b/graphics/MesaLib7/patches/patch-src_mesa_main_compiler.h
@@ -0,0 +1,47 @@
+$NetBSD: patch-src_mesa_main_compiler.h,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+--- src/mesa/main/compiler.h.orig	2011-11-23 01:09:52.000000000 +0000
+++ src/mesa/main/compiler.h
+@@ -248,7 +248,26 @@ extern "C" {
+  * Try to use a runtime test instead.
+  * For now, only used by some DRI hardware drivers for color/texel packing.
+  */
+-#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+#ifdef __sun
+#include <sys/isa_defs.h>
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#include <machine/endian.h>
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+#include <sys/endian.h>
+#endif
+
+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN)
+#  if BYTE_ORDER == BIG_ENDIAN
+#define MESA_BIG_ENDIAN 1
+#  endif
+#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN)
+#  if _BYTE_ORDER == _BIG_ENDIAN
+#define MESA_BIG_ENDIAN 1
+#  endif
+#elif defined(__sun) && defined(_BIG_ENDIAN)
+#define MESA_BIG_ENDIAN 1
+#endif
+#if MESA_BIG_ENDIAN == 1
+ #if defined(__linux__)
+ #include <byteswap.h>
+ #define CPU_TO_LE32( x )	bswap_32( x )
+@@ -263,11 +282,13 @@ static INLINE GLuint CPU_TO_LE32(GLuint 
+            ((x & 0x00ff0000) >>  8) |
+            ((x & 0xff000000) >> 24));
+ }
+#elif defined(__sun)
+#include <sys/byteorder.h>
+#define CPU_TO_LE32( x )        BSWAP_32( x )
+ #else /*__linux__ */
+ #include <sys/endian.h>
+ #define CPU_TO_LE32( x )	bswap32( x )
+ #endif /*__linux__*/
+-#define MESA_BIG_ENDIAN 1
+ #else
+ #define CPU_TO_LE32( x )	( x )
+ #define MESA_LITTLE_ENDIAN 1
--- a/graphics/MesaLib7/patches/patch-src_mesa_main_context.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_main_context.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_mesa_main_context.c,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+* Fix exit time segfault of qt5 application with modular xorg
+
+--- src/mesa/main/context.c.orig	2011-10-15 00:43:58.000000000 +0000
+++ src/mesa/main/context.c
+@@ -383,10 +383,10 @@ _glthread_DECLARE_STATIC_MUTEX(OneTimeLo
+  *
+  * \sa _math_init().
+  */
+static GLbitfield api_init_mask = 0x0;
+ static void
+ one_time_init( struct gl_context *ctx )
+ {
+-   static GLbitfield api_init_mask = 0x0;
+ 
+    _glthread_LOCK_MUTEX(OneTimeLock);
+ 
+@@ -441,14 +441,16 @@ one_time_init( struct gl_context *ctx )
+ 
+    _glthread_UNLOCK_MUTEX(OneTimeLock);
+ 
+-   /* Hopefully atexit() is widely available.  If not, we may need some
+-    * #ifdef tests here.
+-    */
+-   atexit(_mesa_destroy_shader_compiler);
+-
+    dummy_enum_func();
+ }
+ 
+static void __attribute__((__destructor__))
+one_time_fini(void)
+{
+  if (api_init_mask)
+    _mesa_destroy_shader_compiler();
+}
+
+ 
+ /**
+  * Initialize fields of gl_current_attrib (aka ctx->Current.*)
--- a/graphics/MesaLib7/patches/patch-src_mesa_main_imports.c
+++ b/graphics/MesaLib7/patches/patch-src_mesa_main_imports.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_main_imports.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_main_imports.c,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/main/imports.c.orig	2011-10-15 00:43:58.000000000 +0000
 +++ src/mesa/main/imports.c
--- a/graphics/MesaLib7/patches/patch-src_mesa_main_imports.h
+++ b/graphics/MesaLib7/patches/patch-src_mesa_main_imports.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_mesa_main_imports.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-src_mesa_main_imports.h,v 1.1 2015/04/05 17:01:37 tnn Exp $

 --- src/mesa/main/imports.h.orig	2011-10-15 00:43:58.000000000 +0000
 +++ src/mesa/main/imports.h
--- a/graphics/OpenRM/Makefile
+++ b/graphics/OpenRM/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2014/05/29 23:36:36 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2015/06/12 10:50:08 wiz Exp $
 #

 DISTNAME=		openrm-devel-1.5.2
 PKGNAME=		OpenRM-1.5.2
-PKGREVISION=		9
+PKGREVISION=		11
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openrm/}

--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2013/01/26 21:36:26 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2015/04/25 14:23:06 tnn Exp $

 BUILDLINK_TREE+=	OpenRM

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	OpenRM
 OPENRM_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.OpenRM+=	OpenRM>=1.5.1
-BUILDLINK_ABI_DEPENDS.OpenRM+=	OpenRM>=1.5.2nb7
+BUILDLINK_ABI_DEPENDS.OpenRM+=	OpenRM>=1.5.2nb10
 BUILDLINK_PKGSRCDIR.OpenRM?=	../../graphics/OpenRM

 .include "../../graphics/MesaLib/buildlink3.mk"
--- a/graphics/SDL2_image/Makefile
+++ b/graphics/SDL2_image/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2015/02/09 08:43:13 snj Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/25 14:23:07 tnn Exp $

 DISTNAME=	SDL2_image-2.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/

--- a/Show More
+++ b/Show More