[79257] trunk/dports/x11/mesa

jeremyhu at macports.org jeremyhu at macports.org
Mon Jun 6 22:44:45 PDT 2011


Revision: 79257
          http://trac.macports.org/changeset/79257
Author:   jeremyhu at macports.org
Date:     2011-06-06 22:44:44 -0700 (Mon, 06 Jun 2011)
Log Message:
-----------
mesa: Fix linking of libOSMesa in +iglx variant

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Added Paths:
-----------
    trunk/dports/x11/mesa/files/0001-osmesa-Fix-missing-symbols-when-GLX_INDIRECT_RENDERI.patch

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2011-06-07 03:38:39 UTC (rev 79256)
+++ trunk/dports/x11/mesa/Portfile	2011-06-07 05:44:44 UTC (rev 79257)
@@ -10,7 +10,7 @@
 # xquartz-dev mailing list, and let us know why.
 
 version             7.10.2
-revision            1
+revision            2
 categories          x11 graphics
 maintainers         jeremyhu openmaintainer
 description         Mesa 3D Graphics Library
@@ -53,6 +53,7 @@
 
 patch.pre_args -p1
 patchfiles \
+	0001-osmesa-Fix-missing-symbols-when-GLX_INDIRECT_RENDERI.patch \
 	mesa-7.10.2-api-fixes.patch 
 
 build.target default

Added: trunk/dports/x11/mesa/files/0001-osmesa-Fix-missing-symbols-when-GLX_INDIRECT_RENDERI.patch
===================================================================
--- trunk/dports/x11/mesa/files/0001-osmesa-Fix-missing-symbols-when-GLX_INDIRECT_RENDERI.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/0001-osmesa-Fix-missing-symbols-when-GLX_INDIRECT_RENDERI.patch	2011-06-07 05:44:44 UTC (rev 79257)
@@ -0,0 +1,55 @@
+From ac5481e7d1b2b54593601b2b00778b9d4fc01ced Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Tue, 7 Jun 2011 00:46:43 -0400
+Subject: [PATCH] osmesa: Fix missing symbols when GLX_INDIRECT_RENDERING is
+ defined.
+
+When GLX_INDIRECT_RENDERING is defined, some symbols are used in
+libglapi.a but are not defined.  Define them through the help of
+glapitemp.h.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ src/mesa/drivers/osmesa/osmesa.c |   29 +++++++++++++++++++++++++++++
+ 1 files changed, 29 insertions(+), 0 deletions(-)
+
+diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
+index 68d7114..025a3df 100644
+--- a/src/mesa/drivers/osmesa/osmesa.c
++++ b/src/mesa/drivers/osmesa/osmesa.c
+@@ -1553,3 +1553,32 @@ OSMesaColorClamp(GLboolean enable)
+ }
+ 
+ 
++/**
++ * When GLX_INDIRECT_RENDERING is defined, some symbols are missing in
++ * libglapi.a.  We need to define them here.
++ */
++#ifdef GLX_INDIRECT_RENDERING
++
++#define GL_GLEXT_PROTOTYPES
++#include "GL/gl.h"
++#include "glapi/glapi.h"
++#include "glapi/glapitable.h"
++
++#if defined(USE_MGL_NAMESPACE)
++#define NAME(func)  mgl##func
++#else
++#define NAME(func)  gl##func
++#endif
++
++#define DISPATCH(FUNC, ARGS, MESSAGE)		\
++   GET_DISPATCH()->FUNC ARGS
++
++#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
++   return GET_DISPATCH()->FUNC ARGS
++
++/* skip normal ones */
++#define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
++#include "glapi/glapitemp.h"
++
++#endif /* GLX_INDIRECT_RENDERING */
++
+-- 
+1.7.5.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110606/36e7a375/attachment.html>


More information about the macports-changes mailing list