[141433] trunk/dports/games/openttd/files

[cal at macports.org]

Revision: 141433
          https://trac.macports.org/changeset/141433
Author:   cal at macports.org
Date:     2015-10-18 09:49:20 -0700 (Sun, 18 Oct 2015)
Log Message:
-----------
openttd: Update patch status tracking, delete obsolete patch

Modified Paths:
--------------
    trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff
    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

Removed Paths:
-------------
    trunk/dports/games/openttd/files/openttd-fontcache.patch

Deleted: trunk/dports/games/openttd/files/openttd-fontcache.patch
===================================================================
--- trunk/dports/games/openttd/files/openttd-fontcache.patch	2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/openttd-fontcache.patch	2015-10-18 16:49:20 UTC (rev 141433)
@@ -1,42 +0,0 @@
-Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3)
-
-See upstream tickets #6223 and #6185.
-
-Upstream-Status: Backport [committed in r27079]
-Index: src/fontcache.cpp
-===================================================================
---- src/fontcache.cpp	(revision 27078)
-+++ src/fontcache.cpp	(working copy)
-@@ -536,8 +536,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));
-+	unsigned int width  = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL));
-+	unsigned int height = max(1U, (unsigned int)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");
-@@ -553,8 +553,8 @@
- 
- 	/* Draw shadow for medium size */
- 	if (this->fs == FS_NORMAL && !aa) {
--		for (int y = 0; y < slot->bitmap.rows; y++) {
--			for (int x = 0; x < slot->bitmap.width; x++) {
-+		for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
-+			for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
- 				if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
- 					sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR;
- 					sprite.data[1 + x + (1 + y) * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF;
-@@ -563,8 +563,8 @@
- 		}
- 	}
- 
--	for (int y = 0; y < slot->bitmap.rows; y++) {
--		for (int x = 0; x < slot->bitmap.width; x++) {
-+	for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
-+		for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
- 			if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
- 				sprite.data[x + y * sprite.width].m = FACE_COLOUR;
- 				sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF;

Modified: trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff
===================================================================
--- trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff	2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff	2015-10-18 16:49:20 UTC (rev 141433)
@@ -1,3 +1,4 @@
+Upstream-Stauts: Inappropriate [Configuration]
 --- config.lib.orig	2013-12-26 17:59:22.000000000 +0100
 +++ config.lib	2013-12-26 18:01:06.000000000 +0100
 @@ -1557,23 +1557,6 @@

Modified: 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	2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff	2015-10-18 16:49:20 UTC (rev 141433)
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://bugs.openttd.org/task/6380]
 --- 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 @@

Modified: 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	2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff	2015-10-18 16:49:20 UTC (rev 141433)
@@ -1,4 +1,4 @@
-Upstream-Status: pending
+Upstream-Status: Submitted [https://bugs.openttd.org/task/6380]
 --- 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 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/33c21fa4/attachment.html>