<!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>[134418] 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/134418">134418</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-03-24 23:49:04 -0700 (Tue, 24 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>mesa: Bump to 10.4.7</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11mesaPortfile">trunk/dports/x11/mesa/Portfile</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11mesafiles0001darwinbuildfixpatch">trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch</a></li>
<li><a href="#trunkdportsx11mesafiles0002darwinbuildfixpatch">trunk/dports/x11/mesa/files/0002-darwin-build-fix.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 (134417 => 134418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/Portfile        2015-03-25 03:04:44 UTC (rev 134417)
+++ trunk/dports/x11/mesa/Portfile        2015-03-25 06:49:04 UTC (rev 134418)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                mesa
</span><span class="cx"> epoch               1
</span><del>-version             10.4.4
-revision            2
</del><ins>+version             10.4.7
</ins><span class="cx"> categories          x11 graphics
</span><span class="cx"> maintainers         jeremyhu openmaintainer
</span><span class="cx"> license             MIT
</span><span class="lines">@@ -20,9 +19,9 @@
</span><span class="cx"> platforms           macosx darwin
</span><span class="cx"> use_bzip2           yes
</span><span class="cx"> master_sites        ftp://ftp.freedesktop.org/pub/mesa/${version}/
</span><del>-checksums           sha1    4d5b2cc992a21cdef07da5ccd7a705039df6f094 \
-                    rmd160  3a6ebe589d73d10f0127f70684d744a434c5156c \
-                    sha256  f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c
</del><ins>+checksums           sha1    a7c6dac86f4a4410a82267c3672d6b0d5f45ed48 \
+                    rmd160  27e74e9cb6762916c12c19ca7d38809dad1ffb24 \
+                    sha256  2c351c98671f9a7ab3fd9c601bb7a255801b1580f5dd0992639f99152801b0d2
</ins><span class="cx"> 
</span><span class="cx"> depends_build       port:pkgconfig \
</span><span class="cx">                     port:flex \
</span><span class="lines">@@ -41,8 +40,6 @@
</span><span class="cx"> 
</span><span class="cx"> patch.pre_args      -p1
</span><span class="cx"> patchfiles \
</span><del>-    0001-darwin-build-fix.patch \
-    0002-darwin-build-fix.patch \
</del><span class="cx">     0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</span><span class="cx">     1001-darwin-Fix-install-name-of-libOSMesa.patch \
</span><span class="cx">     5001-swrast-Build-fix-for-darwin.patch \
</span></span></pre></div>
<a id="trunkdportsx11mesafiles0001darwinbuildfixpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch (134417 => 134418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch        2015-03-25 03:04:44 UTC (rev 134417)
+++ trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch        2015-03-25 06:49:04 UTC (rev 134418)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-From 162cee83ba98abb6ee21bb270ff0c6a09e97cd1f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia &lt;jeremyhu@apple.com&gt;
-Date: Tue, 10 Feb 2015 20:32:02 -0800
-Subject: [PATCH 1/2] darwin: build fix
-
-../../../src/mesa/main/compiler.h:47:10: fatal error: 'util/macros.h' file not found
-
-Signed-off-by: Jeremy Huddleston Sequoia &lt;jeremyhu@apple.com&gt;
-(cherry picked from commit 1c67a5687a35e984323b6034adb914a66d64bb2f)
----
- src/glx/apple/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glx/apple/Makefile.am b/src/glx/apple/Makefile.am
-index 894ab5b..8d03225 100644
---- a/src/glx/apple/Makefile.am
-+++ b/src/glx/apple/Makefile.am
-@@ -1,6 +1,7 @@
- noinst_LTLIBRARIES = libappleglx.la

- AM_CFLAGS = \
-+        -I$(top_srcdir)/src \
-         -I$(top_srcdir)/include \
-         -I$(top_srcdir)/src/glx \
-         -I$(top_srcdir)/src/mesa \
--- 
-2.3.0
-
</del></span></pre></div>
<a id="trunkdportsx11mesafiles0002darwinbuildfixpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch (134417 => 134418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch        2015-03-25 03:04:44 UTC (rev 134417)
+++ trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch        2015-03-25 06:49:04 UTC (rev 134418)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-From 654f197f1965d5be52b96c2f1af27d8bc96f9c78 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia &lt;jeremyhu@apple.com&gt;
-Date: Tue, 10 Feb 2015 22:21:47 -0800
-Subject: [PATCH 2/2] darwin: build fix
-
-xfont.c:237:14: error: implicit declaration of function 'GetGLXDRIDrawable' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
-   glxdraw = GetGLXDRIDrawable(CC-&gt;currentDpy, CC-&gt;currentDrawable);
-             ^
-Fixes regression from 291be28476ea60c6fb1eb2a882e2e25def5d3735
-
-Signed-off-by: Jeremy Huddleston Sequoia &lt;jeremyhu@apple.com&gt;
-(cherry picked from commit e68b67b53fce39a8c93188262d9e795ca50750ac)
----
- src/glx/xfont.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/glx/xfont.c b/src/glx/xfont.c
-index a086b7a..00498bc 100644
---- a/src/glx/xfont.c
-+++ b/src/glx/xfont.c
-@@ -221,7 +221,10 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int lis
-    XGCValues values;
-    unsigned long valuemask;
-    XFontStruct *fs;
-+
-+#if !defined(GLX_USE_APPLEGL)
-    __GLXDRIdrawable *glxdraw;
-+#endif

-    GLint swapbytes, lsbfirst, rowlength;
-    GLint skiprows, skippixels, alignment;
-@@ -234,9 +237,11 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int lis
-    dpy = CC-&gt;currentDpy;
-    win = CC-&gt;currentDrawable;

-+#if !defined(GLX_USE_APPLEGL)
-    glxdraw = GetGLXDRIDrawable(CC-&gt;currentDpy, CC-&gt;currentDrawable);
-    if (glxdraw)
-       win = glxdraw-&gt;xDrawable;
-+#endif

-    fs = XQueryFont(dpy, font);
-    if (!fs) {
--- 
-2.3.0
-
</del></span></pre>
</div>
</div>

</body>
</html>