From 5d9cdbed164f858f7a6d37648e19387ece7b392a Mon Sep 17 00:00:00 2001
From: dsainty <dsainty@pkgsrc.org>
Date: Wed, 12 Sep 2012 14:12:28 +0000
Subject: Expose glXGetProcAddress.

The consequences of not making this patch are platform dependent - some build
chains will still expose the symbols, but some will not.  The API expects
them to be exposed.

Fixes Cairo 1.12.2 build on Ubuntu 11.10 and CentOS 6.3, presumably due to
later versions of gcc (4.6.1 in the Ubuntu case).

Bump PKGREVISION.
---
 graphics/MesaLib/Makefile         |  4 ++--
 graphics/MesaLib/distinfo         |  4 ++--
 graphics/MesaLib/patches/patch-aw | 18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'graphics')

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 698be3c74fc..b8d97ffaf94 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2012/05/08 20:33:14 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2012/09/12 14:12:28 dsainty Exp $
 
 PKGNAME=	MesaLib-${MESA_PKGVERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=	xf86driproto<2.0.4
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 5d1d1fe1c2f..51b1e1c210b 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.72 2012/02/16 18:56:23 hans Exp $
+$NetBSD: distinfo,v 1.73 2012/09/12 14:12:28 dsainty Exp $
 
 SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
 RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
@@ -27,7 +27,7 @@ SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
 SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
 SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
 SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
-SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
+SHA1 (patch-aw) = c6f0f499587346a3f270b37b497a0b3b1e3f79f3
 SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3
 SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
 SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
diff --git a/graphics/MesaLib/patches/patch-aw b/graphics/MesaLib/patches/patch-aw
index a6bd4fe81ec..f7e7663dde1 100644
--- a/graphics/MesaLib/patches/patch-aw
+++ b/graphics/MesaLib/patches/patch-aw
@@ -1,8 +1,14 @@
-$NetBSD: patch-aw,v 1.1 2008/06/27 13:24:39 tnn Exp $
+$NetBSD: patch-aw,v 1.2 2012/09/12 14:12:29 dsainty Exp $
+
+Expose glXGetProcAddress and glXGetProcAddressARB.
+
+The consequences of not making this patch are platform dependent - some build
+chains will still expose the symbols, but some will not.  The API expects
+them to be exposed.
 
 --- 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
+@@ -1391,6 +1391,7 @@
   * This function does not get dispatched through the dispatch table
   * since it's really a "meta" function.
   */
@@ -10,3 +16,11 @@ $NetBSD: patch-aw,v 1.1 2008/06/27 13:24:39 tnn Exp $
  __GLXextFuncPtr
  glXGetProcAddressARB(const GLubyte *procName)
  {
+@@ -1407,6 +1408,7 @@
+ 
+ 
+ /* GLX 1.4 */
++PUBLIC
+ void (*glXGetProcAddress(const GLubyte *procName))()
+ {
+    return glXGetProcAddressARB(procName);
-- 
cgit v1.2.3