Mirrors
/
freebsd-ports
mirror of https://git.freebsd.org/ports.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

games/vcmi: the port had been updated to version 1.5.0 

Note: saved games from 1.4 release can be loaded in 1.5!

Reported by:	portscout
main
Alexey Dokuchaev 2024-05-12 08:41:30 +00:00
parent 78e9101ec2
commit 91f2f0fbf5
6 changed files with 106 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
games/vcmi/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= vcmi
PORTVERSION= 1.4.5
PORTREVISION= 1
PORTVERSION= 1.5.0
CATEGORIES= games
MAINTAINER= danfe@FreeBSD.org
@ -18,6 +17,9 @@ RUN_DEPENDS= bash:shells/bash
USES= cmake pkgconfig sdl shebangfix
USE_GITHUB= yes
GH_PROJECT= innoextract:inex
GH_TAGNAME= 9977089:inex
GH_SUBDIR= launcher/lib/innoextract:inex
USE_SDL= image2 mixer2 sdl2 ttf2
SHEBANG_FILES= vcmibuilder
CMAKE_ARGS= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \

8
games/vcmi/distinfo
View File

@ -1,3 +1,5 @@
TIMESTAMP = 1706106361
SHA256 (vcmi-vcmi-1.4.5_GH0.tar.gz) = 107682df28248282b6ac964598754718f9511d0c7e007ffdbd0fa51f87bb0049
SIZE (vcmi-vcmi-1.4.5_GH0.tar.gz) = 9683419
TIMESTAMP = 1715243127
SHA256 (vcmi-vcmi-1.5.0_GH0.tar.gz) = 38fa48c7da318aa5a9e0d3319fcb24f4dfdf78555c21b8b0b9f9bbb4cedf33f8
SIZE (vcmi-vcmi-1.5.0_GH0.tar.gz) = 9720419
SHA256 (vcmi-innoextract-9977089_GH0.tar.gz) = dae4cbf04a0adc6f9d0d3d64f90deda8fd148ced3834a4062b18a1538a26edbe
SIZE (vcmi-innoextract-9977089_GH0.tar.gz) = 205324

11
games/vcmi/files/patch-lib_CThreadHelper.cpp Normal file
View File

@ -0,0 +1,11 @@
--- lib/CThreadHelper.cpp.orig 2024-05-09 08:25:27 UTC
+++ lib/CThreadHelper.cpp
@@ -107,6 +107,8 @@ void setThreadName(const std::string &name)
#elif defined(VCMI_APPLE)
pthread_setname_np(name.c_str());
+#elif defined(VCMI_FREEBSD)
+ pthread_setname_np(pthread_self(), name.c_str());
#elif defined(VCMI_HAIKU)
rename_thread(find_thread(NULL), name.c_str());
#elif defined(VCMI_UNIX)

28
games/vcmi/files/patch-lib_network_NetworkConnection.cpp Normal file
View File

@ -0,0 +1,28 @@
--- lib/network/NetworkConnection.cpp.orig 2024-05-09 08:25:27 UTC
+++ lib/network/NetworkConnection.cpp
@@ -7,6 +7,9 @@
* Full text of license available in license.txt file, in main folder
*
*/
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#endif
#include "StdInc.h"
#include "NetworkConnection.h"
@@ -19,8 +22,15 @@ NetworkConnection::NetworkConnection(INetworkConnectio
socket->set_option(boost::asio::ip::tcp::no_delay(true));
socket->set_option(boost::asio::socket_base::keep_alive(true));
+#ifdef __FreeBSD__
+ unsigned long sb_max;
+ size_t len = sizeof(sb_max);
+ (void)sysctlbyname("kern.ipc.maxsockbuf", &sb_max, &len, NULL, 0);
+ int bufferSize = sb_max * MCLBYTES / (MSIZE + MCLBYTES);
+#else
// iOS throws exception on attempt to set buffer size
constexpr auto bufferSize = 4 * 1024 * 1024;
+#endif
try
{

26
games/vcmi/files/patch-lib_serializer_Connection.cpp
View File

@ -1,26 +0,0 @@
--- lib/serializer/Connection.cpp.orig 2023-02-03 09:25:08 UTC
+++ lib/serializer/Connection.cpp
@@ -15,6 +15,7 @@
#include "../CGameState.h"
#include <boost/asio.hpp>
+#include <sys/sysctl.h>
VCMI_LIB_NAMESPACE_BEGIN
@@ -46,8 +47,13 @@ void CConnection::init()
socket->set_option(boost::asio::ip::tcp::no_delay(true));
try
{
- socket->set_option(boost::asio::socket_base::send_buffer_size(4194304));
- socket->set_option(boost::asio::socket_base::receive_buffer_size(4194304));
+ unsigned long sb_max, sb_max_adj;
+ size_t len = sizeof(sb_max);
+ (void)sysctlbyname("kern.ipc.maxsockbuf", &sb_max, &len, NULL, 0);
+ sb_max_adj = sb_max * MCLBYTES / (MSIZE + MCLBYTES);
+
+ socket->set_option(boost::asio::socket_base::send_buffer_size(sb_max_adj));
+ socket->set_option(boost::asio::socket_base::receive_buffer_size(sb_max_adj));
}
catch (const boost::system::system_error & e)
{

94
games/vcmi/pkg-plist
View File

@ -38,7 +38,13 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/Mods/vcmi/Data/debug/grid.png
%%DATADIR%%/Mods/vcmi/Data/debug/spellRange.png
%%DATADIR%%/Mods/vcmi/Data/debug/visitable.png
%%DATADIR%%/Mods/vcmi/Data/heroWindow/artifactSlotEmpty.png
%%DATADIR%%/Mods/vcmi/Data/heroWindow/backpackButtonIcon.png
%%DATADIR%%/Mods/vcmi/Data/heroWindow/commanderButtonIcon.png
%%DATADIR%%/Mods/vcmi/Data/lobby/iconFolder.png
%%DATADIR%%/Mods/vcmi/Data/lobby/iconPlayer.png
%%DATADIR%%/Mods/vcmi/Data/lobby/iconSend.png
%%DATADIR%%/Mods/vcmi/Data/lobby/selectionTabSortDate.png
%%DATADIR%%/Mods/vcmi/Data/lobby/townBorderBig.png
%%DATADIR%%/Mods/vcmi/Data/lobby/townBorderBigActivated.png
%%DATADIR%%/Mods/vcmi/Data/lobby/townBorderBigGrayedOut.png
@ -67,13 +73,10 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/Mods/vcmi/Data/radialMenu/tradeHeroes.png
%%DATADIR%%/Mods/vcmi/Data/s/std.verm
%%DATADIR%%/Mods/vcmi/Data/s/testy.erm
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/checkBoxEmpty.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/frameAudio.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/frameMovement.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/frameStackQueue.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/gear.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/lineHorizontal.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/lineVertical.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/scrollSpeed1.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/scrollSpeed2.png
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/scrollSpeed3.png
@ -115,14 +118,6 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeft.png
%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeftCorner.png
%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeftHalfCorner.png
%%DATADIR%%/Mods/vcmi/Sprites/buttons/backpack.json
%%DATADIR%%/Mods/vcmi/Sprites/buttons/backpackButtonIcon.png
%%DATADIR%%/Mods/vcmi/Sprites/buttons/backpackNormal.png
%%DATADIR%%/Mods/vcmi/Sprites/buttons/backpackPressed.png
%%DATADIR%%/Mods/vcmi/Sprites/buttons/commander.json
%%DATADIR%%/Mods/vcmi/Sprites/buttons/commanderNormal.png
%%DATADIR%%/Mods/vcmi/Sprites/buttons/commanderPressed.png
%%DATADIR%%/Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png
%%DATADIR%%/Mods/vcmi/Sprites/itpa.json
%%DATADIR%%/Mods/vcmi/Sprites/lobby/checkbox.json
%%DATADIR%%/Mods/vcmi/Sprites/lobby/checkboxBlueOff.png
@ -132,29 +127,7 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/Mods/vcmi/Sprites/lobby/dropdown.json
%%DATADIR%%/Mods/vcmi/Sprites/lobby/dropdownNormal.png
%%DATADIR%%/Mods/vcmi/Sprites/lobby/dropdownPressed.png
%%DATADIR%%/Mods/vcmi/Sprites/lobby/selectionTabSortDate.json
%%DATADIR%%/Mods/vcmi/Sprites/lobby/selectionTabSortDate.png
%%DATADIR%%/Mods/vcmi/Sprites/mapFormatIcons/vcmi1.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button190.json
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button190Normal.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button190NormalSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button190Pressed.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button190PressedSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button32.json
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button32Normal.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button32NormalSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button32Pressed.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button32PressedSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button46.json
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button46Normal.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button46NormalSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button46Pressed.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button46PressedSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button80.json
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button80Normal.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button80NormalSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button80Pressed.png
%%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button80PressedSelected.png
%%DATADIR%%/Mods/vcmi/Sprites/stackWindow/cancel-normal.png
%%DATADIR%%/Mods/vcmi/Sprites/stackWindow/cancel-pressed.png
%%DATADIR%%/Mods/vcmi/Sprites/stackWindow/cancelButton.json
@ -195,6 +168,7 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/Mods/vcmi/config/vcmi/french.json
%%DATADIR%%/Mods/vcmi/config/vcmi/german.json
%%DATADIR%%/Mods/vcmi/config/vcmi/polish.json
%%DATADIR%%/Mods/vcmi/config/vcmi/portuguese.json
%%DATADIR%%/Mods/vcmi/config/vcmi/rmg/hdmod/aroundamarsh.JSON
%%DATADIR%%/Mods/vcmi/config/vcmi/rmg/hdmod/balance.JSON
%%DATADIR%%/Mods/vcmi/config/vcmi/rmg/hdmod/blockbuster.JSON
@ -312,13 +286,15 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/Mods/vcmi/mod.json
%%DATADIR%%/config/ERMU_to_picture.json
%%DATADIR%%/config/NEUTRAL.PAL
%%DATADIR%%/config/ai/object-priorities.txt
%%DATADIR%%/config/ai/nkai/nkai-settings.json
%%DATADIR%%/config/ai/nkai/object-priorities.txt
%%DATADIR%%/config/ambientSounds.json
%%DATADIR%%/config/artifacts.json
%%DATADIR%%/config/battleEffects.json
%%DATADIR%%/config/battleStartpos.json
%%DATADIR%%/config/battlefields.json
%%DATADIR%%/config/battles_graphics.json
%%DATADIR%%/config/biomes.json
%%DATADIR%%/config/bonuses.json
%%DATADIR%%/config/campaignMedia.json
%%DATADIR%%/config/campaignSets.json
@ -389,11 +365,37 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/config/roads.json
%%DATADIR%%/config/schemas/artifact.json
%%DATADIR%%/config/schemas/battlefield.json
%%DATADIR%%/config/schemas/biome.json
%%DATADIR%%/config/schemas/bonus.json
%%DATADIR%%/config/schemas/creature.json
%%DATADIR%%/config/schemas/faction.json
%%DATADIR%%/config/schemas/hero.json
%%DATADIR%%/config/schemas/heroClass.json
%%DATADIR%%/config/schemas/lobbyProtocol/accountCreated.json
%%DATADIR%%/config/schemas/lobbyProtocol/accountJoinsRoom.json
%%DATADIR%%/config/schemas/lobbyProtocol/activateGameRoom.json
%%DATADIR%%/config/schemas/lobbyProtocol/activeAccounts.json
%%DATADIR%%/config/schemas/lobbyProtocol/activeGameRooms.json
%%DATADIR%%/config/schemas/lobbyProtocol/changeRoomDescription.json
%%DATADIR%%/config/schemas/lobbyProtocol/chatHistory.json
%%DATADIR%%/config/schemas/lobbyProtocol/chatMessage.json
%%DATADIR%%/config/schemas/lobbyProtocol/clientLogin.json
%%DATADIR%%/config/schemas/lobbyProtocol/clientLoginSuccess.json
%%DATADIR%%/config/schemas/lobbyProtocol/clientProxyLogin.json
%%DATADIR%%/config/schemas/lobbyProtocol/clientRegister.json
%%DATADIR%%/config/schemas/lobbyProtocol/gameStarted.json
%%DATADIR%%/config/schemas/lobbyProtocol/inviteReceived.json
%%DATADIR%%/config/schemas/lobbyProtocol/joinGameRoom.json
%%DATADIR%%/config/schemas/lobbyProtocol/joinRoomSuccess.json
%%DATADIR%%/config/schemas/lobbyProtocol/leaveGameRoom.json
%%DATADIR%%/config/schemas/lobbyProtocol/matchesHistory.json
%%DATADIR%%/config/schemas/lobbyProtocol/operationFailed.json
%%DATADIR%%/config/schemas/lobbyProtocol/requestChatHistory.json
%%DATADIR%%/config/schemas/lobbyProtocol/sendChatMessage.json
%%DATADIR%%/config/schemas/lobbyProtocol/sendInvite.json
%%DATADIR%%/config/schemas/lobbyProtocol/serverLogin.json
%%DATADIR%%/config/schemas/lobbyProtocol/serverLoginSuccess.json
%%DATADIR%%/config/schemas/lobbyProtocol/serverProxyLogin.json
%%DATADIR%%/config/schemas/mapHeader.json
%%DATADIR%%/config/schemas/mod.json
%%DATADIR%%/config/schemas/object.json
@ -411,6 +413,7 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/config/schemas/townBuilding.json
%%DATADIR%%/config/schemas/townSiege.json
%%DATADIR%%/config/schemas/townStructure.json
%%DATADIR%%/config/shortcutsConfig.json
%%DATADIR%%/config/skills.json
%%DATADIR%%/config/spells/ability.json
%%DATADIR%%/config/spells/adventure.json
@ -425,6 +428,24 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%DATADIR%%/config/widgets/advancedOptionsTab.json
%%DATADIR%%/config/widgets/adventureMap.json
%%DATADIR%%/config/widgets/battleWindow2.json
%%DATADIR%%/config/widgets/buttons/campaignBonusSelection.json
%%DATADIR%%/config/widgets/buttons/castleInterfaceQuickAccess.json
%%DATADIR%%/config/widgets/buttons/heroBackpack.json
%%DATADIR%%/config/widgets/buttons/heroCommander.json
%%DATADIR%%/config/widgets/buttons/lobbyCreateRoom.json
%%DATADIR%%/config/widgets/buttons/lobbyHideWindow.json
%%DATADIR%%/config/widgets/buttons/lobbyJoinRoom.json
%%DATADIR%%/config/widgets/buttons/lobbySendMessage.json
%%DATADIR%%/config/widgets/buttons/pregameInvitePlayers.json
%%DATADIR%%/config/widgets/buttons/pregameReturnToLobby.json
%%DATADIR%%/config/widgets/buttons/selectionTabSortDate.json
%%DATADIR%%/config/widgets/buttons/settingsWindow/button190.json
%%DATADIR%%/config/widgets/buttons/settingsWindow/button32.json
%%DATADIR%%/config/widgets/buttons/settingsWindow/button46.json
%%DATADIR%%/config/widgets/buttons/settingsWindow/button80.json
%%DATADIR%%/config/widgets/commonPrimitives.json
%%DATADIR%%/config/widgets/extraOptionsTab.json
%%DATADIR%%/config/widgets/lobbyWindow.json
%%DATADIR%%/config/widgets/mapOverview.json
%%DATADIR%%/config/widgets/playerOptionsTab.json
%%DATADIR%%/config/widgets/randomMapTab.json
@ -439,7 +460,6 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%QT%%%%DATADIR%%/launcher/icons/about-project.png
%%QT%%%%DATADIR%%/launcher/icons/menu-editor.png
%%QT%%%%DATADIR%%/launcher/icons/menu-game.png
%%QT%%%%DATADIR%%/launcher/icons/menu-lobby.png
%%QT%%%%DATADIR%%/launcher/icons/menu-mods.png
%%QT%%%%DATADIR%%/launcher/icons/menu-settings.png
%%QT%%%%DATADIR%%/launcher/icons/mod-delete.png
@ -447,13 +467,13 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%QT%%%%DATADIR%%/launcher/icons/mod-download.png
%%QT%%%%DATADIR%%/launcher/icons/mod-enabled.png
%%QT%%%%DATADIR%%/launcher/icons/mod-update.png
%%QT%%%%DATADIR%%/launcher/icons/room-private.png
%%QT%%%%DATADIR%%/launcher/translation/chinese.qm
%%QT%%%%DATADIR%%/launcher/translation/czech.qm
%%QT%%%%DATADIR%%/launcher/translation/english.qm
%%QT%%%%DATADIR%%/launcher/translation/french.qm
%%QT%%%%DATADIR%%/launcher/translation/german.qm
%%QT%%%%DATADIR%%/launcher/translation/polish.qm
%%QT%%%%DATADIR%%/launcher/translation/portuguese.qm
%%QT%%%%DATADIR%%/launcher/translation/russian.qm
%%QT%%%%DATADIR%%/launcher/translation/spanish.qm
%%QT%%%%DATADIR%%/launcher/translation/ukrainian.qm
@ -499,11 +519,13 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
%%QT%%%%DATADIR%%/mapeditor/icons/zoom_minus.png
%%QT%%%%DATADIR%%/mapeditor/icons/zoom_plus.png
%%QT%%%%DATADIR%%/mapeditor/icons/zoom_zero.png
%%QT%%%%DATADIR%%/mapeditor/translation/chinese.qm
%%QT%%%%DATADIR%%/mapeditor/translation/czech.qm
%%QT%%%%DATADIR%%/mapeditor/translation/english.qm
%%QT%%%%DATADIR%%/mapeditor/translation/french.qm
%%QT%%%%DATADIR%%/mapeditor/translation/german.qm
%%QT%%%%DATADIR%%/mapeditor/translation/polish.qm
%%QT%%%%DATADIR%%/mapeditor/translation/portuguese.qm
%%QT%%%%DATADIR%%/mapeditor/translation/russian.qm
%%QT%%%%DATADIR%%/mapeditor/translation/spanish.qm
%%QT%%%%DATADIR%%/mapeditor/translation/ukrainian.qm