[115133] trunk/dports/games/openttd

[cal at macports.org]

Revision: 115133
          https://trac.macports.org/changeset/115133
Author:   cal at macports.org
Date:     2013-12-25 12:11:01 -0800 (Wed, 25 Dec 2013)
Log Message:
-----------
openttd: switch to libc++ on Mavericks and above, avoid fallback to debug code when setting resolution and creating the window

Modified Paths:
--------------
    trunk/dports/games/openttd/Portfile
    trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff

Added Paths:
-----------
    trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff

Modified: trunk/dports/games/openttd/Portfile
===================================================================
--- 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)
@@ -13,7 +13,7 @@
 
 if {${name} eq ${subport}} {
     version             1.3.3
-    revision            1
+    revision            2
     checksums           rmd160  cf569d6fa66f4bb694a40e243f23668c65adb431 \
                         sha256  6991ed2c0170481800c3a92a1b43546821a658de91d3ac7efe868588387eca5d
 
@@ -48,17 +48,14 @@
                         port:openttd-openmsx
 
     patchfiles          patch-src__video__cocoa__cocoa_v.mm-10_9.diff
-
-    # needs to be built against libstdc++, not libc++
-    if {[info exists configure.cxx_stdlib]} {
-        configure.cxx_stdlib    libstdc++
+    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
+        }
     }
-    set cxx_stdlibflags {}
-    if {[string match *clang* ${configure.cxx}]} {
-        set cxx_stdlibflags -stdlib=libstdc++
-    }
 
-    configure.cxx       "${configure.cxx} ${cxx_stdlibflags}"
     configure.env-append \
                         CFLAGS_BUILD="${configure.cflags}" \
                         CXXFLAGS_BUILD="${configure.cxxflags}" \

Added: trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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

Modified: trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff
===================================================================
--- 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)
@@ -1,18 +1,12 @@
---- 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)) {
+--- 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 @@
  		ret = QZ_CreateWindowSubdriver(width, height, bpp);
-@@ -400,6 +401,7 @@
+ 		if (ret != NULL && fullscreen) ret->ToggleFullscreen();
  	} else {
++#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9)
  		ret = fullscreen ? QZ_CreateFullscreenSubdriver(width, height, bpp) : QZ_CreateWindowSubdriver(width, height, bpp);
- 	}
 +#endif /* (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) */
+ 	}
  
  	if (ret != NULL) return ret;
- 	if (!fallback) return NULL;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131225/7a45859a/attachment.html>