git: 7f905037579d - main - games/openbve: the port had been updated to version 1.8.2.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Dec 2021 08:49:54 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7f905037579d560277ed9b3c7a9545e2beae36af
commit 7f905037579d560277ed9b3c7a9545e2beae36af
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-12-04 08:48:52 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-12-04 08:48:53 +0000
games/openbve: the port had been updated to version 1.8.2.1
The OpenTK X11 backend seems to be broken on FreeBSD, whereas the
SDL2 one is OK, so deliberately force the latter for the time being.
Now there is proper platform detection for FreeBSD and the joystick
patch had been merged upstream.
---
games/openbve/Makefile | 18 +++++++++++-----
games/openbve/distinfo | 20 +++++++++++------
.../files/patch-source_OpenBVE_System_Program.cs | 11 ----------
games/openbve/pkg-plist | 25 ++++++++++++++++++++++
4 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/games/openbve/Makefile b/games/openbve/Makefile
index c9021ffcac37..10d315bda0c5 100644
--- a/games/openbve/Makefile
+++ b/games/openbve/Makefile
@@ -1,9 +1,12 @@
# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-PORTNAME= openbve
-PORTVERSION= 1.8.1.0
+PORTNAME= ${GH_PROJECT:tl}
+PORTVERSION= 1.8.2.1
CATEGORIES= games
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES= 9f82a4df3.diff:-p1 6a0a485bc.diff:-p1 c0b054733.diff:-p1
+
MAINTAINER= danfe@FreeBSD.org
COMMENT= Realistic 3D train/railway simulator
@@ -16,7 +19,8 @@ USE_GITHUB= yes
GH_ACCOUNT= leezer3
GH_PROJECT= OpenBVE
-USES= gmake mono:nuget openal:soft
+USES= gmake mono:nuget openal:soft sdl
+USE_SDL= sdl2
MAKEFILE= makefile
ALL_TARGET= all-release
@@ -29,8 +33,8 @@ NUGET_DEPENDS= CS-Script.lib=3.30.3 \
NLayer.NAudioSupport=1.0.0 \
NLayer=1.12.0 \
NVorbis=0.10.1 \
- OpenTK.GLControl=3.1.0 \
- OpenTK=3.3.1 \
+ OpenTK-OpenBVE=1.0.0 \
+ OpenTK.GLControl-OpenBVE=1.0.0 \
Prism.Core=7.2.0.1422 \
ReactiveProperty.Core=7.1.0 \
ReactiveProperty=7.1.0 \
@@ -56,6 +60,10 @@ OPTIONS_DEFINE= DOCS
BROKEN= fails to build with Mono version ${MONO_DEFAULT}: The imported project "/usr/local/lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CSharp.Core.targets" was not found
.endif
+pre-extract:
+ @${MKDIR} ${_NUGET_PACKAGEDIR}/opentk.glcontrol-openbve/1.0.0
+ @${LN} -s OpenTK.GLControl.nuspec ${_NUGET_PACKAGEDIR}/opentk.glcontrol-openbve/1.0.0/OpenTK.GLControl-OpenBVE.nuspec
+
post-patch:
@${REINPLACE_CMD} -e '/TargetFrameworkVersion/s,4\.7\.2,4.6.1,' \
${WRKSRC}/source/TrainEditor2/TrainEditor2.csproj
diff --git a/games/openbve/distinfo b/games/openbve/distinfo
index 25787b473fa0..b057904a0435 100644
--- a/games/openbve/distinfo
+++ b/games/openbve/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1626427324
+TIMESTAMP = 1637425347
+SHA256 (leezer3-OpenBVE-1.8.2.1_GH0.tar.gz) = 72106ffe9dee0d69188e227a040d21f4b3af5a31627f2c60a5307c40f79f1e51
+SIZE (leezer3-OpenBVE-1.8.2.1_GH0.tar.gz) = 11709051
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
@@ -17,10 +19,10 @@ SHA256 (nlayer.1.12.0.nupkg) = 9fa412050c8b6ad7f95bd6eeb4878105c6e341019439d4142
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.3.1.nupkg) = 5ccdc0c9ef6d2f01377c015ad760cea5e3b3e34d12378dcfe224746a535b695c
-SIZE (opentk.3.3.1.nupkg) = 4420653
+SHA256 (opentk-openbve.1.0.0.nupkg) = d0fa8e73b6b511e7b23cd7e4c9366bac481df25a8d743219d75e965166677849
+SIZE (opentk-openbve.1.0.0.nupkg) = 4294517
+SHA256 (opentk.glcontrol-openbve.1.0.0.nupkg) = 242918824a91e4386eab702dd5814c964d0857330f8fa4bf41efaa2f295feb52
+SIZE (opentk.glcontrol-openbve.1.0.0.nupkg) = 46844
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
@@ -47,5 +49,9 @@ SHA256 (system.valuetuple.4.5.0.nupkg) = 9e21fa9767d4e76bc0cee065c1d40cc34384a11
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.8.1.0_GH0.tar.gz) = dff4e9a14a3630723ea6546a56bda2471717e3090a55a8e3d0988127e98df3fd
-SIZE (leezer3-OpenBVE-1.8.1.0_GH0.tar.gz) = 11225190
+SHA256 (9f82a4df3.diff) = bb065ae04ab57b400f18063d6adc768deebff3c50fd22cd505fbf6cfdec0e983
+SIZE (9f82a4df3.diff) = 15298
+SHA256 (6a0a485bc.diff) = 25cb1a0fac365f47d40735a9906b03ccbb4508c18976058e09c3641c03025667
+SIZE (6a0a485bc.diff) = 2815
+SHA256 (c0b054733.diff) = d419720c49b7b3f6dbcd22be705514d2b347def5abb7cc4d9f751b4dd513b959
+SIZE (c0b054733.diff) = 6905
diff --git a/games/openbve/files/patch-source_OpenBVE_System_Program.cs b/games/openbve/files/patch-source_OpenBVE_System_Program.cs
deleted file mode 100644
index 364ef20dd29f..000000000000
--- a/games/openbve/files/patch-source_OpenBVE_System_Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/OpenBVE/System/Program.cs.orig 2021-04-25 10:39:43 UTC
-+++ source/OpenBVE/System/Program.cs
-@@ -83,6 +83,8 @@ namespace OpenBve {
- {
- Joysticks = new JoystickManager64();
- }
-+ // XXX: crashes with System.PlatformNotSupportedException on the same calls below unless we call it here first
-+ Joysticks.RefreshJoysticks();
- try {
- FileSystem = FileSystem.FromCommandLineArgs(args, CurrentHost);
- FileSystem.CreateFileSystem();
diff --git a/games/openbve/pkg-plist b/games/openbve/pkg-plist
index b3d2a9dd098a..6fab4cc7e990 100644
--- a/games/openbve/pkg-plist
+++ b/games/openbve/pkg-plist
@@ -491,6 +491,7 @@ bin/openbve-routeviewer
%%DATADIR%%/Data/Cursors/nm.png
%%DATADIR%%/Data/Cursors/nr.png
%%DATADIR%%/Data/Cursors/ny.png
+%%DATADIR%%/Data/Cursors/scroll.png
%%DATADIR%%/Data/Flags/AT.png
%%DATADIR%%/Data/Flags/BE.png
%%DATADIR%%/Data/Flags/BR.png
@@ -520,7 +521,22 @@ bin/openbve-routeviewer
%%DATADIR%%/Data/Flags/UA.png
%%DATADIR%%/Data/Flags/US.png
%%DATADIR%%/Data/Flags/unknown.png
+%%DATADIR%%/Data/Formats/CSScriptLibrary.dll
+%%DATADIR%%/Data/Formats/CSScriptLibrary.xml
%%DATADIR%%/Data/Formats/Formats.Msts.dll
+%%DATADIR%%/Data/Formats/OpenBveApi.dll
+%%DATADIR%%/Data/Formats/OpenBveApi.dll.config
+%%DATADIR%%/Data/Formats/OpenBveApi.xml
+%%DATADIR%%/Data/Formats/SharpCompress.dll
+%%DATADIR%%/Data/Formats/System.Buffers.dll
+%%DATADIR%%/Data/Formats/System.Buffers.xml
+%%DATADIR%%/Data/Formats/System.Memory.dll
+%%DATADIR%%/Data/Formats/System.Memory.xml
+%%DATADIR%%/Data/Formats/System.Numerics.Vectors.dll
+%%DATADIR%%/Data/Formats/System.Numerics.Vectors.xml
+%%DATADIR%%/Data/Formats/System.ValueTuple.dll
+%%DATADIR%%/Data/Formats/System.ValueTuple.xml
+%%DATADIR%%/Data/Formats/Ude.NetStandard.dll
%%DATADIR%%/Data/In-game/Default/ats_center_left_back.png
%%DATADIR%%/Data/In-game/Default/ats_center_left_overlay.png
%%DATADIR%%/Data/In-game/Default/ats_center_middle_back.png
@@ -650,6 +666,7 @@ bin/openbve-routeviewer
%%DATADIR%%/Data/Menu/loading.png
%%DATADIR%%/Data/Menu/logo.png
%%DATADIR%%/Data/Menu/package.png
+%%DATADIR%%/Data/Menu/please_select.png
%%DATADIR%%/Data/Menu/raildriver.png
%%DATADIR%%/Data/Menu/raildriver2.png
%%DATADIR%%/Data/Menu/route_error.png
@@ -657,6 +674,7 @@ bin/openbve-routeviewer
%%DATADIR%%/Data/Menu/train_error.png
%%DATADIR%%/Data/Menu/train_unknown.png
%%DATADIR%%/Data/Menu/xbox.png
+%%DATADIR%%/Data/Menu/zuki.png
%%DATADIR%%/Data/Plugins/Object.Animated.dll
%%DATADIR%%/Data/Plugins/Object.Animated.dll.config
%%DATADIR%%/Data/Plugins/Object.Animated.pdb
@@ -703,6 +721,7 @@ bin/openbve-routeviewer
%%DATADIR%%/Data/RouteViewer/background.png
%%DATADIR%%/Data/RouteViewer/brightness.png
%%DATADIR%%/Data/RouteViewer/buffer.png
+%%DATADIR%%/Data/RouteViewer/lighting.png
%%DATADIR%%/Data/RouteViewer/limit.png
%%DATADIR%%/Data/RouteViewer/runsound.png
%%DATADIR%%/Data/RouteViewer/section.png
@@ -712,9 +731,13 @@ bin/openbve-routeviewer
%%DATADIR%%/Data/RouteViewer/stop.png
%%DATADIR%%/Data/RouteViewer/switchsound.png
%%DATADIR%%/Data/RouteViewer/transponder.png
+%%DATADIR%%/Data/RouteViewer/weather.png
%%DATADIR%%/Data/Shaders/default.frag
%%DATADIR%%/Data/Shaders/default.vert
%%DATADIR%%/Data/Shaders/picking.frag
+%%DATADIR%%/Data/Shaders/rectangle.frag
+%%DATADIR%%/Data/Shaders/rectangle.vert
+%%DATADIR%%/Data/Shaders/text.vert
%%DATADIR%%/Data/TrainEditor2/change.png
%%DATADIR%%/Data/TrainEditor2/cleanup.png
%%DATADIR%%/Data/TrainEditor2/copy.png
@@ -771,6 +794,7 @@ bin/openbve-routeviewer
%%DATADIR%%/ObjectViewer.exe
%%DATADIR%%/ObjectViewer.exe.config
%%DATADIR%%/OpenBve-32.exe
+%%DATADIR%%/OpenBve-32.exe.config
%%DATADIR%%/OpenBve.XML
%%DATADIR%%/OpenBve.exe
%%DATADIR%%/OpenBve.exe.config
@@ -796,6 +820,7 @@ bin/openbve-routeviewer
%%DATADIR%%/RouteManager2.dll.config
%%DATADIR%%/RouteManager2.pdb
%%DATADIR%%/RouteViewer-32.exe
+%%DATADIR%%/RouteViewer-32.exe.config
%%DATADIR%%/RouteViewer.exe
%%DATADIR%%/RouteViewer.exe.config
%%DATADIR%%/SharpCompress.dll