<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d142962e675ee8dcaa8fec706484d6408147e963">https://github.com/macports/macports-ports/commit/d142962e675ee8dcaa8fec706484d6408147e963</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d142962 openttd: use application bundle
</span>d142962 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d142962e675ee8dcaa8fec706484d6408147e963
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Mon Jun 1 13:35:57 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> openttd: use application bundle
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This adjusts the OpenTTD port to build an application bundle. While at
</span><span style='display:block; white-space:pre;color:#404040;'> it I set the SDK, enabled LTO and fixed the livecheck.
</span>---
games/openttd/Portfile | 40 ++++++++++++++++++++--------------
games/openttd/files/patch-lto.diff | 36 ++++++++++++++++++++++++++++++
games/openttd/files/patch-sysroot.diff | 24 ++++++++++++++++++++
3 files changed, 84 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/Portfile b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0b8ccf..8bf87b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name openttd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories games
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories games aqua
</span> platforms macosx
maintainers {cal @neverpanic} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ maintainers {cal @neverpanic} openmaintainer
</span> if {${name} eq ${subport}} {
version 1.10.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 d5549e42fc8c79af68f22c4bb5660724e4d6d588 \
sha256 0d22a3c50f7a321f4f211594f4987ac16c381e8e3e40f116848e63e91e7fbb9b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,8 +53,10 @@ if {${name} eq ${subport}} {
</span> # icu-lx has a preprocessor define of INITIAL_CAPACITY in layout/RunArrays.h
# icu has a variable INITIAL_CAPACITY in unicode/uniset.h
# ensure that unicode/uniset.h is included after layout/RunArrays.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-name_conflict.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-name_conflict.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lto.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sysroot.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # claims only 2011 needed, but actually is using more recent features.
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,10 +64,9 @@ if {${name} eq ${subport}} {
</span> CFLAGS_BUILD=${configure.cflags} \
CXXFLAGS_BUILD=${configure.cxxflags} \
LDFLAGS_BUILD=${configure.ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --prefix-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --binary-dir=bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --icon-theme-dir=share/icons/hicolor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args --prefix-dir=${applications_dir} \
</span> --install-dir=${destroot} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-osx-sysroot=${configure.sdkroot} \
</span> --with-cocoa \
--with-zlib \
--with-liblzma \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,19 +75,26 @@ if {${name} eq ${subport}} {
</span> --with-freetype \
--with-fontconfig \
--with-icu \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-application-bundle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-lto \
</span> --enable-strip
build.args-append VERBOSE=1
destroot.args-append VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target bundle
</span>
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex {Download stable \((\d+(\.\d+)+)\)}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/bundle/man/openttd.6.gz ${destroot}/${prefix}/share/man/man6/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/bundle/OpenTTD.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport openttd-opengfx {
version 0.6.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums rmd160 6ef0cbd399b3a4e117a70e723c072ed694b7517f \
sha256 d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774 \
size 3551230
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +122,7 @@ subport openttd-opengfx {
</span> use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set target ${destroot}${prefix}/share/games/openttd/baseset/opengfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/opengfx
</span> xinstall -d -m 755 ${target}
fs-traverse file ${worksrcpath} {
if {[file isfile ${file}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,12 +132,12 @@ subport openttd-opengfx {
</span> }
livecheck.url http://www.openttd.org/en/download-opengfx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {Latest release in opengfx is (\d+(\.\d+)+),}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {Latest stable release in opengfx is (\d+(\.\d+)+),}
</span> }
subport openttd-opensfx {
version 0.2.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 426b641b5a29556598d8a3033b4c4dc5b98630ce \
sha256 6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02 \
size 11359588
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +161,7 @@ subport openttd-opensfx {
</span> use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set target ${destroot}${prefix}/share/games/openttd/baseset/opensfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/opensfx
</span> xinstall -d -m 755 ${target}
fs-traverse file ${worksrcpath} {
if {[file isfile ${file}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,12 +171,12 @@ subport openttd-opensfx {
</span> }
livecheck.url http://www.openttd.org/en/download-opensfx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {Latest release in opensfx is (\d+(\.\d+)+),}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {Latest stable release in opensfx is (\d+(\.\d+)+),}
</span> }
subport openttd-openmsx {
version 0.3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 8eff246e89e44f63ca480e9acef94a1da5fa81d2 \
sha256 92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5 \
size 136981
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +199,7 @@ subport openttd-openmsx {
</span> use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set target ${destroot}${prefix}/share/games/openttd/baseset/openmsx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/openmsx
</span> xinstall -d -m 755 ${target}
fs-traverse file ${worksrcpath} {
if {[file isfile ${file}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,5 +209,5 @@ subport openttd-openmsx {
</span> }
livecheck.url http://www.openttd.org/en/download-openmsx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {Latest release in openmsx is (\d+(\.\d+)+),}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {Latest stable release in openmsx is (\d+(\.\d+)+),}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-lto.diff b/games/openttd/files/patch-lto.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2deefb1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/files/patch-lto.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d7e7c639157385a47280553c474dfee9f32fb9af Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 3 Jun 2020 18:26:27 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add: support Clang LTO in configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.lib | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git config.lib config.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 287c596233..e9c389726f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -667,7 +667,8 @@ check_params() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$enable_lto" != "0" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- has_lto=`($cxx_build -dumpspecs 2>&1 | grep '\%{flto') || ($cxx_build -help ipo 2>&1 | grep '\-ipo')`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Clang outputs -flto=thin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ has_lto=`($cxx_build -dumpspecs 2>&1 | grep '\%{flto') || ($cxx_build -help ipo 2>&1 | grep '\-ipo') || ($cxx_build --help 2>&1 | grep 'lto.*thin')`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -n "$has_lto" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log 1 "using link time optimization... yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1336,6 +1337,12 @@ make_compiler_cflags() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rdynamic is used to get useful stack traces from crash reports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldflags="$ldflags -rdynamic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$enable_lto" != "0" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags="$flags -flto=thin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ features="$features lto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ features_host="$features_host lto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Assume gcc, since it just uses argv[0] in its --version output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable some things only for certain GCC versions
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-sysroot.diff b/games/openttd/files/patch-sysroot.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2c9b1d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/files/patch-sysroot.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a6ef620b751c736794e4ad95dac091a6d34c72ad Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 3 Jun 2020 18:50:13 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix: unbreak setting sysroot/SDK on recent versions of macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The 10.15 SDK cannot target 10.4 due to missing libstdc++ headers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.lib | 3 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git config.lib config.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e9c389726f..64f6724f5c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2111,8 +2111,7 @@ check_osx_sdk() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Set minimum version to 10.4 as that's when kCGBitmapByteOrder32Host was introduced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sysroot="-isysroot $osx_sdk_path -Wl,-syslibroot,$osx_sdk_path -mmacosx-version-min=10.4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sysroot="-isysroot $osx_sdk_path -Wl,-syslibroot,$osx_sdk_path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > tmp.osx.mm << EOF
</span></pre><pre style='margin:0'>
</pre>