From 68f727fd72375b88726d549fc483deac980fb704 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 25 Apr 2019 15:55:07 +0000 Subject: openttd: updated to 1.9.1 1.9.1: - Fix 6564: Enforce types of arguments for station name strings - Fix 7433: Don't use AirportSpec substitute if it's not enabled - Fix 7447, 7466, 7476: Missing NewGRF strings due to Action 4 feature check skipping pseudo-feature 48 - Fix 6222: Advanced sprite layout sometimes showed incorrect railtype ground tile. - Fix 7439: CompanyRemoveReason overwritten by ClientID - Fix: [Windows] Incorrect error handling could lead to cascading error windows - Fix 7478: Don't remove NewGRF objects on company take-over. 1.9.0: - Fix 7411: Use industry production callback (if used) on initial industry cargo generation 1.9.0-RC2: - Fix 7400: WaterClass for tree tiles was not converted for old saves preventing industry creation - Fix: Filtered file list did not scroll properly - Fix 7391: Don't invalidate go to depot orders of non-aircraft when invalidating hangar orders that happen to share IDs - Fix 7386: Measurement tooltip for tunnels, aqueducts & docks did not display or flickered - Fix: Wrong company performance rating when money exceeds INT_MAX - Fix: Permit loading of industry production callback with invalid cargo type - Fix: Spelling for a few real town names - Fix: Runway too short for large aircraft message should not depend on plane crashes setting - Fix 7334: Ship lost after crossing bridge due to path cache not being consumed while on final bridge end 1.9.0-RC1: - Add: Various AI/GS functions for vehicle groups - Change: Synchronise introduction date and reliability randomness across vehicles with the same base introduction date - Change: Allow towns to build bridges over rails and one-way roads - Fix: Detection of coast tiles with trees on them - Fix: Emergency netsave saved the title game instead of the broken game in question - Fix: Company livery window showed incorrect groups when opened in multiplayer - Fix: Unable to select last group in open livery window - Fix: Goto hangar orders were not invalidated when rebuilding airports 1.9.0-beta3: - Feature: Option to adjust font size separately from GUI size - Feature: Increase maximum number of orders from 64000 to ~16.7m - Add: Show performance of AI and GS in framerate window - Add: News menu entry and shortcut for deleting all messages - Change: [OSX] Improved scrolling behaviour when using touchpads - Change: Add scrollbar to cargo legend in cargo payment rates window - Change: Owner of vehicle with exclusive transport rights may now load cargo from neutral stations - Change: Improved UI behaviour when dragging sound volume sliders with the mouse - Change: Use selected vehicle group as parent when creating a new group - Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating - Change: Skip reliability decay if servicing is disabled - Fix: Remove desert around lakes upon generation - Fix: Re-sorting file list did not update filtered rows - Fix 7159: Waiting time at red one-way signals was too short - Fix 7189: Fluidsynth volume gain too high - Fix 7004: Cargo flow legend was not properly refreshed after zooming - Fix: Possibility to modify wrong AI/GS settings when switching AI/GS scripts around - Fix: Use more descriptive "spectator" strings for story book and goal dropdown menus - Fix 6599: Disable build and rename button in build vehicle window when no vehicle is selected - Fix: Do not mangle tagged revision strings for network revision strings - Fix 7151: AI start date deviation was still applied when not set to a random AI - Fix 7197: Invalidate depot buttons when necessary - Doc: [AI] UnshareOrders empties the orders list of the vehicle 1.9.0-beta2: - Fix: Non-Windows builds did not get correct git hash 1.9.0-beta1: Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbers have been replaced with Pull Requests and Issue numbers - Feature: Group liveries, and livery window usability enhancements - Feature: Overhaul of music system, support MPSMIDI music files (TTD DOS/TTO) - Feature: [Win32] Rewritten DMusic and WinMM music drivers - Feature: [Win32] New XAudio2 sound driver - Feature: [Linux] New Fluidsynth music driver - Feature: Framerate display window - Feature: [NewGRF] Ability for industries & houses to produce and/or accept up to 16 different cargoes - Feature 6610: Allow towns to build houses on road turns - Feature: Replace independent map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling - Feature 6459: API for querying network clients from GS - Feature: New Russian Ruble & Mexican Peso as currencies - Feature 4186: Append '(City)' after city names in the town directory - Feature 986: Automatic save when losing connection to a network game - Add: [NewGRF] Flag to hide rail types from construction - Add: [NewGRF] Airport animation trigger for plane landing - Add 4115: Default starting company colour setting - Add: Mixer feature for streaming sampled music - Add 6460: [AI] start_date parameter for Random AIs on new game - Add: BACKSPACE can be mapped as a hotkey - Add: 32bpp SSE2 blitter palette animator - Change: Make ships turn slowly when changing direction and stop when going up or down a lock - Change: Improve ship pathfinder performance - Change: Decouple GUI timing from game ticks - Change: Desert tiles are now half-desert if a neighboured tile is non-desert or sea/coast - Change: Gradually slow down aircraft speed on breakdown - Change: [NewGRF] Increase rail type & cargo type limits to 64 - Change: [NewGRF] Increase size of persistent storage to 256 - Change: [NewGRF] Use last OpenTTD SVN revision in NewGRF version number - Change: Clone tool in depot window now behaves like clone button in vehicle window - Change 6397: Keep town growth rate in sync with house count - Change: Scale default FreeType font size selection by UI zoom level - Change: [OSX] Reversed pinch to zoom behaviour - Change: Switch town growth rate and counter to actual game ticks - Change: Non-tag revisions are now named '--g' - Change: Rewrite several bits of documentation in markdown - Fix: Reinitialise graph GUI on game restart - Fix: Potential crash during shutdown after unpacking downloaded content - Fix 6584: Text layout in engine preview dialogue - Fix 6636: Airplanes could be sent to helicopter station depots - Fix: Deadlock when launched with -n switch - Fix: Various corrections to town names in non-English languages - Fix: Only consider airport tiles when placing (for non-rectangular airports) - Fix: Spelling fixes on some Latin American town names - Fix 7001: Pathfinders should see standard road stations as tiles where to reverse - Fix 6676: Prevent helicopters from stopping in midair during some kinds of landing - Fix: Remove need to use Ctrl+Click when building stations next to competitors - Fix: [NewGRF] Make VA2 operator 11 (ror) behave well-defined when rotating by 0 bits - Fix 4109: Add more water checks to the Oil Rig layout - Fix 6938: Incorrect value for "Cost to Clear" was displayed for Company Headquarters in tile inspector - Fix 6920: Make 9.8m/s^2 a common constant for TE-calculation - Fix 6892: [Script] CONFIG_RANDOM did not use the full parameter range - Fix 6622: News message when GS constructs a town had empty company name - Fix: [NewGRF] Action7 variable 0x85 had no bounds checks - Fix 6875: Depot building cost did not include foundation build cost - Fix: Some pixels in ship autoreplace icon (sprite 106) were transparent - Fix: Poor contrast in cargo dest flow legend window cargo labels - Fix 6553: Make viewport button text unambiguous - Fix: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom - Fix 6969: Account for BOM when reading script files - Fix 6898: Ability to use seeds above INT_MAX - Fix 6659: Bus stations could be demolished when not in demolish mode - Fix: One-way roads could be over-built by road stops regardless of road owner - Fix: Use name of cargo instead of Passengers/Mail in town statistics - Fix: Prevent ships moving into docks after finishing (un)loading - Fix: Tractive effort was slightly too high as per NewGRF spec - Fix 6465: Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings - Fix: Four group action icons were misplaced and cropped - Remove: PSP, WinCE support --- games/openttd/Makefile | 10 +++------- games/openttd/PLIST | 8 ++++++-- games/openttd/distinfo | 14 ++++++-------- games/openttd/patches/patch-config.lib | 16 ++++++++-------- games/openttd/patches/patch-src_language.h | 16 ---------------- games/openttd/patches/patch-src_strings.cpp | 25 ------------------------- 6 files changed, 23 insertions(+), 66 deletions(-) delete mode 100644 games/openttd/patches/patch-src_language.h delete mode 100644 games/openttd/patches/patch-src_strings.cpp (limited to 'games') diff --git a/games/openttd/Makefile b/games/openttd/Makefile index cb819caa12d..6e333fc61e8 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.76 2019/04/03 00:32:43 ryoon Exp $ +# $NetBSD: Makefile,v 1.77 2019/04/25 15:55:07 adam Exp $ -DISTNAME= openttd-1.8.0-source +DISTNAME= openttd-1.9.1-source PKGNAME= ${DISTNAME:S/-source//} -PKGREVISION= 3 CATEGORIES= games x11 -MASTER_SITES= http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/ +MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org @@ -29,9 +28,6 @@ CONFIGURE_ARGS+= --man-dir=${PKGMANDIR}/man6 CONFIGURE_ARGS+= --menu-dir=share/applications CONFIGURE_ARGS+= --personal-dir=.openttd 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 diff --git a/games/openttd/PLIST b/games/openttd/PLIST index 16692a1f7fa..9e5899c0b23 100644 --- a/games/openttd/PLIST +++ b/games/openttd/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.24 2018/07/07 11:57:33 adam Exp $ +@comment $NetBSD: PLIST,v 1.25 2019/04/25 15:55:07 adam Exp $ bin/openttd man/man6/openttd.6 share/applications/openttd.desktop share/doc/openttd/COPYING +share/doc/openttd/README.md share/doc/openttd/changelog.txt share/doc/openttd/known-bugs.txt share/doc/openttd/multiplayer.txt -share/doc/openttd/readme.txt share/icons/hicolor/128x128/apps/openttd.png share/icons/hicolor/16x16/apps/openttd.png share/icons/hicolor/256x256/apps/openttd.png @@ -23,14 +23,17 @@ share/openttd/ai/compat_1.5.nut share/openttd/ai/compat_1.6.nut share/openttd/ai/compat_1.7.nut share/openttd/ai/compat_1.8.nut +share/openttd/ai/compat_1.9.nut share/openttd/baseset/no_music.obm share/openttd/baseset/no_sound.obs share/openttd/baseset/openttd.grf share/openttd/baseset/opntitle.dat share/openttd/baseset/orig_dos.obg +share/openttd/baseset/orig_dos.obm share/openttd/baseset/orig_dos.obs share/openttd/baseset/orig_dos_de.obg share/openttd/baseset/orig_extra.grf +share/openttd/baseset/orig_tto.obm share/openttd/baseset/orig_win.obg share/openttd/baseset/orig_win.obm share/openttd/baseset/orig_win.obs @@ -41,6 +44,7 @@ share/openttd/game/compat_1.5.nut share/openttd/game/compat_1.6.nut share/openttd/game/compat_1.7.nut share/openttd/game/compat_1.8.nut +share/openttd/game/compat_1.9.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 527d259e710..b1722b4735f 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.29 2018/07/07 11:57:33 adam Exp $ +$NetBSD: distinfo,v 1.30 2019/04/25 15:55:07 adam Exp $ -SHA1 (openttd-1.8.0-source.tar.xz) = fd6c90f04c4cbd626751acb9bf8a47a9f2b31520 -RMD160 (openttd-1.8.0-source.tar.xz) = a607e955189561cc980dffc50dec57fc9ea9b9fb -SHA512 (openttd-1.8.0-source.tar.xz) = a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a -Size (openttd-1.8.0-source.tar.xz) = 6521016 bytes -SHA1 (patch-config.lib) = 4d3d7d9cc917163c728a51c17efa7f6b2e100913 +SHA1 (openttd-1.9.1-source.tar.xz) = e99c02b6b895001dfa7541796e7cda5dfc74d04f +RMD160 (openttd-1.9.1-source.tar.xz) = ed38041dab371954ed72c573cf058357b22e96b0 +SHA512 (openttd-1.9.1-source.tar.xz) = 44d907299a14fd09ebff980f7c212bbdbd5def880bc56bfe106c3efa8cb32472bbcafdbb145d3f4340a3bc96179418f78fe2ddc62dd067b464eca73313b477c1 +Size (openttd-1.9.1-source.tar.xz) = 6647548 bytes +SHA1 (patch-config.lib) = 297caf33c50298a4efcbddbe3fea88e2b4f101c1 SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1 -SHA1 (patch-src_language.h) = 162b798adb6a78172f2191633f44c7e59506f129 -SHA1 (patch-src_strings.cpp) = 75dd2a6672fa0b49ae724820f899f8b7f9260a56 diff --git a/games/openttd/patches/patch-config.lib b/games/openttd/patches/patch-config.lib index e170ee412d3..0c1579e7571 100644 --- a/games/openttd/patches/patch-config.lib +++ b/games/openttd/patches/patch-config.lib @@ -1,12 +1,12 @@ -$NetBSD: patch-config.lib,v 1.1 2017/06/28 18:18:36 adam Exp $ +$NetBSD: patch-config.lib,v 1.2 2019/04/25 15:55:07 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 2017-06-13 18:35:00.000000000 +0000 +--- config.lib.orig 2019-04-08 19:42:35.000000000 +0000 +++ config.lib -@@ -2095,7 +2095,7 @@ check_strip() { +@@ -2140,7 +2140,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 @@ -15,7 +15,7 @@ On Darwin, be able to locate iconv.h inside the SDK. check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test" rm -f strip.test.c strip.test else -@@ -2601,7 +2601,7 @@ detect_library() { +@@ -2676,7 +2676,7 @@ detect_library() { if [ -z "$res" ]; then log 2 " trying /opt/local/include/$4$5... no" fi @@ -24,10 +24,10 @@ On Darwin, be able to locate iconv.h inside the SDK. 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 +@@ -2926,6 +2926,9 @@ detect_iconv() { + break + fi + done + if [ -z "$iconv" ] && [ "$os" = "OSX" ]; then + iconv=`xcrun --show-sdk-path`/usr/include/iconv.h + fi diff --git a/games/openttd/patches/patch-src_language.h b/games/openttd/patches/patch-src_language.h deleted file mode 100644 index 6333fef1b56..00000000000 --- a/games/openttd/patches/patch-src_language.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_language.h,v 1.1 2018/07/07 11:57:34 adam Exp $ - -Fix for ICU 61. -https://github.com/OpenTTD/OpenTTD/issues/6690 - ---- src/language.h.orig 2018-07-07 11:12:28.000000000 +0000 -+++ src/language.h -@@ -105,7 +105,7 @@ extern LanguageList _languages; - extern const LanguageMetadata *_current_language; - - #ifdef WITH_ICU_SORT --extern Collator *_current_collator; -+extern icu::Collator *_current_collator; - #endif /* WITH_ICU_SORT */ - - bool ReadLanguagePack(const LanguageMetadata *lang); diff --git a/games/openttd/patches/patch-src_strings.cpp b/games/openttd/patches/patch-src_strings.cpp deleted file mode 100644 index 5e02e19c0b8..00000000000 --- a/games/openttd/patches/patch-src_strings.cpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-src_strings.cpp,v 1.1 2018/07/07 11:57:34 adam Exp $ - -Fix for ICU 61. -https://github.com/OpenTTD/OpenTTD/issues/6690 - ---- src/strings.cpp.orig 2018-07-07 11:13:01.000000000 +0000 -+++ src/strings.cpp -@@ -52,7 +52,7 @@ const LanguageMetadata *_current_languag - TextDirection _current_text_dir; ///< Text direction of the currently selected language. - - #ifdef WITH_ICU_SORT --Collator *_current_collator = NULL; ///< Collator for the language currently in use. -+icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use. - #endif /* WITH_ICU_SORT */ - - static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. -@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMeta - - /* Create a collator instance for our current locale. */ - UErrorCode status = U_ZERO_ERROR; -- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status); -+ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status); - /* Sort number substrings by their numerical value. */ - if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); - /* Avoid using the collator if it is not correctly set. */ -- cgit v1.2.3