[141432] trunk/dports/games/openttd

[cal at macports.org]

Revision: 141432
          https://trac.macports.org/changeset/141432
Author:   cal at macports.org
Date:     2015-10-18 09:38:11 -0700 (Sun, 18 Oct 2015)
Log Message:
-----------
openttd: update to 1.5.2, openttd-gfx: update to 0.5.2, fix build on 10.11

Modified Paths:
--------------
    trunk/dports/games/openttd/Portfile

Added Paths:
-----------
    trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff
    trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff

Modified: trunk/dports/games/openttd/Portfile
===================================================================
--- trunk/dports/games/openttd/Portfile	2015-10-18 15:06:16 UTC (rev 141431)
+++ trunk/dports/games/openttd/Portfile	2015-10-18 16:38:11 UTC (rev 141432)
@@ -12,10 +12,9 @@
 
 
 if {${name} eq ${subport}} {
-    version             1.4.4
-    revision            1
-    checksums           rmd160  591ffe69e26e4820af29f8e04ec181d4c5119170 \
-                        sha256  70f430b883c44f5e62111ea2dfd83f4e1c67835d8cd40dbb73bf89becac2d3f7
+    version             1.5.2
+    checksums           rmd160  3786231d2059279679220a2a351b772fc11efdef \
+                        sha256  60e68eca552e34268033885e5389ad46b88b692514bf426a6e37cebd8d819f28
 
     license             GPL-2
 
@@ -46,8 +45,7 @@
                         port:openttd-opensfx \
                         port:openttd-openmsx
 
-    patchfiles          patch-config.lib-remove-deployment-target.diff \
-                        openttd-fontcache.patch
+    patchfiles          patch-config.lib-remove-deployment-target.diff
 
     configure.env-append \
                         CFLAGS_BUILD="${configure.cflags}" \
@@ -77,9 +75,9 @@
 }
 
 subport openttd-opengfx {
-    version             0.5.0
-    checksums           rmd160  beb468ec34277ec6e3e8ead4ed860683e06c4081 \
-                        sha256  440cd0ad40f17c180bf1a339fad5a06c9cdc0a4e680dd1f8d5e4aa720d4b531a
+    version             0.5.2
+    checksums           rmd160  4e6628c873fa2ca555cb473e445584be303d9d43 \
+                        sha256  19be61f1cb04cbb3cb9602f0b8eb6e6f56ecbefbfdd6e0e03f9579e5a5c1cbc8
 
     supported_archs     noarch
     license             GPL-2

Added: trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff
===================================================================
--- trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff	                        (rev 0)
+++ trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff	2015-10-18 16:38:11 UTC (rev 141432)
@@ -0,0 +1,15 @@
+Upstream-Status: Pending
+--- src/music/cocoa_m.cpp.orig	2015-10-18 17:47:57.000000000 +0200
++++ src/music/cocoa_m.cpp	2015-10-18 17:55:07.000000000 +0200
+@@ -67,8 +67,9 @@
+ 			 * but we need to get the type declaration right or
+ 			 * risk compilation errors. The header AudioComponent.h
+ 			 * was introduced in 10.6 so use it to decide which
+-			 * type definition to use. */
+-#ifdef __AUDIOCOMPONENT_H__
++			 * type definition to use. It's include guard changed
++			 * in 10.11, support both. */
++#if defined(__AUDIOCOMPONENT_H__) || defined(AudioUnit_AudioComponent_h)
+ 			AudioComponentDescription desc;
+ #else
+ 			ComponentDescription desc;

Added: trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff
===================================================================
--- trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff	                        (rev 0)
+++ trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff	2015-10-18 16:38:11 UTC (rev 141432)
@@ -0,0 +1,17 @@
+Upstream-Status: pending
+--- src/video/cocoa/wnd_quartz.mm.orig	2015-10-18 18:11:44.000000000 +0200
++++ src/video/cocoa/wnd_quartz.mm	2015-10-18 18:14:30.000000000 +0200
+@@ -110,12 +110,7 @@
+ 	static CGColorSpaceRef colorSpace = NULL;
+ 
+ 	if (colorSpace == NULL) {
+-		CMProfileRef sysProfile;
+-
+-		if (CMGetSystemProfile(&sysProfile) == noErr) {
+-			colorSpace = CGColorSpaceCreateWithPlatformColorSpace(sysProfile);
+-			CMCloseProfile(sysProfile);
+-		} else {
++		if (!(colorSpace = CGDisplayCopyColorSpace(CGMainDisplayID()))) {
+ 			colorSpace = CGColorSpaceCreateDeviceRGB();
+ 		}
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/c1328907/attachment.html>