diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild index c18f120fff..c99b5f3b83 100644 --- a/games/openttd/openttd.SlackBuild +++ b/games/openttd/openttd.SlackBuild @@ -24,11 +24,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openttd -VERSION=${VERSION:-1.4.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.5.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -OPENGFX=0.5.0 +OPENGFX=0.5.2 OPENSFX=0.2.3 OPENMSX=0.3.1 @@ -87,8 +87,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p0 < $CWD/openttd.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/games/openttd/openttd.info b/games/openttd/openttd.info index dfe41428c0..6b1adbb2f2 100644 --- a/games/openttd/openttd.info +++ b/games/openttd/openttd.info @@ -1,12 +1,12 @@ PRGNAM="openttd" -VERSION="1.4.4" +VERSION="1.5.1" HOMEPAGE="http://www.openttd.org" -DOWNLOAD="http://binaries.openttd.org/releases/1.4.4/openttd-1.4.4-source.tar.xz \ - http://binaries.openttd.org/extra/opengfx/0.5.0/opengfx-0.5.0-all.zip \ +DOWNLOAD="http://binaries.openttd.org/releases/1.5.1/openttd-1.5.1-source.tar.xz \ + http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip \ http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip \ http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip" -MD5SUM="428251bb66a395b76d530ebe1c71697e \ - f2ca3f1b23e360264940913ad42f3d9a \ +MD5SUM="f4676d2fef2fa6ec401b328a780e9d29 \ + e64352d0578822c6e5388b631b3086f7 \ 858b79d44aea6de5e15d9d1439e86cc3 \ 3605b82f24153500c8a1804e4420168a" DOWNLOAD_x86_64="" diff --git a/games/openttd/openttd.patch b/games/openttd/openttd.patch deleted file mode 100644 index 437d5230b5..0000000000 --- a/games/openttd/openttd.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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");