<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/84e1a585606cbb7e690afd5c72f7fdbf2c756fb6">https://github.com/macports/macports-ports/commit/84e1a585606cbb7e690afd5c72f7fdbf2c756fb6</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 84e1a58 openttd: update to version 1.7.1
</span>84e1a58 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 84e1a585606cbb7e690afd5c72f7fdbf2c756fb6
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sat Jun 17 20:30:08 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> openttd: update to version 1.7.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> delete patchfiles for fixes incorporated into 1.7.1
</span>---
games/openttd/Portfile | 12 ++++------
.../patch-config.lib-remove-deployment-target.diff | 27 ----------------------
...__music__cocoa_m.cpp-support-new-audio-api.diff | 13 -----------
...quartz.mm-avoid-removed-cmgetsystemprofile.diff | 17 --------------
4 files changed, 4 insertions(+), 65 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 8350c70..199bc0d 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;'>@@ -11,10 +11,9 @@ maintainers cal openmaintainer
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.6.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8f96756463830f170993a670b4d060ad0a6724a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9b08996e31c3485ef8dedfa1ab65147091593f3f11bd51eb7662ce5ea41363aa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7ed0fc3b1c62cdcc11093c3fe3945b7a8fd0f292 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 61190952a98d494d3fd62e395dd6c359609914d0ba8fe80eaeb585b7d62a1b36
</span>
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,10 +46,7 @@ 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:#ffe0e0;'>- patch-src__music__cocoa_m.cpp-support-new-audio-api.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-fileio-const-char.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src-fileio-const-char.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-config.lib-remove-deployment-target.diff b/games/openttd/files/patch-config.lib-remove-deployment-target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9cf5f3f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-config.lib-remove-deployment-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Stauts: Inappropriate [Configuration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.lib.orig 2013-12-26 17:59:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.lib 2013-12-26 18:01:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1557,23 +1557,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="$OSX_SYSROOT $CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Only set the min version when not doing an universal build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Universal builds set the version elsewhere.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "$cpu_type" = "64" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gcc_cpu=`$cc_host -dumpmachine`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # PowerPC build can run on 10.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Intel is only available starting from 10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -mmacosx-version-min=10.4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 311493c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audio-api.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +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;'>-diff --git a/src/music/cocoa_m.cpp b/src/music/cocoa_m.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/music/cocoa_m.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/music/cocoa_m.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@ static void DoSetVolume()
</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;'>-+#if defined(AUDIO_UNIT_VERSION) && (AUDIO_UNIT_VERSION >= 1060)
</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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff b/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1cdaf8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +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/video/cocoa/wnd_quartz.mm.orig 2015-10-18 18:11:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video/cocoa/wnd_quartz.mm 2015-10-18 18:14:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,12 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static CGColorSpaceRef colorSpace = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (colorSpace == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CMProfileRef sysProfile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (CMGetSystemProfile(&sysProfile) == noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- colorSpace = CGColorSpaceCreateWithPlatformColorSpace(sysProfile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CMCloseProfile(sysProfile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(colorSpace = CGDisplayCopyColorSpace(CGMainDisplayID()))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- colorSpace = CGColorSpaceCreateDeviceRGB();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>