<!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>[132849] 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/132849">132849</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-02-11 11:36:00 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mesa: Fix build on Snow Leopard (#46828)</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="#trunkdportsx11mesafilesnomissingprototypeserrorpatch">trunk/dports/x11/mesa/files/no-missing-prototypes-error.patch</a></li>
<li><a href="#trunkdportsx11mesafilesstaticstrnduppatch">trunk/dports/x11/mesa/files/static-strndup.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 (132848 => 132849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/Portfile 2015-02-11 19:16:50 UTC (rev 132848)
+++ trunk/dports/x11/mesa/Portfile 2015-02-11 19:36:00 UTC (rev 132849)
</span><span class="lines">@@ -45,6 +45,12 @@
</span><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><ins>+if {[string match *gcc* ${configure.compiler}]} {
+ # Older gcc fail to do -Werror=missing-prototypes correctly
+ # https://trac.macports.org/ticket/46827
+ patchfiles-append no-missing-prototypes-error.patch
+}
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><span class="lines">@@ -55,21 +61,30 @@
</span><span class="cx"> --disable-openvg \
</span><span class="cx"> --with-gallium-drivers=
</span><span class="cx">
</span><del>-if { ![file exists /usr/include/Xplugin.h] } {
- # Xplugin.h is missing on Tiger
- configure.cppflags-append -I${filespath}/include
-}
</del><ins>+platform darwin {
+ if {${os.major} < 11} {
+ # https://bugs.freedesktop.org/show_bug.cgi?id=89088
+ configure.env-append INDENT=cat
</ins><span class="cx">
</span><del>-configure.cppflags-delete -I${prefix}/include
</del><ins>+ patchfiles-append static-strndup.patch
+ }
</ins><span class="cx">
</span><del>-pre-configure {
- if { ![file exists /usr/lib/libXplugin.dylib] } {
- ui_error "Detected a problem with your development environment. Please work around it by executing:"
- ui_error "sudo ln -s libXplugin.1.dylib /usr/lib/libXplugin.dylib"
- return -code error "missing libXplugin.dylib"
</del><ins>+ if { ![file exists /usr/include/Xplugin.h] } {
+ # Xplugin.h is missing on Tiger
+ configure.cppflags-append -I${filespath}/include
</ins><span class="cx"> }
</span><ins>+
+ pre-configure {
+ if { ![file exists /usr/lib/libXplugin.dylib] } {
+ ui_error "Detected a problem with your development environment. Please work around it by executing:"
+ ui_error "sudo ln -s libXplugin.1.dylib /usr/lib/libXplugin.dylib"
+ return -code error "missing libXplugin.dylib"
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.cppflags-delete -I${prefix}/include
+
</ins><span class="cx"> variant python26 conflicts python27 description {Use python 2.6} {
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:py26-libxml2
</span></span></pre></div>
<a id="trunkdportsx11mesafilesnomissingprototypeserrorpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/no-missing-prototypes-error.patch (0 => 132849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/no-missing-prototypes-error.patch (rev 0)
+++ trunk/dports/x11/mesa/files/no-missing-prototypes-error.patch 2015-02-11 19:36:00 UTC (rev 132849)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+--- a/configure.ac.orig 2015-02-06 16:09:51.000000000 -0800
++++ a/configure.ac 2015-02-11 10:34:57.000000000 -0800
+@@ -182,19 +182,6 @@ dnl Add flags for gcc and g++
+ if test "x$GCC" = xyes; then
+ CFLAGS="$CFLAGS -Wall -std=c99"
+
+- # Enable -Werror=implicit-function-declaration and
+- # -Werror=missing-prototypes, if available, or otherwise, just
+- # -Wmissing-prototypes. This is particularly useful to avoid
+- # generating a loadable driver module that has undefined symbols.
+- save_CFLAGS="$CFLAGS"
+- AC_MSG_CHECKING([whether $CC supports -Werror=missing-prototypes])
+- CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
+- CFLAGS="$CFLAGS -Werror=missing-prototypes"
+- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+- AC_MSG_RESULT([yes]),
+- [CFLAGS="$save_CFLAGS -Wmissing-prototypes";
+- AC_MSG_RESULT([no])]);
+-
+ # Enable -fvisibility=hidden if using a gcc that supports it
+ save_CFLAGS="$CFLAGS"
+ AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
</ins></span></pre></div>
<a id="trunkdportsx11mesafilesstaticstrnduppatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mesa/files/static-strndup.patch (0 => 132849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/files/static-strndup.patch (rev 0)
+++ trunk/dports/x11/mesa/files/static-strndup.patch 2015-02-11 19:36:00 UTC (rev 132849)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+--- a/src/mesa/drivers/dri/common/xmlconfig.c.orig 2015-02-06 16:09:52.000000000 -0800
++++ a/src/mesa/drivers/dri/common/xmlconfig.c 2015-02-11 11:32:32.000000000 -0800
+@@ -105,6 +105,24 @@ static const char *__getProgramName () {
+ # endif
+ #endif
+
++#undef strndup
++#define strndup __xmlconfig_strndup
++static char *
++strndup(const char *str, size_t n)
++{
++ size_t len;
++ char *copy;
++
++ for (len = 0; len < n && str[len]; len++)
++ continue;
++
++ if ((copy = (char *)malloc(len + 1)) == NULL)
++ return (NULL);
++ memcpy(copy, str, len);
++ copy[len] = '\0';
++ return (copy);
++}
++
+ /** \brief Find an option in an option cache with the name as key */
+ static uint32_t findOption (const driOptionCache *cache, const char *name) {
+ uint32_t len = strlen (name);
</ins></span></pre>
</div>
</div>
</body>
</html>