<!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>[150697] trunk/dports/graphics/libepoxy</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/150697">150697</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-07-26 22:22:03 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>libepoxy: tentative patch to stop epoxy_glx_version from crashing if GLX is not available on server or client, increment revision (#51911).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibepoxyPortfile">trunk/dports/graphics/libepoxy/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibepoxyfilesfixepoxyglxversionifglxnotactivepatch">trunk/dports/graphics/libepoxy/files/fix-epoxy-glx-version-if-glx-not-active.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicslibepoxyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/libepoxy/Portfile (150696 => 150697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/Portfile 2016-07-27 05:07:35 UTC (rev 150696)
+++ trunk/dports/graphics/libepoxy/Portfile 2016-07-27 05:22:03 UTC (rev 150697)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><span class="cx"> github.setup anholt libepoxy 1.3.1 v
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> license MIT permissive
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="lines">@@ -42,6 +42,11 @@
</span><span class="cx"> 0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch \
</span><span class="cx"> 0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch
</span><span class="cx">
</span><ins>+# https://trac.macports.org/ticket/51911
+# https://github.com/anholt/libepoxy/issues/72
+# https://github.com/yaronct/libepoxy/commit/b3b8bd9af7bf1fcfe544fd131f4d4f0d117ae7bc
+patchfiles-append fix-epoxy-glx-version-if-glx-not-active.patch
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dispatch_common.c
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfilesfixepoxyglxversionifglxnotactivepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/libepoxy/files/fix-epoxy-glx-version-if-glx-not-active.patch (0 => 150697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/fix-epoxy-glx-version-if-glx-not-active.patch (rev 0)
+++ trunk/dports/graphics/libepoxy/files/fix-epoxy-glx-version-if-glx-not-active.patch 2016-07-27 05:22:03 UTC (rev 150697)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+--- a/src/dispatch_glx.c.orig 2016-07-26 13:43:09.000000000 -0700
++++ b/src/dispatch_glx.c 2016-07-26 13:44:56.000000000 -0700
+@@ -54,22 +54,23 @@
+ int client_major, client_minor;
+ int server, client;
+ const char *version_string;
+- int ret;
++ int ret=0, sscanf_ret;
+
+- version_string = glXQueryServerString(dpy, screen, GLX_VERSION);
+- ret = sscanf(version_string, "%d.%d", &server_major, &server_minor);
+- assert(ret == 2);
+- server = server_major * 10 + server_minor;
+-
+- version_string = glXGetClientString(dpy, GLX_VERSION);
+- ret = sscanf(version_string, "%d.%d", &client_major, &client_minor);
+- assert(ret == 2);
+- client = client_major * 10 + client_minor;
+-
+- if (client < server)
+- return client;
+- else
+- return server;
++ if ((version_string = glXQueryServerString(dpy, screen, GLX_VERSION)))
++ {
++ sscanf_ret = sscanf(version_string, "%d.%d", &server_major, &server_minor);
++ assert(sscanf_ret == 2);
++ server = server_major * 10 + server_minor;
++ if ((version_string = glXGetClientString(dpy, GLX_VERSION)))
++ {
++ sscanf_ret = sscanf(version_string, "%d.%d", &client_major, &client_minor);
++ assert(sscanf_ret == 2);
++ client = client_major * 10 + client_minor;
++ ret = client <= server ? client : server;
++ }
++ }
++
++ return ret;
+ }
+
+ /**
</ins></span></pre>
</div>
</div>
</body>
</html>