[132406] trunk/dports/games/openttd

[cal at macports.org]

Revision: 132406
          https://trac.macports.org/changeset/132406
Author:   cal at macports.org
Date:     2015-01-31 09:15:33 -0800 (Sat, 31 Jan 2015)
Log Message:
-----------
openttd: update to 1.4.4

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

Added Paths:
-----------
    trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff

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

Modified: trunk/dports/games/openttd/Portfile
===================================================================
--- trunk/dports/games/openttd/Portfile	2015-01-31 17:13:38 UTC (rev 132405)
+++ trunk/dports/games/openttd/Portfile	2015-01-31 17:15:33 UTC (rev 132406)
@@ -12,10 +12,9 @@
 
 
 if {${name} eq ${subport}} {
-    version             1.4.1
-    revision            1
-    checksums           rmd160  feb76a26147277212ccf992dd854e833ec3ce3db \
-                        sha256  1face3af7a9b2169c0e284f3916f4b7b82947364e836107c404be520a570753e
+    version             1.4.4
+    checksums           rmd160  591ffe69e26e4820af29f8e04ec181d4c5119170 \
+                        sha256  70f430b883c44f5e62111ea2dfd83f4e1c67835d8cd40dbb73bf89becac2d3f7
 
     license             GPL-2
 
@@ -46,7 +45,8 @@
                         port:openttd-opensfx \
                         port:openttd-openmsx
 
-    patchfiles          patch-config.lib-remove-deployment-target.diff
+    patchfiles          patch-config.lib-remove-deployment-target.diff \
+                        patch-src__fontcache.cpp-signed-vs-unsigned-max.diff
 
     configure.env-append \
                         CFLAGS_BUILD="${configure.cflags}" \

Added: trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff
===================================================================
--- trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff	                        (rev 0)
+++ trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff	2015-01-31 17:15:33 UTC (rev 132406)
@@ -0,0 +1,13 @@
+--- src/fontcache.cpp.orig	2015-01-31 17:48:10.000000000 +0100
++++ src/fontcache.cpp	2015-01-31 17:49:31.000000000 +0100
+@@ -527,8 +527,8 @@
+ 	aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
+ 
+ 	/* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */
+-	int width  = max(1, slot->bitmap.width + (this->fs == FS_NORMAL));
+-	int height = max(1, slot->bitmap.rows  + (this->fs == FS_NORMAL));
++	int width  = max(1u, slot->bitmap.width + (this->fs == FS_NORMAL));
++	int height = max(1u, slot->bitmap.rows  + (this->fs == FS_NORMAL));
+ 
+ 	/* Limit glyph size to prevent overflows later on. */
+ 	if (width > 256 || height > 256) usererror("Font glyph is too large");

Deleted: 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	2015-01-31 17:13:38 UTC (rev 132405)
+++ trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff	2015-01-31 17:15:33 UTC (rev 132406)
@@ -1,12 +0,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);
- 		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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150131/82f63baa/attachment.html>