diff options
author | adam <adam@pkgsrc.org> | 2017-06-28 18:18:36 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2017-06-28 18:18:36 +0000 |
commit | 26684fc34cc876a6142f05f640cd948e11a53aa1 (patch) | |
tree | b0cf0aacec7752735cf70388f0681722d3c64362 /games | |
parent | 5eec3f504d47c54d37564f86cc898fcb2049bb80 (diff) | |
download | pkgsrc-26684fc34cc876a6142f05f640cd948e11a53aa1.tar.gz |
1.7.1:
- Fix: Add missing game script event for ships arriving at a station [FS-6560] (r27859, r27858)
- Fix: StringID truncation to 16 bits broke string remapping test [FS-6555] (r27851)
- Fix: Infinite loop in pathfinder when checking safe waiting position from a waypoint [FS-5926] (r27846)
- Fix: [YAPF] Consider depot as destination before reversing path and applying penalty (r27843)
- Fix: Don't consider locks or ship depots as clear water when placing industries (r27841)
- Fix: Small news window's fake caption was not sized to fit its text (r27838)
- Fix: Black remap did nothing in 8bpp-simple blitter (r27837)
- Fix: Misaligned resize icon due to widget bounds being inclusive (r27831)
- Fix: Update viewport sign dimensions when changing GUI zoom level (r27827, r27819)
- Fix: Vehicle viewport is not user scrollable so flag window as such (r27823)
- Fix: Allow dropdown to be drawn above origin widget even with scrollbar (r27820)
- Fix: 32bpp-anim blitters assumed that pitch and width of the screen were equal [FS-6545] (r27796)
- Fix: Chat text background overflowed due to missing padding [FS-6526] (r27794)
- Fix: Failed to load lzo compressed savegames sometimes [FS-6450] (r27793)
- Fix: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input [FS-6366] (r27791, r27790)
- Fix: [NewGRF] Get vehicle load amount after executing new cargo trigger [FS-6536] (r27788)
- Fix: AI configuration changed incorrect parameter when some parameters are hidden [FS-6479] (r27787, r27786)
- Fix: Buoys not always drawn after being placed depending on zoom level [FS-6508] (r27785)
- Fix: Allow rail conversion even if ship is on tile [FS-6505] (r27784)
Diffstat (limited to 'games')
-rw-r--r-- | games/openttd/Makefile | 7 | ||||
-rw-r--r-- | games/openttd/PLIST | 5 | ||||
-rw-r--r-- | games/openttd/distinfo | 13 | ||||
-rw-r--r-- | games/openttd/patches/patch-config.lib (renamed from games/openttd/patches/patch-aa) | 19 | ||||
-rw-r--r-- | games/openttd/patches/patch-src_core_alloc__func.hpp | 21 |
5 files changed, 51 insertions, 14 deletions
diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 759b510947e..49db9e9564d 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2017/04/22 21:03:36 adam Exp $ +# $NetBSD: Makefile,v 1.67 2017/06/28 18:18:36 adam Exp $ -DISTNAME= openttd-1.6.1-source +DISTNAME= openttd-1.7.1-source PKGNAME= ${DISTNAME:S/-source//} -PKGREVISION= 1 CATEGORIES= games x11 MASTER_SITES= http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz @@ -32,6 +31,7 @@ CONFIGURE_ARGS+= --shared-dir=${VARBASE}/games/openttd # Hack: built-in xz does not provide liblzma.pc, needed to configure PREFER_PKGSRC+= xz +CONFIGURE_ARGS+= --with-iconv CONFIGURE_ARGS+= --with-lzo2=${BUILDLINK_PREFIX.lzo}/lib .include "../../mk/bsd.prefs.mk" @@ -49,6 +49,7 @@ CONFIGURE_ARGS+= --without-osx-sysroot .include "../../archivers/lzo/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/games/openttd/PLIST b/games/openttd/PLIST index f88ee2c91b1..b9448f9d5a2 100644 --- a/games/openttd/PLIST +++ b/games/openttd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2016/12/18 21:01:41 tnn Exp $ +@comment $NetBSD: PLIST,v 1.23 2017/06/28 18:18:36 adam Exp $ bin/openttd man/man6/openttd.6 share/applications/openttd.desktop @@ -21,6 +21,7 @@ share/openttd/ai/compat_1.3.nut share/openttd/ai/compat_1.4.nut share/openttd/ai/compat_1.5.nut share/openttd/ai/compat_1.6.nut +share/openttd/ai/compat_1.7.nut share/openttd/baseset/no_music.obm share/openttd/baseset/no_sound.obs share/openttd/baseset/openttd.grf @@ -28,6 +29,7 @@ share/openttd/baseset/opntitle.dat share/openttd/baseset/orig_dos.obg share/openttd/baseset/orig_dos.obs share/openttd/baseset/orig_dos_de.obg +share/openttd/baseset/orig_extra.grf share/openttd/baseset/orig_win.obg share/openttd/baseset/orig_win.obm share/openttd/baseset/orig_win.obs @@ -36,6 +38,7 @@ share/openttd/game/compat_1.3.nut share/openttd/game/compat_1.4.nut share/openttd/game/compat_1.5.nut share/openttd/game/compat_1.6.nut +share/openttd/game/compat_1.7.nut share/openttd/lang/afrikaans.lng share/openttd/lang/arabic_egypt.lng share/openttd/lang/basque.lng diff --git a/games/openttd/distinfo b/games/openttd/distinfo index fe3ec1bdab2..e84c3869433 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.27 2016/12/18 21:01:41 tnn Exp $ +$NetBSD: distinfo,v 1.28 2017/06/28 18:18:36 adam Exp $ -SHA1 (openttd-1.6.1-source.tar.xz) = 79b5c5b26a7e6890f33ce213a706a5efddfdb0c4 -RMD160 (openttd-1.6.1-source.tar.xz) = 8f96756463830f170993a670b4d060ad0a6724a9 -SHA512 (openttd-1.6.1-source.tar.xz) = e0677c311e6567d130c1affc13c11fd81a742b588ee77e062a8f5816063b3da62fc2bc54eca4f243268266254358b06d9fea05f997468a33f201065e4ef4691a -Size (openttd-1.6.1-source.tar.xz) = 6584564 bytes -SHA1 (patch-aa) = f9c9291ec5414e239d53e110e54aac83b926af8a +SHA1 (openttd-1.7.1-source.tar.xz) = a24a2a33cefd8d192fd4f6584f142a4b9d10338b +RMD160 (openttd-1.7.1-source.tar.xz) = 7ed0fc3b1c62cdcc11093c3fe3945b7a8fd0f292 +SHA512 (openttd-1.7.1-source.tar.xz) = ac3115538174801dc14f63065408e31ef9f60fe4a695d382bdccdd82c547d36e358c2109031289bd19114810a9db6add2662aa09e868ca40ea87ae500b7bca02 +Size (openttd-1.7.1-source.tar.xz) = 6517328 bytes +SHA1 (patch-config.lib) = 4d3d7d9cc917163c728a51c17efa7f6b2e100913 +SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1 diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-config.lib index 4250c41972d..e170ee412d3 100644 --- a/games/openttd/patches/patch-aa +++ b/games/openttd/patches/patch-config.lib @@ -1,11 +1,12 @@ -$NetBSD: patch-aa,v 1.12 2015/07/03 12:37:44 wiz Exp $ +$NetBSD: patch-config.lib,v 1.1 2017/06/28 18:18:36 adam Exp $ Compile 'strip' test with CFLAGS, so -isysroot can be passed on OSX. Correct library detection on NetBSD. +On Darwin, be able to locate iconv.h inside the SDK. ---- config.lib.orig 2015-06-01 18:43:32.000000000 +0000 +--- config.lib.orig 2017-06-13 18:35:00.000000000 +0000 +++ config.lib -@@ -2070,7 +2070,7 @@ check_strip() { +@@ -2095,7 +2095,7 @@ check_strip() { elif [ "$os" = "OSX" ]; then # Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something echo "int main(int argc, char *argv[]) { }" > strip.test.c @@ -14,7 +15,7 @@ Correct library detection on NetBSD. check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test" rm -f strip.test.c strip.test else -@@ -2628,7 +2628,7 @@ detect_library() { +@@ -2601,7 +2601,7 @@ detect_library() { if [ -z "$res" ]; then log 2 " trying /opt/local/include/$4$5... no" fi @@ -23,3 +24,13 @@ Correct library detection on NetBSD. eval "$2=`ls -1 /usr/pkg/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" eval "res=\$$2" if [ -z "$res" ]; then +@@ -2873,6 +2873,9 @@ detect_iconv() { + if [ -z "$iconv" ]; then + iconv=`ls -1 /usr/local/include 2>/dev/null | grep "iconv.h"` + fi ++ if [ -z "$iconv" ] && [ "$os" = "OSX" ]; then ++ iconv=`xcrun --show-sdk-path`/usr/include/iconv.h ++ fi + else + # Make sure it exists + iconv=`ls $with_iconv/include/iconv.h 2>/dev/null` diff --git a/games/openttd/patches/patch-src_core_alloc__func.hpp b/games/openttd/patches/patch-src_core_alloc__func.hpp new file mode 100644 index 00000000000..18f1f73e11c --- /dev/null +++ b/games/openttd/patches/patch-src_core_alloc__func.hpp @@ -0,0 +1,21 @@ +$NetBSD: patch-src_core_alloc__func.hpp,v 1.1 2017/06/28 18:18:36 adam Exp $ + +Prefer built-in alloca() to avoid crashes. + +--- src/core/alloc_func.hpp.orig 2017-06-26 13:04:45.346333800 +0000 ++++ src/core/alloc_func.hpp +@@ -131,8 +131,14 @@ static inline T *ReallocT(T *t_ptr, size + } + + /** alloca() has to be called in the parent function, so define AllocaM() as a macro */ ++#ifdef __GNUC__ ++#define AllocaM(T, num_elements) \ ++ (CheckAllocationConstraints<T>(num_elements), \ ++ (T*)__builtin_alloca((num_elements) * sizeof(T))) ++#else + #define AllocaM(T, num_elements) \ + (CheckAllocationConstraints<T>(num_elements), \ + (T*)alloca((num_elements) * sizeof(T))) ++#endif + + #endif /* ALLOC_FUNC_HPP */ |