<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141010] trunk/dports/x11/mesa</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141010">141010</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-10-07 15:50:43 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mesa: Regen patches</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11mesaPortfile">trunk/dports/x11/mesa/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11mesafiles5001glexthAddmissingincludeofstddefhforptrdiff_patch">trunk/dports/x11/mesa/files/5001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch</a></li>
<li><a href="#trunkdportsx11mesafiles5002darwinSuppresstypeconversionwarningsforGLhandlpatch">trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch</a></li>
<li><a href="#trunkdportsx11mesafiles5003appleglProviderequirementsof_SET_DrawBufferspatch">trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11mesafiles1001darwinFixinstallnameoflibOSMesapatch">trunk/dports/x11/mesa/files/1001-darwin-Fix-install-name-of-libOSMesa.patch</a></li>
<li><a href="#trunkdportsx11mesafiles5002darwinSuppresstypeconversionwarningsforGLhandlpatch">trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch</a></li>
<li><a href="#trunkdportsx11mesafiles5003appleglProviderequirementsof_SET_DrawBufferspatch">trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11mesaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/mesa/Portfile (141009 => 141010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/Portfile 2015-10-07 22:48:19 UTC (rev 141009)
+++ trunk/dports/x11/mesa/Portfile 2015-10-07 22:50:43 UTC (rev 141010)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles \
</span><del>- 0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</del><ins>+ 5001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</ins><span class="cx"> 5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch \
</span><span class="cx"> 5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11mesafiles1001darwinFixinstallnameoflibOSMesapatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/mesa/files/1001-darwin-Fix-install-name-of-libOSMesa.patch (141009 => 141010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/1001-darwin-Fix-install-name-of-libOSMesa.patch 2015-10-07 22:48:19 UTC (rev 141009)
+++ trunk/dports/x11/mesa/files/1001-darwin-Fix-install-name-of-libOSMesa.patch 2015-10-07 22:50:43 UTC (rev 141010)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-From 1885f228e38f4200643ad41d717c8cf7fa20db12 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Wed, 11 Feb 2015 02:29:07 -0800
-Subject: [PATCH] darwin: Fix install name of libOSMesa
-
-libOSMesa is a library, not a module
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- src/mesa/drivers/osmesa/Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
-index 589b5ee..8d69915 100644
---- a/src/mesa/drivers/osmesa/Makefile.am
-+++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -39,7 +39,6 @@ nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
- lib@OSMESA_LIB@_la_SOURCES = osmesa.c
-
- lib@OSMESA_LIB@_la_LDFLAGS = \
-- -module \
- -no-undefined \
- -version-number @OSMESA_VERSION@ \
- $(GC_SECTIONS) \
---
-2.3.0
-
</del></span></pre></div>
<a id="trunkdportsx11mesafiles5001glexthAddmissingincludeofstddefhforptrdiff_patch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/5001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch (0 => 141010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/5001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch (rev 0)
+++ trunk/dports/x11/mesa/files/5001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch 2015-10-07 22:50:43 UTC (rev 141010)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+From 32e797544db668ccafbddc65e91c6fe1c79fb802 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 11 Feb 2015 12:32:56 -0800
+Subject: [PATCH 5001/5003] glext.h: Add missing include of stddef.h for
+ ptrdiff_t
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 8ea9fa778a04d1535f994e39dcfdae7ee1add37e)
+---
+ include/GL/glext.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/GL/glext.h b/include/GL/glext.h
+index a3873a6..dded95b 100644
+--- a/include/GL/glext.h
++++ b/include/GL/glext.h
+@@ -4477,6 +4477,7 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
+
+ #ifndef GL_ARB_vertex_buffer_object
+ #define GL_ARB_vertex_buffer_object 1
++#include <stddef.h>
+ typedef ptrdiff_t GLsizeiptrARB;
+ typedef ptrdiff_t GLintptrARB;
+ #define GL_BUFFER_SIZE_ARB 0x8764
+--
+2.6.0
+
</ins></span></pre></div>
<a id="trunkdportsx11mesafiles5002darwinSuppresstypeconversionwarningsforGLhandlpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch (141009 => 141010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch 2015-10-07 22:48:19 UTC (rev 141009)
+++ trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch 2015-10-07 22:50:43 UTC (rev 141010)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>-From 9280d8353799867ae7804eee8a7ad429e1ed442f Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <jon.turney@dronecode.org.uk>
-Date: Sun, 11 May 2014 14:40:07 +0100
-Subject: [PATCH 5002/5003] darwin: Suppress type conversion warnings for
- GLhandleARB
-
-On darwin, GLhandleARB is defined as a void *, not the unsigned int it is on
-linux.
-
-For the moment, apply a cast to supress the warning
-
-Possibly this is safe, as for the mesa software renderer the shader program
-handle is not a real pointer, but a integer handle
-
-Probably this is not the right thing to do, and we should pay closer attention
-to how the GLhandlerARB type is used.
-
-main/shader_query.cpp:49:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
- _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation");
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
-_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
-^
-main/shader_query.cpp:111:13: error: no matching function for call to '_mesa_lookup_shader_program_err'
- shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
-_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
-^
-main/shader_query.cpp:218:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
- _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
-_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
-
-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-(cherry picked from commit 6a74bac7137219d8bba9e1dc2738f76151e618ae)
----
- 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 766ad29..74bd301 100644
---- a/src/mesa/main/shader_query.cpp
-+++ b/src/mesa/main/shader_query.cpp
-@@ -46,7 +46,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, (uintptr_t)program, "glBindAttribLocation");
- if (!shProg)
- return;
-
-@@ -109,7 +109,7 @@ _mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index,
- GET_CURRENT_CONTEXT(ctx);
- struct gl_shader_program *shProg;
-
-- shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
-+ shProg = _mesa_lookup_shader_program_err(ctx, (uintptr_t)program, "glGetActiveAttrib");
- if (!shProg)
- return;
-
-@@ -227,7 +227,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, (uintptr_t)program, "glGetAttribLocation");
-
- if (!shProg) {
- return -1;
---
-2.3.0
-
</del></span></pre></div>
<a id="trunkdportsx11mesafiles5002darwinSuppresstypeconversionwarningsforGLhandlpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch (0 => 141010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch (rev 0)
+++ trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch 2015-10-07 22:50:43 UTC (rev 141010)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+From 945b0070642ac6256a22c7b23c20e022e2444f88 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sun, 11 May 2014 14:40:07 +0100
+Subject: [PATCH 5002/5003] darwin: Suppress type conversion warnings for
+ GLhandleARB
+
+On darwin, GLhandleARB is defined as a void *, not the unsigned int it is on
+linux.
+
+For the moment, apply a cast to supress the warning
+
+Possibly this is safe, as for the mesa software renderer the shader program
+handle is not a real pointer, but a integer handle
+
+Probably this is not the right thing to do, and we should pay closer attention
+to how the GLhandlerARB type is used.
+
+main/shader_query.cpp:49:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
+ _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation");
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
+^
+main/shader_query.cpp:111:13: error: no matching function for call to '_mesa_lookup_shader_program_err'
+ shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
+^
+main/shader_query.cpp:218:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
+ _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+(cherry picked from commit 24eefbd4ca271f22400549dd44ccd409263089e1)
+---
+ 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 df9081b..b2d2f54 100644
+--- a/src/mesa/main/shader_query.cpp
++++ b/src/mesa/main/shader_query.cpp
+@@ -46,7 +46,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, (uintptr_t)program, "glBindAttribLocation");
+ if (!shProg)
+ return;
+
+@@ -114,7 +114,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, (uintptr_t)program, "glGetActiveAttrib");
+ if (!shProg)
+ return;
+
+@@ -232,7 +232,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, (uintptr_t)program, "glGetAttribLocation");
+
+ if (!shProg) {
+ return -1;
+--
+2.6.0
+
</ins></span></pre></div>
<a id="trunkdportsx11mesafiles5003appleglProviderequirementsof_SET_DrawBufferspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch (141009 => 141010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch 2015-10-07 22:48:19 UTC (rev 141009)
+++ trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch 2015-10-07 22:50:43 UTC (rev 141010)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-From b5c7d50daaf878ef234780285d24cb9032818a5a Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <jon.turney@dronecode.org.uk>
-Date: Mon, 12 May 2014 16:30:26 +0100
-Subject: [PATCH 5003/5003] applegl: Provide requirements of _SET_DrawBuffers
-
-_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with libmesa
-for remap.c. libmesa requires the C++ linker.
-
-Also need to arrange to call _mesa_init_remap_table() to initialize the remap
-table.
-
-XXX: There has to be a better way fixing this.
-
-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-(cherry picked from commit fd9583edffb17028253ecd267b21a137522d67e4)
----
- src/glx/Makefile.am | 5 ++++-
- src/glx/apple/apple_glapi.c | 3 +++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
-index 4515312..33a6c52 100644
---- a/src/glx/Makefile.am
-+++ b/src/glx/Makefile.am
-@@ -118,7 +118,10 @@ libglx_la_SOURCES += \
- applegl_glx.c
-
- SUBDIRS += apple
--libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
-+libglx_la_LIBADD += \
-+ $(builddir)/apple/libappleglx.la \
-+ $(top_builddir)/src/mesa/libmesa.la
-+nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
- endif
-
- GL_LIBS = \
-diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
-index 4d19f7f..849044b 100644
---- a/src/glx/apple/apple_glapi.c
-+++ b/src/glx/apple/apple_glapi.c
-@@ -39,6 +39,7 @@
- #include <GL/gl.h>
-
- #include "main/glheader.h"
-+#include "main/remap.h"
- #include "glapi.h"
- #include "glapitable.h"
- #include "main/dispatch.h"
-@@ -54,6 +55,8 @@ static void _apple_glapi_create_table(void) {
- if (__applegl_api)
- return;
-
-+ _mesa_init_remap_table();
-+
- __ogl_framework_api = _glapi_create_table_from_handle(apple_cgl_get_dl_handle(), "gl");
- assert(__ogl_framework_api);
-
---
-2.3.0
-
</del></span></pre></div>
<a id="trunkdportsx11mesafiles5003appleglProviderequirementsof_SET_DrawBufferspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch (0 => 141010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch (rev 0)
+++ trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch 2015-10-07 22:50:43 UTC (rev 141010)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+From 987e162c61b28192e575bd9742c84a67472d415c Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon, 12 May 2014 16:30:26 +0100
+Subject: [PATCH 5003/5003] applegl: Provide requirements of _SET_DrawBuffers
+
+_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with libmesa
+for remap.c. libmesa requires the C++ linker.
+
+Also need to arrange to call _mesa_init_remap_table() to initialize the remap
+table.
+
+XXX: There has to be a better way fixing this.
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+(cherry picked from commit 9800301a312ac06e0ce0af20e5817ee1e44ed4a5)
+---
+ src/glx/Makefile.am | 5 ++++-
+ src/glx/apple/apple_glapi.c | 3 +++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
+index 3ea1b30..3f82285 100644
+--- a/src/glx/Makefile.am
++++ b/src/glx/Makefile.am
+@@ -138,7 +138,10 @@ libglx_la_SOURCES += \
+ applegl_glx.c
+
+ SUBDIRS += apple
+-libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
++libglx_la_LIBADD += \
++ $(builddir)/apple/libappleglx.la \
++ $(top_builddir)/src/mesa/libmesa.la
++nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
+ endif
+
+ GL_LIBS = \
+diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
+index 4d19f7f..849044b 100644
+--- a/src/glx/apple/apple_glapi.c
++++ b/src/glx/apple/apple_glapi.c
+@@ -39,6 +39,7 @@
+ #include <GL/gl.h>
+
+ #include "main/glheader.h"
++#include "main/remap.h"
+ #include "glapi.h"
+ #include "glapitable.h"
+ #include "main/dispatch.h"
+@@ -54,6 +55,8 @@ static void _apple_glapi_create_table(void) {
+ if (__applegl_api)
+ return;
+
++ _mesa_init_remap_table();
++
+ __ogl_framework_api = _glapi_create_table_from_handle(apple_cgl_get_dl_handle(), "gl");
+ assert(__ogl_framework_api);
+
+--
+2.6.0
+
</ins></span></pre>
</div>
</div>
</body>
</html>