pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/openttd openttd: update to 1.11.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/fed2e54b4ba8
branches: trunk
changeset: 452021:fed2e54b4ba8
user: nia <nia%pkgsrc.org@localhost>
date: Tue May 04 17:08:05 2021 +0000
description:
openttd: update to 1.11.2
1.11.2 (2021-05-03)
------------------------------------------------------------------------
Change: More improvements to the GUI at different scales (#9075, #9102, #9107, #9133, #9174, #9183)
Fix: Query windows could be partially drawn (#9184)
Fix #9113: Crash when removing an airport that exists in an aircraft's orders (#9182)
Fix #9117: [Fluidsynth] Hang when changing song (#9181)
Fix: String validation could leave invalid UTF-8 encoded strings (#9096)
Fix: [Network] Out-of-bounds memory access with modified servers sending too short password salts (#9176)
Fix: Crash when extra viewport with zero height has sign in view (#9175)
Fix #9147: Crash when taking screenshots (#9169)
Fix #6598: [Network] Prevent crashes when (re)joining network game by falling back to main menu first (#9163)
Fix #9152: Screenshot success popup window was treated as an error (#9159)
Fix: Fast-forward stuttering when vsync is enabled (#9140)
Fix: [Network] Savegame transfer could stall in rare cases (#9106)
Fix #9097: [NewGRF] Cargo initial payment variable was being truncated (#9098)
Fix: [NewGRF] Industry variable 66 and object variable 46 erroneously truncated the distance (#9088)
Fix: [NewGRF] Industry variables 65 and 66 ignored the parameter, and always used the north tile (#9088)
Fix: Do not include regression test AI in bundle (#9068, #9164)
1.11.1 (2021-04-18)
------------------------------------------------------------------------
Feature: Toggle to enable/disable vsync (#8997)
Feature: Volume controls in the Game Options window, and better defaults (#8943)
Add: Hotkey to focus object and rail filters (#8908)
Add: Better plural support for Romanian (#8936)
Change: Improve layout and spacing of several windows at different GUI scales (#9041, #9042, #9044, #9050)
Change: Make effect volume scale more intuitively (#8945, #8950)
Change: Improve padding of Object & Rail station windows (#8929)
Fix #6322: [Script] Crash when script allocates too much memory, now kills script instead (#9047)
Fix #7513: [Script] Crash on garbage collection with misbehaving script (#9040)
Fix #9028: [OpenGL] Crash when changing max sprite zoom level (#9032)
Fix #8874: show a warning when a NewGRF scan is requested multiple times (#9022)
Fix: Desync when GS unlocks railtype with wagon unlock (#9021)
Fix #9008: Validate starting year given on the command line (-t) (#9014)
Fix #8878: [Network] Slow DNS queries could block the server and disconnect clients (#9013)
Fix: Improve validation of OpenGL video driver to avoid crashes (#9007)
Fix: Credits scrolled too slowly with larger font sizes (#8994)
Fix #8977: Crash when altering max sprite resolution (#8993)
Fix #8956: Industry disaster news messages showed the wrong location (#8992)
Fix: [Network] Potential stale client entries in client list (#8959)
Fix: Graphical issues when dragging measurement tooltips (#8951)
Fix: [Fluidsynth] Use provided default soundfont if available (#8948, #8953)
Fix #8935: [macOS] Crash on save (#8944)
Fix #8922: Crash when selling shared vehicles with shared vehicle window open (#8926)
Fix: Compiling on armhf (Raspberry Pi) (#8924)
1.11.0 (2021-04-01)
------------------------------------------------------------------------
Feature: Allow setting a custom terrain type to define highest peak (#8891)
Feature: Auto-detect map height limit based on generated map (#8891)
Feature: Setting to indicate desert coverage for tropic climate and snow coverage for arctic climate (replaces snow line height) (#8891)
Add: Allow setting the highest mountain for heightmaps (#8891)
Change: Scale exported heightmaps to highest peak and inform the user of this value (#8891)
Change: Remove "maximum map height" from the New Game GUI (#8891)
Fix #8803: Only auto-remove signals when rail can be built (#8904)
Fix #8565: Stopped road vehicle displays a speed different than 0 (#8901)
Fix #8886: Don't try to resolve folders within tars named '.' (#8893)
Fix: Placing random trees in SE crashes the game (#8892)
Fix #8875: Filter string in station window breaks flow in user interface (#8885)
Fix #8871: [OpenGL] Initialize all buffers after resize and clear back buffer (#8877)
Fix: OpenGL performance with some AMD GPUs (#8876)
Fix: Recompute road/railtype availability after disabling the engine (#8872)
Fix: OSK layout not scaled for 2x or 4x GUI scale (#8868)
1.11.0-RC1 (2021-03-14)
------------------------------------------------------------------------
Feature: Option to (dis-)allow hardware accelerated video drivers (#8819)
Feature: Option to set display refresh rate (#8813)
Feature: Allow custom width/height of screenshot and making heightmap screenshots via console (#8804)
Feature: Allow filtering on name in rail station window (#8706)
Feature: Setting for highest resolution of sprites to use (#8604)
Add: Make NewGRF Scanner / World Generation update smoother and make aborting it react faster (#8830)
Add: Malaysia Ringgit as Currency (#8783)
Add: "Engines only" filter in build train window (#8733)
Change: De-limit framerate window's framerate (#8772)
Change: Clarify what effect town interactions have (#8744)
Change: Don't show global goals in company goal windows (#8709)
Change: Recolour graph windows to brown (#8700)
Fix #8855: Bootstrap could result in an empty screen when bootstrap fails (#8856)
Fix #8851: Don't allow infinite "exec" depth in script, but limit to 10 deep (#8852)
Fix #8647: Incorrect drawing order of tram catenary sprites (#8843)
Fix #8711: Having gui_zoom lower than zoom_min causes a crash (#8835)
Fix #8810: "aircraft out of fuel" news shows the wrong place (#8832)
Fix #8833: Don't reload NewGRFs when we are shutting down (#8830)
Fix: Scale padding between elements the same as other padding (#8829)
Fix #8808: [OSX, OpenGL] Crash on switching blitters due to double-mapping the video buffer (#8822)
Fix #8784: Using Alt+Enter doesn't update the fullscreen toggle visibly (#8820)
Fix #8817: Keep NewGRF order for object class sorting (#8818)
Fix #8809: Crash when removing airport when hangar window open (#8815)
Fix #8799: Crash when Search Internet in Multiplayer (#8801)
Fix #8774: Black screenshots when using 40bpp-blitter (#8791)
Fix: [OSX] Hide dock when entering fullscreen (#8789)
Fix: Bootstrap fails to start on clean install (#8788)
Fix: Terraform limit acts random when maxing out per_64k_frames setting (#8782)
Fix: Max-value of fast-forward-speed-limit can be outside its storage size (#8769)
1.11.0-beta2 (2021-02-28)
------------------------------------------------------------------------
Feature: Add setting to limit fast-forward speed (#8766)
Feature: Significant performance improvements to all video drivers (#8605, #8652, #8660, #8685, #8702, #8703, #8707, #8726, #8740)
Feature: Configurable display refresh-rate, default to 60fps (#8680)
Feature: Automatically upload releases to Steam (#8644)
Feature: Generic Linux builds (#8641)
Feature: [GS] Allow non-question type windows to have no buttons (#8638)
Feature: [macOS] ZIP build (#8614)
Feature: Object class selection string filtering (#8603)
Feature: 'Remove all industries' button in scenario editor (#8550)
Feature: Automatic UI and font zoom levels when supported by the OS (#8537)
Feature: [macOS] Render screen at native resolution by default for HiDPI screens (#8519)
Feature: OpenGL video driver (#7744)
Add: Indonesia Rupiah currency (#8616)
Change: Improve graph period markings (#8732)
Change: Make pathfinder account for maximum order speed, if set (#8722)
Change: Darken graph grid lines for legibility (#8690)
Change: Make order window hotkeys toggle for load & unload variants (#8669)
Change: Use a more specific error message when attempting to bulldoze your own HQ (#8667)
Change: Convert .md to .rtf for Windows/Mac packages (#8617)
Change: Move the 'tree placer algorithm' & 'road drive side' settings to the Settings window (#8566)
Change: Move town name generator selection to mapgen GUI (#8566)
Change: [macOS] Native font rendering (#8518)
Fix: Display of network lobby windows for different GUI sizes (#8765)
Fix: Don't desync if client leaves before you finish downloading map (#8755)
Fix: Allow estimating vehicle clone cost even if short on money (#8748)
Fix: Don't notify twice that a client left because of a timeout (#8746)
Fix: Vehicle cursor size did not account for the interface zoom level (#8739)
Fix #8123: Trams on half-tiles couldn't find depots (#8738)
Fix #8276: [NewGRF] Crash when an object's size was not set (#8719)
Fix #8349: Close depot vehicle list windows when closing the depot window (#8717)
Fix #8594: [NRT] Road pathfinder did not account for roadtype speed limits or lengths of tunnels/bridges (#8710)
Fix: Whole status bar instead of money widget refreshed on money change (#8692)
Fix: Unnecessary status bar redraws when there is no news to show (#8691)
Fix: New orders are non-stop by default (#8689)
Fix: Framerate window showed a slightly higher rate than actually measured (#8682)
Fix: Autorenew failure advice due to bad refit being shown to all companies (#8681)
Fix #8625: Wrong ending year was displayed in highscore table (#8672)
Fix #8620: Scale spacing between date & news in history window according to font scaling (#8671)
Fix: Mention our websites with https:// (instead of http://) (#8657)
Fix: Don't crash when towns upgrade road tiles during expansion (#8651)
Fix #8029: [SDL2] Blank display when under Wayland (#8648)
Fix: Default Network Server List sorter put compatible servers in wrong order (#8626)
Fix: Use non-pulsating red highlight for coverage (#8622)
Fix: Center text and image in vehicle statusbar vertically (#8602)
Fix: Don't walk out of the map when trying to build tunnels (#8600)
Fix: Off-by-one error in desert/rainforest positioning at world gen (#8588)
Fix #8037: Crash when restarting AI that is controlling the same company as the player (#8587)
Fix: Stopped ships shouldn't block depots (#8578)
1.11.0-beta1 (2021-01-22)
------------------------------------------------------------------------
Feature: [GS] Ability to set some extra text in the industry window (#8576)
Feature: Show rainforest under vegetation on smallmap (#8562)
Feature: Automatically determine window size on new install (#8536)
Feature: Towns can build tunnels (#8473)
Feature: Make maximum length of town bridges depend on population (with a minimum limit of 4) (#8439)
Feature: New icons for renaming and go-to-location on GUI windows, and improve consistency of usage (#8455)
Feature: Support for ARM64 on Apple Silicon and Windows (#8340, #8577, #8583)
Feature: Add an option to disable tree growth completely (#8415)
Feature: Show group name as part of the default vehicle name (#8307)
Feature: "Frozen" economy setting that stops production changes and industry closures (#8282)
Feature: New velocity unit "tiles/day" (#8278)
Feature: Option to automatically remove signals when placing rail (#8274)
Feature: Increase max possible distance from border for oil refineries and rigs (#8237)
Feature: Improve tree planting window, and allow planting 'clumps' of trees by dragging in the scenario editor (#8234)
Feature: Indian Rupee (INR) currency (#8136)
Feature: [GS] Ability to give a company exclusive access to an industry (#8115)
Feature: Hotkeys for Land Info window, News window & close error window (#8053, #8266)
Feature: Improve rendering of large viewports (#7962)
Feature: [GS] Influence industry production changes from GameScript (#7912)
Feature: [GS] Push-buttons on storybook pages (#7896)
Feature: Option to group vehicle lists by shared orders (#7028)
Feature: Drag-and-drop vehicles in group GUI for shared order groups (#7028)
Add: [GS] A tile parameter to GSCompany::ChangeBankBalance for showing changes more visually (#8573)
Add: [NewGRF] Allow NewGRF vehicles to query the current rail/road/tram type (#8554)
Add: [Script] ScriptCargo::GetName for the human readable name of cargoes (#8544)
Add: "reload" console command to reload the current scenario or heightmap (#8527)
Add: [NewGRF] Flag to test if inflation is on or off (#8427)
Add: [Script] Native priority queue (useful for things like pathfinders) (#8091)
Add: [NewGRF] Industry behaviour flag to override second cargo production clamping for water industries when using smooth economy (#8079)
Change: [SDL2] Start game on the screen where the cursor is (#8572)
Change: Use a dark background for all profit graphs to increase contrast (#8557)
Change: Reword warning in cheat window (#8538)
Change: Enable the toolbar for road/rail/dock/airport, regardless of vehicle availability (#8521)
Change: For arctic and tropical climates, make sure at least a few hills are generated (#8513)
Change: Destroying a tunnel/bridge now sells the tracks before destroying the tunnel/bridge (#8508)
Change: Move "give money" from client-list to company window (#8500)
Change: [MacOS] Hide Dock and menu when in fullscreen mode (#8487)
Change: Improve performance for complex vehicle chains by resolving sprites less frequently (#8485)
Change: Make engine reliability independent of introduction date (#8470)
Change: Some default settings to improve gameplay for new players - default non-stop orders on, disable inflation, quick goto orders, show track reservations, and more (#8463)
Change: Converting town-owned road types now requires a positive town rating (#8457)
Change: Rework server list buttons for searching LAN/internet servers (#8426)
Change: Add some styling to GS question windows depending on the type (#8422)
Change: [Linkgraph] Speed up game exit by allowing job threads to be aborted early (#8416)
Change: Prevent towns from building dead-end road bridges (#8401)
Change: Send network error to the server before making an emergency save (#8387)
Change: Extend the allowed range for max loan setting up to £2 billion (#8386)
Change: Don't display OS name when exiting the game (#8366)
Change: Save openttd.cfg immediately on changing a setting (#8358)
Change: Autorenew now defaults to on (#8352)
Change: [NewGRF] Also use aircraft property 12 for helicopters (#8347)
Change: Service at depot also resets breakdown chance (#8317)
Change: Use key names instead of characters in hotkey.cfg (#8291)
Change: Allow command cost-estimation while paused (#8222)
Change: Always apply inflation from 1920 to 2090, no matter the game start year (#7589)
Change: Use CMake for build system (#7270)
Change: [Linkgraph] Pause the game when linkgraph jobs lag (#7081)
Change: Place "Group by" above "Sort by" in station window for consistency (#7028)
Fix #8589: Prevent desyncs with vehicle motion counters and NewGRFs (#8591)
Fix #7670: Improve pathfinder performance when lost vehicles are blocked from moving (#8568)
Fix: Inform user if a custom font failed to load due to missing glyphs (#8559)
Fix: Don't allow wagon chains (without an engine) to exceed maximum train length (#8533)
Fix #7619: Super fast NewGRF aircraft could be unable to land (#8531)
Fix: Improve connection retries for the content server in cases of broken networking (#8530)
Fix #7972: Show invalid orders to stations that don't accept the vehicle (#8516)
Fix: Error when trying to clone a vehicle with invalid orders (#8515)
Fix #8050: Various off-by-one errors in how the end-year of the game was used (#8512)
Fix #8332: Aborting vehicle group drag & drop could cause crashes (#8511)
Fix #8168: Allow relocating HQ partially over an existing HQ (#8510)
Fix #8068: Allow selling tram track regardless of bank balance (#8509)
Fix #7604: Prevent houses from wandering away from roads (#8507)
Fix: Make the "password" button the same size as the other buttons in the Company window (#8500)
Fix #7611: Keep news about vehicle accidents around after the vehicle is cleaned up (#8497)
Fix: [MacOS] Full animation in fullscreen mode was reducing the height of the window (#8491)
Fix: [MacOS] Loading custom fonts (#8484)
Fix: Network client makes emergency saves twice if the server is disconnected (#8477)
Fix #8462: Stop towns from trying to build roads on water (#8471)
Fix: [NewGRF] GetCurveSpeedLimit should use the railtype from the current tile (#8466)
Fix #8437: Crash when using certain heliports with certain rotated airports (#8458)
Fix #8437: Planes would land at the wrong height if the top corner of the airport was lowered (#8458)
Fix #8297: Infrastructure counters for road tunnels, bridges & depots (#8454)
Fix #6468: Don't store the version of AIs that are started via console (#8430)
Fix: Don't lower tree density if spreading is not enabled (#8413)
Fix: Prevent savegame version conflicts with certain old patchpacks (#8411)
Fix: [NewGRF] Variable 0x44 was always HZB_TOWN_EDGE for road stops (#8400)
Fix #8313: Use correct capitalization for TTO / DOS music files in the baseset metadata (#8385)
Fix: [NewGRF] Action 7/9 conditions 0x0F to 0x12 failed, if 'param' was 0x88 (#8382)
Fix: Change the working-dir searchpath when using '-c' (#8367)
Fix: Useless warning with -snull and no BaseSounds available (#8361)
Fix: Crash trying to load TTO/TTD savegames. (#8356)
Fix: [Script] Don't echo script exceptions to console (#8331)
Fix: Slovak ownname was using the wrong form (#8326)
Fix #8311: [NewGRF] Industry probability at map generation was scaled differently when set via property or callback (#8312)
Fix: Only check houses for cargo when generating subsidies with towns (#8305)
Fix: Sprite preview in sprite aligner was too small with scaled UI (#8288)
Fix: Spell 'Viewport' consistently (#8260)
Fix #7772: Show vehicle destination on mouseover when vehicle stopped (#8236, #8543)
Fix #8232: Huge screenshot warning was shown incorrectly (#8224)
Fix #8153: Report incompatible cargo/order when autoreplace fails (#8169)
Fix: [Script] ScriptMarine::AreWaterTilesConnected did not work for aqueducts (#8074)
Fix #7645: Add cost of clearing the sloped tile to the price of a dock (#7947)
Fix #6452: Reset only editable and visible settings from GUI (#7890)
Fix: Original terrain generator did not keep a single gap of water at the borders (#7883)
Remove: In-game console command "content select all" (#8363)
Remove: [OSX] Support for OSX older than 10.7, including QuickTime music driver (#8078)
diffstat:
games/openttd/Makefile | 57 +++++---------
games/openttd/PLIST | 6 +-
games/openttd/distinfo | 14 +--
games/openttd/patches/patch-cmake_InstallAndPackage.cmake | 55 ++++++++++++++
games/openttd/patches/patch-config.lib | 46 ------------
games/openttd/patches/patch-src_core_alloc__func.hpp | 21 -----
games/openttd/patches/patch-src_core_endian__type.hpp | 20 -----
7 files changed, 87 insertions(+), 132 deletions(-)
diffs (truncated from 301 to 300 lines):
diff -r c18e688ed4ae -r fed2e54b4ba8 games/openttd/Makefile
--- a/games/openttd/Makefile Tue May 04 16:33:15 2021 +0000
+++ b/games/openttd/Makefile Tue May 04 17:08:05 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2021/04/21 11:41:45 adam Exp $
+# $NetBSD: Makefile,v 1.98 2021/05/04 17:08:05 nia Exp $
-DISTNAME= openttd-1.10.3-source
+DISTNAME= openttd-1.11.2-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.xz
@@ -13,51 +12,39 @@
LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-HAS_CONFIGURE= yes
+USE_CMAKE= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake pkg-config
-BUILD_DEFS+= VARBASE
-BUILD_TARGET= bundle
-
-# C++11
-GCC_REQD+= 4.8
+USE_TOOLS+= pkg-config
+CONFIGURE_DIRS= build
+CMAKE_ARG_PATH= ..
-CONFIGURE_ARGS+= --os=UNIX
-CONFIGURE_ARGS+= --prefix-dir=${PREFIX}
-CONFIGURE_ARGS+= --binary-dir=bin
-CONFIGURE_ARGS+= --data-dir=share/openttd
-CONFIGURE_ARGS+= --doc-dir=share/doc/openttd
-CONFIGURE_ARGS+= --icon-theme-dir=share/icons/hicolor
-CONFIGURE_ARGS+= --install-dir=${DESTDIR}
-CONFIGURE_ARGS+= --man-dir=${PKGMANDIR}/man6
-CONFIGURE_ARGS+= --menu-dir=share/applications
-CONFIGURE_ARGS+= --personal-dir=.openttd
-CONFIGURE_ARGS+= --shared-dir=${VARBASE}/games/openttd
+# C++17
+GCC_REQD+= 7
-CONFIGURE_ARGS+= --without-allegro
+BUILD_DEFS+= VARBASE
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --disable-cocoa-quickdraw
-CONFIGURE_ARGS+= --with-cocoa
-CONFIGURE_ARGS+= --without-application-bundle
-CONFIGURE_ARGS+= --without-osx-sysroot
-.else
-CONFIGURE_ARGS+= --with-sdl=sdl2
-.include "../../devel/SDL2/buildlink3.mk"
-.include "../../x11/libxdg-basedir/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libxdg-basedir+= libxdg-basedir>=1.2.0
-.endif
+CMAKE_ARGS+= -DPERSONAL_DIR=.openttd
+CMAKE_ARGS+= -DSHARED_DIR=${VARBASE}/games/openttd
+CMAKE_ARGS+= -DGLOBAL_DIR=${PREFIX}/share/openttd
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR=bin
+CMAKE_ARGS+= -DCMAKE_INSTALL_DATADIR=share
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Grfcodec=ON
-MAKE_FLAGS.NetBSD+= MD5SUM="/usr/bin/cksum -n -a md5"
+BUILDLINK_TRANSFORM+= opt:-std=c++17:-std=gnu++17 # alloca
-BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++11 # alloca
+pre-configure:
+ ${MKDIR} ${WRKSRC}/build
.include "../../archivers/lzo/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../audio/fluidsynth/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff -r c18e688ed4ae -r fed2e54b4ba8 games/openttd/PLIST
--- a/games/openttd/PLIST Tue May 04 16:33:15 2021 +0000
+++ b/games/openttd/PLIST Tue May 04 17:08:05 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2020/04/05 14:41:21 nia Exp $
+@comment $NetBSD: PLIST,v 1.28 2021/05/04 17:08:05 nia Exp $
bin/openttd
man/man6/openttd.6
share/applications/openttd.desktop
@@ -17,6 +17,7 @@
share/openttd/ai/compat_1.0.nut
share/openttd/ai/compat_1.1.nut
share/openttd/ai/compat_1.10.nut
+share/openttd/ai/compat_1.11.nut
share/openttd/ai/compat_1.2.nut
share/openttd/ai/compat_1.3.nut
share/openttd/ai/compat_1.4.nut
@@ -27,7 +28,6 @@
share/openttd/ai/compat_1.9.nut
share/openttd/baseset/no_music.obm
share/openttd/baseset/no_sound.obs
-share/openttd/baseset/openttd.32.bmp
share/openttd/baseset/openttd.grf
share/openttd/baseset/opntitle.dat
share/openttd/baseset/orig_dos.obg
@@ -40,6 +40,7 @@
share/openttd/baseset/orig_win.obm
share/openttd/baseset/orig_win.obs
share/openttd/game/compat_1.10.nut
+share/openttd/game/compat_1.11.nut
share/openttd/game/compat_1.2.nut
share/openttd/game/compat_1.3.nut
share/openttd/game/compat_1.4.nut
@@ -114,3 +115,4 @@
share/openttd/scripts/pre_server.scr.example
share/openttd/scripts/readme.txt
share/pixmaps/openttd.32.xpm
+share/pixmaps/openttd.64.xpm
diff -r c18e688ed4ae -r fed2e54b4ba8 games/openttd/distinfo
--- a/games/openttd/distinfo Tue May 04 16:33:15 2021 +0000
+++ b/games/openttd/distinfo Tue May 04 17:08:05 2021 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.37 2020/10/03 10:17:15 nia Exp $
+$NetBSD: distinfo,v 1.38 2021/05/04 17:08:05 nia Exp $
-SHA1 (openttd-1.10.3-source.tar.xz) = 5a68b97d1f84e9f7e361c12996e741fe64537802
-RMD160 (openttd-1.10.3-source.tar.xz) = 863de2742c84f198d44d02268575cd5233f1c56f
-SHA512 (openttd-1.10.3-source.tar.xz) = d1cd535e8e49f0ac147704341287af1b16bde6725fd9152dd36dcb780559b400da8bb31c4e8eb665a0d11e9b1f5bf8a96be0f97f7a85bd967eec534fdd3dd0d4
-Size (openttd-1.10.3-source.tar.xz) = 6815924 bytes
-SHA1 (patch-config.lib) = 1e8319816aba9d7bf4d0f749c0a4725d1747388a
-SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1
-SHA1 (patch-src_core_endian__type.hpp) = 23564a89fd0e2ebe97043c7d16d5831831b65f40
+SHA1 (openttd-1.11.2-source.tar.xz) = 1894134b7bfc7c645ce9c4fe5747db3dd40abf61
+RMD160 (openttd-1.11.2-source.tar.xz) = 19d5edf788076fe562bcc8f095e44dd3910c83b0
+SHA512 (openttd-1.11.2-source.tar.xz) = 9a6364bf19627db9f8ec58bfa85fa3a8febf1109f3b5fb9053bef810ac2d0c41df91b58f0b253dd45320a29cae2e8485df794afa7b5240f19759f98fd65c35ea
+Size (openttd-1.11.2-source.tar.xz) = 6783972 bytes
+SHA1 (patch-cmake_InstallAndPackage.cmake) = 18b02c11bf59639124c2a852d5a19dda3ae0ff81
diff -r c18e688ed4ae -r fed2e54b4ba8 games/openttd/patches/patch-cmake_InstallAndPackage.cmake
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/openttd/patches/patch-cmake_InstallAndPackage.cmake Tue May 04 17:08:05 2021 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-cmake_InstallAndPackage.cmake,v 1.1 2021/05/04 17:08:05 nia Exp $
+
+Do not try to generate Linux distribution packages.
+
+--- cmake/InstallAndPackage.cmake.orig 2021-05-03 18:41:45.000000000 +0000
++++ cmake/InstallAndPackage.cmake
+@@ -145,47 +145,9 @@ elseif(UNIX)
+ if(OPTION_PACKAGE_DEPENDENCIES)
+ set(CPACK_GENERATOR "TXZ")
+ set(PLATFORM "generic")
+- elseif(NOT OPTION_INSTALL_FHS)
++ else()
+ set(CPACK_GENERATOR "TXZ")
+ set(PLATFORM "unknown")
+- else()
+- find_program(LSB_RELEASE_EXEC lsb_release)
+- execute_process(COMMAND ${LSB_RELEASE_EXEC} -is
+- OUTPUT_VARIABLE LSB_RELEASE_ID
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+- if(LSB_RELEASE_ID)
+- if(LSB_RELEASE_ID STREQUAL "Ubuntu" OR LSB_RELEASE_ID STREQUAL "Debian")
+- execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
+- OUTPUT_VARIABLE LSB_RELEASE_CODENAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+- string(TOLOWER "${LSB_RELEASE_ID}-${LSB_RELEASE_CODENAME}" PLATFORM)
+-
+- set(CPACK_GENERATOR "DEB")
+- include(PackageDeb)
+- else()
+- set(UNSUPPORTED_PLATFORM_NAME "LSB-based Linux distribution '${LSB_RELEASE_ID}'")
+- endif()
+- elseif(EXISTS "/etc/os-release")
+- file(STRINGS "/etc/os-release" OS_RELEASE_CONTENTS REGEX "^ID=")
+- string(REGEX MATCH "ID=(.*)" _ ${OS_RELEASE_CONTENTS})
+- set(DISTRO_ID ${CMAKE_MATCH_1})
+- if(DISTRO_ID STREQUAL "arch")
+- set(PLATFORM "arch")
+- set(CPACK_GENERATOR "TXZ")
+- else()
+- set(UNSUPPORTED_PLATFORM_NAME "Linux distribution '${DISTRO_ID}' from /etc/os-release")
+- endif()
+- else()
+- set(UNSUPPORTED_PLATFORM_NAME "Linux distribution")
+- endif()
+-
+- if(NOT PLATFORM)
+- set(PLATFORM "generic")
+- set(CPACK_GENERATOR "TXZ")
+- message(WARNING "Unknown ${UNSUPPORTED_PLATFORM_NAME} found for packaging; can only pack to a txz. Please consider creating a Pull Request to add support for this distribution.")
+- endif()
+ endif()
+
+ set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-linux-${PLATFORM}-${CPACK_SYSTEM_NAME}")
diff -r c18e688ed4ae -r fed2e54b4ba8 games/openttd/patches/patch-config.lib
--- a/games/openttd/patches/patch-config.lib Tue May 04 16:33:15 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-config.lib,v 1.3 2020/08/18 03:27:49 tnn 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.
-Use pkg-config to detect liblzo2 as hand-crafted method seems unreliable.
-
---- config.lib.orig 2020-06-01 21:22:01.000000000 +0000
-+++ config.lib
-@@ -2088,7 +2088,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
-- $cxx_host strip.test.c -o strip.test
-+ $cc_host $CFLAGS strip.test.c -o strip.test
- check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
- rm -f strip.test.c strip.test
- else
-@@ -2633,7 +2633,7 @@ detect_library() {
- if [ -z "$res" ]; then
- log 2 " trying /opt/local/include/$4$5... no"
- fi
-- if [ -z "$res" ] && [ "$os" = "NETBSD" ]; then
-+ if [ -z "$res" ]; then
- eval "$2=`ls -1 /usr/pkg/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
- eval "res=\$$2"
- if [ -z "$res" ]; then
-@@ -2725,7 +2725,7 @@ detect_zlib() {
- }
-
- detect_lzo2() {
-- detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
-+ detect_pkg_config "$with_lzo2" "lzo2" "lzo2" "2.10"
- }
-
- detect_fluidsynth() {
-@@ -2885,6 +2885,9 @@ detect_iconv() {
- break
- fi
- done
-+ 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 -r c18e688ed4ae -r fed2e54b4ba8 games/openttd/patches/patch-src_core_alloc__func.hpp
--- a/games/openttd/patches/patch-src_core_alloc__func.hpp Tue May 04 16:33:15 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$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 */
diff -r c18e688ed4ae -r fed2e54b4ba8 games/openttd/patches/patch-src_core_endian__type.hpp
--- a/games/openttd/patches/patch-src_core_endian__type.hpp Tue May 04 16:33:15 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_core_endian__type.hpp,v 1.1 2019/09/23 09:49:52 nia Exp $
-
-NetBSD does not have endian definitions in param.h
-
---- src/core/endian_type.hpp.orig 2019-09-16 19:15:04.000000000 +0000
-+++ src/core/endian_type.hpp
-@@ -35,6 +35,13 @@
- # else
- # define TTD_ENDIAN TTD_BIG_ENDIAN
- # endif
-+#elif defined(__NetBSD__)
-+# include <sys/endian.h>
-+# if BYTE_ORDER == LITTLE_ENDIAN
-+# define TTD_ENDIAN TTD_LITTLE_ENDIAN
-+# else
-+# define TTD_ENDIAN TTD_BIG_ENDIAN
-+# endif
- #elif !defined(TESTING)
- # include <sys/param.h>
Home |
Main Index |
Thread Index |
Old Index