From 2f152240960347352b0daf0b8b7de0eef41a9bf6 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Fri, 27 Jun 2008 13:24:39 +0000
Subject: graphics/MesaLib/hacks.mk: revert to rev 1.8
 graphics/MesaLib/patches/patch-aw: export glXGetProcAddressARB
 graphics/MesaLib/Makefile: bump PKGREVISION graphics/glu/Makefile: bump
 PKGREVISION

Please help out by giving this change as extensive testing as
possible before 2008Q2 is branched.
---
 graphics/MesaLib/Makefile         |  4 ++--
 graphics/MesaLib/distinfo         |  3 ++-
 graphics/MesaLib/hacks.mk         |  4 ++--
 graphics/MesaLib/patches/patch-aw | 12 ++++++++++++
 graphics/glu/Makefile             |  3 ++-
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 graphics/MesaLib/patches/patch-aw

(limited to 'graphics')

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index f40ba13b409..c894476d50a 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2008/06/05 13:03:41 tron Exp $
+# $NetBSD: Makefile,v 1.63 2008/06/27 13:24:39 tnn Exp $
 
 PKGNAME=	MesaLib-${MESA_PKGVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 MESA_HEADERS=	gl.h gl_mangle.h glext.h glx.h glxext.h	\
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index d046cae863d..79363da7f22 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2008/06/03 06:59:12 dsainty Exp $
+$NetBSD: distinfo,v 1.55 2008/06/27 13:24:39 tnn Exp $
 
 SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd
 RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a
@@ -38,4 +38,5 @@ SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
 SHA1 (patch-at) = 4b3d95a116734ad8951816e042b497f638c4cf6b
 SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
 SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
+SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
 SHA1 (patch-cb) = 0eac61e6656c8a8d6452504dd06ed6969ddbeba2
diff --git a/graphics/MesaLib/hacks.mk b/graphics/MesaLib/hacks.mk
index 3f2de6caa03..186984f81e7 100644
--- a/graphics/MesaLib/hacks.mk
+++ b/graphics/MesaLib/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.11 2008/06/25 11:21:20 tron Exp $
+# $NetBSD: hacks.mk,v 1.12 2008/06/27 13:24:39 tnn Exp $
 
 .if !defined(MESALIBS_HACKS_MK)
 MESALIBS_HACKS_MK=	# defined
@@ -33,7 +33,7 @@ CFLAGS+=		-fno-strict-aliasing
 # Don't hide symbols for glut by default, it doesn't know how to unhide them.
 .    if empty(PKGNAME:M*glut*)
 PKG_HACKS+=		gcc-hidden-visibility
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+CFLAGS+=		-fvisibility=hidden
 .    endif
 .  endif
 ###
diff --git a/graphics/MesaLib/patches/patch-aw b/graphics/MesaLib/patches/patch-aw
new file mode 100644
index 00000000000..a6bd4fe81ec
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-aw
@@ -0,0 +1,12 @@
+$NetBSD: patch-aw,v 1.1 2008/06/27 13:24:39 tnn Exp $
+
+--- src/mesa/drivers/x11/glxapi.c.orig	2007-11-01 16:30:52.000000000 +0100
++++ src/mesa/drivers/x11/glxapi.c
+@@ -1358,6 +1358,7 @@ _glxapi_get_proc_address(const char *fun
+  * This function does not get dispatched through the dispatch table
+  * since it's really a "meta" function.
+  */
++PUBLIC
+ __GLXextFuncPtr
+ glXGetProcAddressARB(const GLubyte *procName)
+ {
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 53c78da9e60..5600f5d380e 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2008/04/24 07:40:23 bjs Exp $
+# $NetBSD: Makefile,v 1.52 2008/06/27 13:24:39 tnn Exp $
 
 PKGNAME=	glu-${MESA_PKGVERSION}
+PKGREVISION=	1
 COMMENT=	GLU polygon tessellation facility for Mesa
 
 CONFLICTS+=	Mesa-glx-[0-9]*
-- 
cgit v1.2.3