<!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>[115133] trunk/dports/games/openttd</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/115133">115133</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2013-12-25 12:11:01 -0800 (Wed, 25 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>openttd: switch to libc++ on Mavericks and above, avoid fallback to debug code when setting resolution and creating the window</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgamesopenttdPortfile">trunk/dports/games/openttd/Portfile</a></li>
<li><a href="#trunkdportsgamesopenttdfilespatchsrc__video__cocoa__cocoa_vmm10_9diff">trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgamesopenttdfilespatchconfiglibincreasedeploymenttargetdiff">trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgamesopenttdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/openttd/Portfile (115132 => 115133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/openttd/Portfile 2013-12-25 12:15:46 UTC (rev 115132)
+++ trunk/dports/games/openttd/Portfile 2013-12-25 20:11:01 UTC (rev 115133)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><span class="cx"> version 1.3.3
</span><del>- revision 1
</del><ins>+ revision 2
</ins><span class="cx"> checksums rmd160 cf569d6fa66f4bb694a40e243f23668c65adb431 \
</span><span class="cx"> sha256 6991ed2c0170481800c3a92a1b43546821a658de91d3ac7efe868588387eca5d
</span><span class="cx">
</span><span class="lines">@@ -48,17 +48,14 @@
</span><span class="cx"> port:openttd-openmsx
</span><span class="cx">
</span><span class="cx"> patchfiles patch-src__video__cocoa__cocoa_v.mm-10_9.diff
</span><del>-
- # needs to be built against libstdc++, not libc++
- if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libstdc++
</del><ins>+ platform darwin {
+ if {${os.major} >= 13} {
+ # Mavericks builds using libc++, using a deployment target < 10.7
+ # will break that
+ patchfiles-append patch-config.lib-increase-deployment-target.diff
+ }
</ins><span class="cx"> }
</span><del>- set cxx_stdlibflags {}
- if {[string match *clang* ${configure.cxx}]} {
- set cxx_stdlibflags -stdlib=libstdc++
- }
</del><span class="cx">
</span><del>- configure.cxx "${configure.cxx} ${cxx_stdlibflags}"
</del><span class="cx"> configure.env-append \
</span><span class="cx"> CFLAGS_BUILD="${configure.cflags}" \
</span><span class="cx"> CXXFLAGS_BUILD="${configure.cxxflags}" \
</span></span></pre></div>
<a id="trunkdportsgamesopenttdfilespatchconfiglibincreasedeploymenttargetdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff (0 => 115133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff (rev 0)
+++ trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff 2013-12-25 20:11:01 UTC (rev 115133)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- config.lib.orig 2013-12-25 20:49:22.000000000 +0100
++++ config.lib 2013-12-25 20:49:28.000000000 +0100
+@@ -1562,7 +1562,7 @@
+ # Only set the min version when not doing an universal build.
+ # Universal builds set the version elsewhere.
+ if [ "$cpu_type" = "64" ]; then
+- CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
++ CFLAGS="$CFLAGS -mmacosx-version-min=10.7"
+ else
+ gcc_cpu=`$cc_host -dumpmachine`
+ if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then
</ins></span></pre></div>
<a id="trunkdportsgamesopenttdfilespatchsrc__video__cocoa__cocoa_vmm10_9diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff (115132 => 115133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff 2013-12-25 12:15:46 UTC (rev 115132)
+++ trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff 2013-12-25 20:11:01 UTC (rev 115133)
</span><span class="lines">@@ -1,18 +1,12 @@
</span><del>---- src/video/cocoa/cocoa_v.mm.orig 2013-12-20 00:43:28.000000000 +0100
-+++ src/video/cocoa/cocoa_v.mm 2013-12-20 00:45:45.000000000 +0100
-@@ -393,6 +393,7 @@
- static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool fullscreen, bool fallback)
- {
- CocoaSubdriver *ret = NULL;
-+#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9)
- /* OSX 10.7 allows to toggle fullscreen mode differently */
- if (MacOSVersionIsAtLeast(10, 7, 0)) {
</del><ins>+--- src/video/cocoa/cocoa_v.mm.orig 2013-12-25 20:47:32.000000000 +0100
++++ src/video/cocoa/cocoa_v.mm 2013-12-25 20:48:13.000000000 +0100
+@@ -398,7 +398,9 @@
</ins><span class="cx"> ret = QZ_CreateWindowSubdriver(width, height, bpp);
</span><del>-@@ -400,6 +401,7 @@
</del><ins>+ if (ret != NULL && fullscreen) ret->ToggleFullscreen();
</ins><span class="cx"> } else {
</span><ins>++#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9)
</ins><span class="cx"> ret = fullscreen ? QZ_CreateFullscreenSubdriver(width, height, bpp) : QZ_CreateWindowSubdriver(width, height, bpp);
</span><del>- }
</del><span class="cx"> +#endif /* (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) */
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (ret != NULL) return ret;
</span><del>- if (!fallback) return NULL;
</del></span></pre>
</div>
</div>
</body>
</html>