Index: head/games/openbve/Makefile =================================================================== --- head/games/openbve/Makefile (revision 556429) +++ head/games/openbve/Makefile (revision 556430) @@ -1,88 +1,82 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= openbve -PORTVERSION= 1.7.2.0 +PORTVERSION= 1.7.2.1 CATEGORIES= games -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= e8c81970ea0e3b9bee1192d85cf67ef3aa31d971.diff:-p1 - MAINTAINER= danfe@FreeBSD.org COMMENT= Realistic 3D train/railway simulator LICENSE= PD BUILD_DEPENDS= msbuild:devel/msbuild \ gdate:sysutils/coreutils LIB_DEPENDS= libgdiplus.so:x11-toolkits/libgdiplus USE_GITHUB= yes GH_ACCOUNT= leezer3 GH_PROJECT= OpenBVE USES= gmake mono:nuget openal:soft MAKEFILE= makefile ALL_TARGET= all-release NUGET_DEPENDS= CS-Script.lib=3.30.3 \ DotNetZip=1.13.8 \ NAudio.Vorbis=1.2.0 \ NAudio=1.10.0 \ NLayer.NAudioSupport=1.0.0 \ NLayer=1.12.0 \ NVorbis=0.10.1 \ OpenTK.GLControl=3.1.0 \ - OpenTK=3.2.0 \ + OpenTK=3.3.1 \ Prism.Core=7.2.0.1422 \ ReactiveProperty.Core=7.1.0 \ ReactiveProperty=7.1.0 \ SharpCompress=0.25.1 \ System.Buffers=4.5.1 \ System.ComponentModel.Annotations=4.7.0 \ System.Memory=4.5.4 \ System.Numerics.Vectors=4.5.0 \ System.Reactive=4.4.1 \ System.Runtime.CompilerServices.Unsafe=4.7.1 \ System.Threading.Tasks.Extensions=4.5.4 \ System.ValueTuple=4.5.0 \ Ude.NetStandard=1.2.0 DATADIR= ${PREFIX}/lib/${PORTNAME} PORTDOCS= changelog.md credits.md routes-and-trains.txt OPTIONS_DEFINE= DOCS - -post-extract: - @${LN} -sf OpenTK.3.2.0 ${_NUGET_PACKAGEDIR}/OpenTK.3.2 post-patch: @${REINPLACE_CMD} -e '/Unix/s,bash,sh,' \ ${WRKSRC}/source/OpenBVE/OpenBve.csproj @${REINPLACE_CMD} -e '/TargetFrameworkVersion/s,4\.7\.2,4.6.1,' \ ${WRKSRC}/source/TrainEditor2/TrainEditor2.csproj do-install: # This is Windows only, so can be removed ${RM} ${WRKSRC}/bin_release/AtsPluginProxy.* ${CP} -a ${WRKSRC}/bin_release ${STAGEDIR}${DATADIR} .for script program in openbve OpenBve openbve-objectviewer ObjectViewer \ openbve-routeviewer RouteViewer ${PRINTF} '#!/bin/sh\n\nexec mono ${DATADIR}/${program}.exe\ "$$@"\n' > ${STAGEDIR}${PREFIX}/bin/${script} ${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${script} .endfor ${INSTALL_MAN} ${WRKSRC}/debian/*.6 ${STAGEDIR}${MANPREFIX}/man/man6 ${INSTALL_DATA} ${WRKSRC}/debian/openbve.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/debian/openbve.png \ ${STAGEDIR}${PREFIX}/share/pixmaps @${REINPLACE_CMD} -e 's,linux,${OPSYS:tl},' \ ${STAGEDIR}${DATADIR}/OpenTK.dll.config do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/debian/,} \ ${STAGEDIR}${DOCSDIR} .include Index: head/games/openbve/distinfo =================================================================== --- head/games/openbve/distinfo (revision 556429) +++ head/games/openbve/distinfo (revision 556430) @@ -1,49 +1,47 @@ -TIMESTAMP = 1600722713 +TIMESTAMP = 1605724526 SHA256 (cs-script.lib.3.30.3.nupkg) = 783ebcee59e0fb9d0c6fde41097f695feebb829ac467c60501c237e262eca964 SIZE (cs-script.lib.3.30.3.nupkg) = 182751 SHA256 (dotnetzip.1.13.8.nupkg) = 668b03e673afc17b47198dd341259e14164e0fd294d009aaa1c602bbf942c1d9 SIZE (dotnetzip.1.13.8.nupkg) = 912116 SHA256 (naudio.vorbis.1.2.0.nupkg) = a36d9a1b539bdd26639f7bb4d7003d636c364edf86b95896a32adb3a4272fb8b SIZE (naudio.vorbis.1.2.0.nupkg) = 31534 SHA256 (naudio.1.10.0.nupkg) = e4a80eed41dad794695f9c114432de4667d20bdfa80825aa94d159708cf29217 SIZE (naudio.1.10.0.nupkg) = 1229187 SHA256 (nlayer.naudiosupport.1.0.0.nupkg) = f3b1aa9885c699519a605aa7436d333b5083927fb0f854a0d7d922461f0078d7 SIZE (nlayer.naudiosupport.1.0.0.nupkg) = 15012 SHA256 (nlayer.1.12.0.nupkg) = 9fa412050c8b6ad7f95bd6eeb4878105c6e341019439d4142f14bd89770b9a25 SIZE (nlayer.1.12.0.nupkg) = 77763 SHA256 (nvorbis.0.10.1.nupkg) = de6c356568e1f4ed58844e504a79dafc1cecc9776814da433b266c16ba43d897 SIZE (nvorbis.0.10.1.nupkg) = 102060 SHA256 (opentk.glcontrol.3.1.0.nupkg) = d5b2035e15a617c491998490a8f414090ebd43b937116dd2689745fe71423049 SIZE (opentk.glcontrol.3.1.0.nupkg) = 48178 -SHA256 (opentk.3.2.0.nupkg) = e621431e891efff8d820fa87e824c550d5780796d3244ce363e4c86564dc00cd -SIZE (opentk.3.2.0.nupkg) = 4417518 +SHA256 (opentk.3.3.1.nupkg) = 5ccdc0c9ef6d2f01377c015ad760cea5e3b3e34d12378dcfe224746a535b695c +SIZE (opentk.3.3.1.nupkg) = 4420653 SHA256 (prism.core.7.2.0.1422.nupkg) = 1bf073a613d75af3f0ed44f63c641194eb7d7b4169ddb0aaad2f6f50707c37cb SIZE (prism.core.7.2.0.1422.nupkg) = 345774 SHA256 (reactiveproperty.core.7.1.0.nupkg) = c073b57786ca38c4d95ac88ac3cc472ac6fc75be4a52c230d86979717a3be47c SIZE (reactiveproperty.core.7.1.0.nupkg) = 28613 SHA256 (reactiveproperty.7.1.0.nupkg) = fbe110891485fc9f8462c5d0cd3a5a71bef06746b73315caf8baddda82c50ed5 SIZE (reactiveproperty.7.1.0.nupkg) = 67840 SHA256 (sharpcompress.0.25.1.nupkg) = 295beb2daff9dd4855e6f6982f6b84b3088c06de9669516ce88f5b1e1c756e5a SIZE (sharpcompress.0.25.1.nupkg) = 888224 SHA256 (system.buffers.4.5.1.nupkg) = c30b3dd2c7e2f4cee4b823d692fd42118309b42ab1f5007f923d329a5b0d6b12 SIZE (system.buffers.4.5.1.nupkg) = 93737 SHA256 (system.componentmodel.annotations.4.7.0.nupkg) = 3f11bd96f7f6bff20022cecb84ee14afe1295ff2f99d86c4b340f6d60ca9a11b SIZE (system.componentmodel.annotations.4.7.0.nupkg) = 758451 SHA256 (system.memory.4.5.4.nupkg) = dec0847f33b8823e4260672d97d657411461c00ada3107ec7bbcb32a845eeb91 SIZE (system.memory.4.5.4.nupkg) = 205467 SHA256 (system.numerics.vectors.4.5.0.nupkg) = a9d49320581fda1b4f4be6212c68c01a22cdf228026099c20a8eabefcf90f9cf SIZE (system.numerics.vectors.4.5.0.nupkg) = 382792 SHA256 (system.reactive.4.4.1.nupkg) = 8a703a9f0f425f483f01eca033026801118e63bf69962fe32c5e780b0794a83f SIZE (system.reactive.4.4.1.nupkg) = 3087134 SHA256 (system.runtime.compilerservices.unsafe.4.7.1.nupkg) = 52fca80d5f0ed286371cf1b519b039e9855dbf04c611f8d8479816d4eec82b85 SIZE (system.runtime.compilerservices.unsafe.4.7.1.nupkg) = 106815 SHA256 (system.threading.tasks.extensions.4.5.4.nupkg) = a304a963cc0796c5179f9c6b7d8022bbce3b2fa7c029eb6196f631f7b462d678 SIZE (system.threading.tasks.extensions.4.5.4.nupkg) = 89582 SHA256 (system.valuetuple.4.5.0.nupkg) = 9e21fa9767d4e76bc0cee065c1d40cc34384a114bfec4d70e6c981168a926802 SIZE (system.valuetuple.4.5.0.nupkg) = 204904 SHA256 (ude.netstandard.1.2.0.nupkg) = f43abb504e4e8aebdc89445057c01ad777a5a25b757f30e1bc5f1cf18c739e1c SIZE (ude.netstandard.1.2.0.nupkg) = 389990 -SHA256 (leezer3-OpenBVE-1.7.2.0_GH0.tar.gz) = ed82ad4e162fb867646ce046fd8f01ed7375c9c2e4764889dc8d7ee154edaebe -SIZE (leezer3-OpenBVE-1.7.2.0_GH0.tar.gz) = 10633286 -SHA256 (e8c81970ea0e3b9bee1192d85cf67ef3aa31d971.diff) = 63d307ce0748fffd0204f8d743fd69e9b254bcf8d32d8586f96c42dc1f4f7190 -SIZE (e8c81970ea0e3b9bee1192d85cf67ef3aa31d971.diff) = 4802 +SHA256 (leezer3-OpenBVE-1.7.2.1_GH0.tar.gz) = 0ce98363a684fd6515ab057a09ff98f26da73903eec78039a7f73ff5959bcdd9 +SIZE (leezer3-OpenBVE-1.7.2.1_GH0.tar.gz) = 10079007 Index: head/games/openbve/files/patch-source_OpenBVE_System_Program.cs =================================================================== --- head/games/openbve/files/patch-source_OpenBVE_System_Program.cs (revision 556429) +++ head/games/openbve/files/patch-source_OpenBVE_System_Program.cs (revision 556430) @@ -1,11 +1,11 @@ ---- source/OpenBVE/System/Program.cs.orig 2020-09-21 21:11:53 UTC +--- source/OpenBVE/System/Program.cs.orig 2020-11-18 18:35:26 UTC +++ source/OpenBVE/System/Program.cs -@@ -92,6 +92,8 @@ namespace OpenBve { - //Doesn't appear to, but Mono have fixed the button appearance bug - CurrentlyRunningOnWindows = Environment.OSVersion.Platform == PlatformID.Win32S | Environment.OSVersion.Platform == PlatformID.Win32Windows | Environment.OSVersion.Platform == PlatformID.Win32NT; +@@ -78,6 +78,8 @@ namespace OpenBve { + Application.SetCompatibleTextRenderingDefault(false); + CurrentHost = new Host(); Joysticks = new JoystickManager(); + // XXX: crashes with System.PlatformNotSupportedException on the same calls below unless we call it here first + Joysticks.RefreshJoysticks(); - CurrentHost = new Host(); try { FileSystem = FileSystem.FromCommandLineArgs(args); + FileSystem.CreateFileSystem(); Index: head/games/openbve/pkg-message =================================================================== --- head/games/openbve/pkg-message (revision 556429) +++ head/games/openbve/pkg-message (revision 556430) @@ -1,14 +1,16 @@ [ { type: install message: <