From 8ff3b0558ec202a7f8f18e0f3edee59468e6db0a Mon Sep 17 00:00:00 2001
From: bjs <bjs>
Date: Tue, 21 Oct 2008 06:25:26 +0000
Subject: Sync MesaLib with upstream mesa_7_0_branch.  While here, patch the
 r300 dri driver so that the __driConfigOptions symbol is visible. This is
 necessary for xdriinfo and driconf to work.  Bump MesaLib's PKGREVISION.

---
 graphics/Mesa/Makefile.version    | 10 +++++-----
 graphics/MesaLib/Makefile         |  4 ++--
 graphics/MesaLib/distinfo         |  6 +++++-
 graphics/MesaLib/patches/patch-az | 15 +++++++++++++++
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 graphics/MesaLib/patches/patch-az

diff --git a/graphics/Mesa/Makefile.version b/graphics/Mesa/Makefile.version
index f41cb8355c0..c40b45b7afe 100644
--- a/graphics/Mesa/Makefile.version
+++ b/graphics/Mesa/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.1 2008/09/18 21:10:28 bjs Exp $
+# $NetBSD: Makefile.version,v 1.2 2008/10/21 06:25:26 bjs Exp $
 #
 # When changing this version, please run "make distinfo" in the following
 # package directories:
@@ -14,9 +14,9 @@ MESA_SITES=		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
 
 MESA_VERSION=		7.0.4
 MESA_PKGVERSION=	${MESA_VERSION}${MESA_PATCHLEVEL}
-#MESA_PATCHFILES=	001 002 003
+MESA_PATCHFILES=	001
 MESA_PATCHLEVEL=	.1
 
-#PATCHFILES=		${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@}
-#PATCH_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
-#PATCH_DIST_STRIP=	-p1
+PATCHFILES=		${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@}
+PATCH_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
+PATCH_DIST_STRIP=	-p0
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index b31505aa9c3..3e160d891c6 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2008/09/18 21:10:28 bjs Exp $
+# $NetBSD: Makefile,v 1.74 2008/10/21 06:25:26 bjs Exp $
 
 PKGNAME=	MesaLib-${MESA_PKGVERSION}
 COMMENT=	Graphics library similar to SGI's OpenGL
-PKGREVISION=	2
+PKGREVISION=	3
 
 MESA_HEADERS=	gl.h gl_mangle.h glext.h glx.h glxext.h	\
 		glx_mangle.h osmesa.h xmesa.h xmesa_x.h	\
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 0d044445a83..91c0625e209 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.59 2008/08/23 02:51:19 dsainty Exp $
+$NetBSD: distinfo,v 1.60 2008/10/21 06:25:26 bjs Exp $
 
+SHA1 (Mesa-7.0.4.1/Mesa-7.0.4-001) = a49b9094272abb2484447fb35c9adf3fe391a4bb
+RMD160 (Mesa-7.0.4.1/Mesa-7.0.4-001) = 1992bb054742924f1f39a19ab35e621f53e6fbf2
+Size (Mesa-7.0.4.1/Mesa-7.0.4-001) = 38003 bytes
 SHA1 (Mesa-7.0.4.1/MesaDemos-7.0.4.tar.bz2) = 1adb2010d6d3103bd57c08f228e2bbed38178e14
 RMD160 (Mesa-7.0.4.1/MesaDemos-7.0.4.tar.bz2) = 3e5b414bf1a40603367fcd0ba321b6e2caf84626
 Size (Mesa-7.0.4.1/MesaDemos-7.0.4.tar.bz2) = 1341624 bytes
@@ -27,4 +30,5 @@ SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
 SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
 SHA1 (patch-ax) = 63edfecd17dfaf2a76f69ba3cedb1610738bf9cc
 SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
+SHA1 (patch-az) = 168f054532760792dd7203d5474c593bead0686e
 SHA1 (patch-cb) = 0eac61e6656c8a8d6452504dd06ed6969ddbeba2
diff --git a/graphics/MesaLib/patches/patch-az b/graphics/MesaLib/patches/patch-az
new file mode 100644
index 00000000000..65bf8aedfe4
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-az
@@ -0,0 +1,15 @@
+$NetBSD: patch-az,v 1.1 2008/10/21 06:25:26 bjs Exp $
+
+Xdriinfo won't work for r300 unless this symbol is visible.
+
+--- src/mesa/drivers/dri/r300/radeon_screen.c.orig	2008-06-16 12:19:27.000000000 -0400
++++ src/mesa/drivers/dri/r300/radeon_screen.c
+@@ -179,7 +179,7 @@ DRI_CONF_OPT_BEGIN_V(fp_optimization,enu
+         DRI_CONF_DESC_END \
+ DRI_CONF_OPT_END
+ 
+-const char __driConfigOptions[] =
++PUBLIC const char __driConfigOptions[] =
+ DRI_CONF_BEGIN
+ 	DRI_CONF_SECTION_PERFORMANCE
+ 		DRI_CONF_TCL_MODE(DRI_CONF_TCL_CODEGEN)
-- 
cgit v1.2.3