<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/bd48c2b29c927fb2ae2c26a48dd5ca3ada72d2fa">https://github.com/macports/macports-ports/commit/bd48c2b29c927fb2ae2c26a48dd5ca3ada72d2fa</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 bd48c2b openttd: 1.6.1, actually apply the patches I wrote
</span>bd48c2b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd48c2b29c927fb2ae2c26a48dd5ca3ada72d2fa
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Nov 8 23:19:23 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> openttd: 1.6.1, actually apply the patches I wrote
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It seems when updating to 1.5.2 I wrote the patches required to fix the
</span><span style='display:block; white-space:pre;color:#404040;'> build on modern OS X, even submitted them upstream, but then failed to
</span><span style='display:block; white-space:pre;color:#404040;'> actually enable them in the Portfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update one of the patches with a newer suggestion from the upstream
</span><span style='display:block; white-space:pre;color:#404040;'> ticket, update to 1.6.1 and enable the patches.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52841
</span>---
games/openttd/Portfile | 10 ++++++----
...tch-src__music__cocoa_m.cpp-support-new-audio-api.diff | 13 +++++++++++++
..._m.cpp-support-new-audiocomponent.h-include-guard.diff | 15 ---------------
3 files changed, 19 insertions(+), 19 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 3a1dfe6..c3c1893 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;'>@@ -12,9 +12,9 @@ maintainers cal openmaintainer
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.5.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3786231d2059279679220a2a351b772fc11efdef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 60e68eca552e34268033885e5389ad46b88b692514bf426a6e37cebd8d819f28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 8f96756463830f170993a670b4d060ad0a6724a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9b08996e31c3485ef8dedfa1ab65147091593f3f11bd51eb7662ce5ea41363aa
</span>
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,9 @@ if {${name} eq ${subport}} {
</span> port:openttd-opensfx \
port:openttd-openmsx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-config.lib-remove-deployment-target.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-config.lib-remove-deployment-target.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src__music__cocoa_m.cpp-support-new-audio-api.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff
</span>
configure.env-append \
CFLAGS_BUILD="${configure.cflags}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audio-api.diff b/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audio-api.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..311493c
</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-src__music__cocoa_m.cpp-support-new-audio-api.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Submitted [https://bugs.openttd.org/task/6380]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/music/cocoa_m.cpp b/src/music/cocoa_m.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/music/cocoa_m.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/music/cocoa_m.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@ static void DoSetVolume()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * risk compilation errors. The header AudioComponent.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * was introduced in 10.6 so use it to decide which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * type definition to use. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __AUDIOCOMPONENT_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(AUDIO_UNIT_VERSION) && (AUDIO_UNIT_VERSION >= 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioComponentDescription desc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ComponentDescription desc;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff b/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5ff6d7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Submitted [https://bugs.openttd.org/task/6380]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/music/cocoa_m.cpp.orig 2015-10-18 17:47:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/music/cocoa_m.cpp 2015-10-18 17:55:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,8 +67,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * but we need to get the type declaration right or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * risk compilation errors. The header AudioComponent.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * was introduced in 10.6 so use it to decide which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * type definition to use. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __AUDIOCOMPONENT_H__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * type definition to use. It's include guard changed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * in 10.11, support both. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__AUDIOCOMPONENT_H__) || defined(AudioUnit_AudioComponent_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AudioComponentDescription desc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ComponentDescription desc;
</span></pre><pre style='margin:0'>
</pre>