<!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>[120375] 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/120375">120375</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-05-24 20:45:38 -0700 (Sat, 24 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mesa: Add code to help test Core Profile without it being default</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="#trunkdportsx11mesafiles1001appleglxImproveerrorreportingifCGLChoosePixelFopatch">trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch</a></li>
<li><a href="#trunkdportsx11mesafiles1002darwinWriteerrorsinchoosingthepixelformattopatch">trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch</a></li>
<li><a href="#trunkdportsx11mesafiles1003darwinGuardCoreProfileusagebehindatestingenvpatch">trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.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 (120374 => 120375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/Portfile 2014-05-25 02:03:42 UTC (rev 120374)
+++ trunk/dports/x11/mesa/Portfile 2014-05-25 03:45:38 UTC (rev 120375)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name mesa
</span><span class="cx"> epoch 1
</span><span class="cx"> version 8.0.5
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories x11 graphics
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="cx"> license MIT
</span><span class="lines">@@ -40,7 +40,10 @@
</span><span class="cx"> 0008-glsl-initialise-const-force-glsl-extension-warning-i.patch \
</span><span class="cx"> 0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch \
</span><span class="cx"> 0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch \
</span><del>- 0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
</del><ins>+ 0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch \
+ 1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch \
+ 1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch \
+ 1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
</ins><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><span class="cx"> use_configure no
</span></span></pre></div>
<a id="trunkdportsx11mesafiles1001appleglxImproveerrorreportingifCGLChoosePixelFopatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch (0 => 120375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch 2014-05-25 03:45:38 UTC (rev 120375)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+From f0702d6e631bb912a230c081463bb51a0dde1bff Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon, 12 May 2014 15:38:26 +0100
+Subject: [PATCH 1001/1003] appleglx: Improve error reporting if
+ CGLChoosePixelFormat() didn't find any matching pixel formats.
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 002a3a74273b81dfb226e1c3f0a8c18525ed0af4)
+---
+ src/glx/apple/apple_visual.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index 238c248..c6ede51 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -167,4 +167,9 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
+ abort();
+ }
++
++ if (!*pfobj) {
++ fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ abort();
++ }
+ }
+--
+1.9.2 (Apple Git-49)
+
</ins></span></pre></div>
<a id="trunkdportsx11mesafiles1002darwinWriteerrorsinchoosingthepixelformattopatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch (0 => 120375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch 2014-05-25 03:45:38 UTC (rev 120375)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+From 1b2f877c8ef052b183c1f20ece6c6e4a7bfd237c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 24 May 2014 14:13:33 -0700
+Subject: [PATCH 1002/1003] darwin: Write errors in choosing the pixel format
+ to the crash log
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 9eb1d36c978a9b15ae2e999c630492dfffd7f165)
+---
+ src/glx/apple/apple_visual.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index c6ede51..951b213 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -63,6 +63,16 @@ enum
+ MAX_ATTR = 60
+ };
+
++static char __crashreporter_info_buff__[4096] = { 0 };
++static const char *__crashreporter_info__ __attribute__((__used__)) =
++ &__crashreporter_info_buff__[0];
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
++// This is actually a toolchain requirement, but I'm not sure the correct check,
++// but it should be fine to just only include it for Leopard and later. This line
++// just tells the linker to never strip this symbol (such as for space optimization)
++__asm__ (".desc ___crashreporter_info__, 0x10");
++#endif
++
+ void
+ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * mode,
+ bool * double_buffered, bool * uses_stereo,
+@@ -164,12 +174,16 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
+
+ if (error) {
+- fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
++ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
++ "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
++ fprintf(stderr, "%s", __crashreporter_info_buff__);
+ abort();
+ }
+
+ if (!*pfobj) {
+- fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
++ "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ fprintf(stderr, "%s", __crashreporter_info_buff__);
+ abort();
+ }
+ }
+--
+1.9.2 (Apple Git-49)
+
</ins></span></pre></div>
<a id="trunkdportsx11mesafiles1003darwinGuardCoreProfileusagebehindatestingenvpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch (0 => 120375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch 2014-05-25 03:45:38 UTC (rev 120375)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+From 9d6e12eb6b06202519e48a7321f32944d7a34b0f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 24 May 2014 14:08:16 -0700
+Subject: [PATCH 1003/1003] darwin: Guard Core Profile usage behind a testing
+ envvar
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 04ce3be4010305902cc5ae81e8e0c8550d043a1e)
+---
+ src/glx/apple/apple_visual.c | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index 951b213..046581b 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -82,16 +82,7 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ int numattr = 0;
+ GLint vsref = 0;
+ CGLError error = 0;
+-
+- /* Request an OpenGL 3.2 profile if one is available and supported */
+- attr[numattr++] = kCGLPFAOpenGLProfile;
+- attr[numattr++] = kCGLOGLPVersion_3_2_Core;
+-
+- /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
+- attr[numattr] = 0;
+- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
+- if (error == kCGLBadAttribute)
+- numattr -= 2;
++ bool use_core_profile = getenv("LIBGL_PROFILE_CORE");
+
+ if (offscreen) {
+ apple_glx_diagnostic
+@@ -167,12 +158,31 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ attr[numattr++] = mode->samples;
+ }
+
++ /* Debugging support for Core profiles to support newer versions of OpenGL */
++ if (use_core_profile) {
++ attr[numattr++] = kCGLPFAOpenGLProfile;
++ attr[numattr++] = kCGLOGLPVersion_3_2_Core;
++ }
++
+ attr[numattr++] = 0;
+
+ assert(numattr < MAX_ATTR);
+
+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
+
++ if ((error == kCGLBadAttribute || vsref == 0) && use_core_profile) {
++ apple_glx_diagnostic
++ ("Trying again without CoreProfile: error=%s, vsref=%d\n", apple_cgl.error_string(error), vsref);
++
++ if (!error)
++ apple_cgl.destroy_pixel_format(*pfobj);
++
++ numattr -= 3;
++ attr[numattr++] = 0;
++
++ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
++ }
++
+ if (error) {
+ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
+ "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
+--
+1.9.2 (Apple Git-49)
+
</ins></span></pre>
</div>
</div>
</body>
</html>