cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to openttd-1.5.0.

Browse Source 
Changelog:
http://us.binaries.openttd.org/binaries/releases/1.5.0/changelog.txt

ok daniel@
This commit is contained in:
bentley 2015-04-15 01:39:16 +00:00
parent c2c1238377
commit ead03ddec3
5 changed files with 17 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
games/openttd/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.41 2015/03/27 08:41:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2015/04/15 01:39:16 bentley Exp $
COMMENT= open source clone of the game Transport Tycoon Deluxe
V = 1.4.4
V = 1.5.0
DISTNAME = openttd-${V}
REVISION = 1
EXTRACT_SUFX= -source.tar.gz
GFX_V = 0.5.1
GFX_V = 0.5.2
SFX_V= 0.2.3
MSX_V= 0.3.1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@ -21,7 +20,7 @@ HOMEPAGE= https://www.openttd.org/en/
MAINTAINER = Anthony J. Bentley <anthony@cathet.us>
# GPLv2
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += SDL c fontconfig freetype icudata icui18n icuuc

8
games/openttd/distinfo
View File

@ -1,8 +1,8 @@
SHA256 (openttd/opengfx-0.5.1.zip) = 4bMItrVuLxzj4A/8BT8cre8CZUYfFVN5jsQfO9dL6MY=
SHA256 (openttd/opengfx-0.5.2.zip) = Gb5h8csEy7PLlgLwuOtub1bsvvv91uDgP5V55aXBy8g=
SHA256 (openttd/openmsx-0.3.1.zip) = kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU=
SHA256 (openttd/opensfx-0.2.3.zip) = NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI=
SHA256 (openttd/openttd-1.4.4-source.tar.gz) = 5ba3Lje3lq6LUyzYyWvSfLbGtY7MDppaF6CoBEK1w20=
SIZE (openttd/opengfx-0.5.1.zip) = 3468986
SHA256 (openttd/openttd-1.5.0-source.tar.gz) = TDVyBaY6R1ABoT5K3lmnNjXi8MSArQl/TX8D0q4pDuA=
SIZE (openttd/opengfx-0.5.2.zip) = 3547661
SIZE (openttd/openmsx-0.3.1.zip) = 136981
SIZE (openttd/opensfx-0.2.3.zip) = 11144025
SIZE (openttd/openttd-1.4.4-source.tar.gz) = 9726516
SIZE (openttd/openttd-1.5.0-source.tar.gz) = 10018865

40
games/openttd/patches/patch-src_fontcache_cpp
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-src_fontcache_cpp,v 1.1 2014/12/23 11:32:30 dcoppa Exp $
Fix compilation with freetype2 version 2.5.4 and newer
(upstream svn revision r27079)
--- src/fontcache.cpp.orig Tue Oct 21 13:36:35 2014
+++ src/fontcache.cpp Tue Dec 23 05:09:17 2014
@@ -527,8 +527,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
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");
@@ -544,8 +544,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
/* 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;
@@ -554,8 +554,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
}
}
- 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;

19
games/openttd/patches/patch-src_string_func_h
View File

@ -1,19 +1,10 @@
$OpenBSD: patch-src_string_func_h,v 1.2 2013/12/08 14:58:32 bentley Exp $
Don't use openttd's internal copies of strndup()/strcasestr().
--- src/string_func.h.orig Fri Nov 29 05:16:09 2013
+++ src/string_func.h Tue Dec 3 02:39:29 2013
@@ -249,7 +249,7 @@ static inline bool IsWhitespace(WChar c)
$OpenBSD: patch-src_string_func_h,v 1.3 2015/04/15 01:39:16 bentley Exp $
Don't use openttd's internal copy of strcasestr().
--- src/string_func.h.orig Thu Apr 2 21:51:26 2015
+++ src/string_func.h Thu Apr 2 21:54:19 2015
@@ -250,7 +250,7 @@ static inline bool IsWhitespace(WChar c)
#endif
/* strndup is a GNU extension */
-#if defined(_GNU_SOURCE) || (defined(__NetBSD_Version__) && 400000000 <= __NetBSD_Version__) || (defined(__FreeBSD_version) && 701101 <= __FreeBSD_version) || (defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200809L)
+#if defined(_GNU_SOURCE) || (defined(__NetBSD_Version__) && 400000000 <= __NetBSD_Version__) || (defined(__FreeBSD_version) && 701101 <= __FreeBSD_version) || (defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200809L) || defined(__OpenBSD__)
# undef DEFINE_STRNDUP
#else
# define DEFINE_STRNDUP
@@ -257,7 +257,7 @@ char *strndup(const char *s, size_t len);
#endif /* strndup is available */
/* strcasestr is available for _GNU_SOURCE, BSD and some Apple */
-#if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) || (defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) || defined(_NETBSD_SOURCE)
+#if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) || (defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) || defined(_NETBSD_SOURCE) || defined(__OpenBSD__)

5
games/openttd/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.20 2014/08/22 02:32:26 bentley Exp $
@comment $OpenBSD: PLIST,v 1.21 2015/04/15 01:39:16 bentley Exp $
@bin bin/openttd
@man man/man6/openttd.6
share/applications/openttd.desktop
@ -54,6 +54,7 @@ share/openttd/ai/compat_1.1.nut
share/openttd/ai/compat_1.2.nut
share/openttd/ai/compat_1.3.nut
share/openttd/ai/compat_1.4.nut
share/openttd/ai/compat_1.5.nut
share/openttd/baseset/
share/openttd/baseset/no_music.obm
share/openttd/baseset/no_sound.obs
@ -140,6 +141,7 @@ share/openttd/lang/irish.lng
share/openttd/lang/italian.lng
share/openttd/lang/japanese.lng
share/openttd/lang/korean.lng
share/openttd/lang/latin.lng
share/openttd/lang/latvian.lng
share/openttd/lang/lithuanian.lng
share/openttd/lang/luxembourgish.lng
@ -205,6 +207,7 @@ share/openttd/media/extra_grf/oneway.png
share/openttd/media/extra_grf/openttd.nfo
share/openttd/media/extra_grf/openttdgui.nfo
share/openttd/media/extra_grf/openttdgui.png
share/openttd/media/extra_grf/palette.nfo
share/openttd/media/extra_grf/rivers/
share/openttd/media/extra_grf/rivers/arctic.nfo
share/openttd/media/extra_grf/rivers/arctic_brown.png