There is a new version of vcmi https://github.com/vcmi/vcmi/blame/develop/ChangeLog.md
Controller support didn't work for me unfortunately (xbox one), otherwise everything works fine. Some patches were merged upstream and thus dropped, I had to neut a prctl call because we don't have it, I did not see any issue with that change (otherwise it won't compile anyway). ok? diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile index a274d2ee54f..075e8a1c155 100644 --- a/games/vcmi/Makefile +++ b/games/vcmi/Makefile @@ -6,7 +6,7 @@ HOMEPAGE = https://vcmi.eu/ MAINTAINER = Kirill Bychkov <ki...@openbsd.org> -DIST_TUPLE += github vcmi vcmi 1.4.5 . +DIST_TUPLE += github vcmi vcmi 1.5.0 . DIST_TUPLE += github fuzzylite fuzzylite \ 7aee562d6ca17f3cf42588ffb5116e03017c3c50 AI/FuzzyLite DIST_TUPLE += github google googletest \ @@ -51,7 +51,7 @@ CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} \ NO_TEST = Yes -FIX_CRLF_FILES = Global.h lib/CStopWatch.h lib/CModHandler.h +FIX_CRLF_FILES = Global.h post-extract: sed -i 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/vcmibuilder diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo index bef0c107ea1..acddf2d0d9f 100644 --- a/games/vcmi/distinfo +++ b/games/vcmi/distinfo @@ -1,6 +1,6 @@ SHA256 (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = cOf9r/LVFHo79ZDMgXGWbZmDzNSZQAL4IWyDskBZl0Y= SHA256 (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = JoHejAkwsGENxSomAvrUHQ2vo9f/EDDaZXXVb8H0ykY= -SHA256 (vcmi-vcmi-1.4.5.tar.gz) = EHaC3ygkgoK2rJZFmHVHGPlRHQx+AH/9vQ+lH4e7AEk= +SHA256 (vcmi-vcmi-1.5.0.tar.gz) = OPpIx9oxiqWp4NMxn8sk9N/feFVcIbiwufm7tM7fM/g= SIZE (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = 2194254 SIZE (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = 864010 -SIZE (vcmi-vcmi-1.4.5.tar.gz) = 9683419 +SIZE (vcmi-vcmi-1.5.0.tar.gz) = 9720419 diff --git a/games/vcmi/patches/patch-CMakeLists_txt b/games/vcmi/patches/patch-CMakeLists_txt index 9f82df512b6..77a15a7e595 100644 --- a/games/vcmi/patches/patch-CMakeLists_txt +++ b/games/vcmi/patches/patch-CMakeLists_txt @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -468,7 +468,7 @@ endif() +@@ -508,7 +508,7 @@ endif() if(ENABLE_LAUNCHER OR ENABLE_EDITOR) # Widgets finds its own dependencies (QtGui and QtCore). diff --git a/games/vcmi/patches/patch-client_CMT_cpp b/games/vcmi/patches/patch-client_CMT_cpp index 2172a349b2a..0f64536f23f 100644 --- a/games/vcmi/patches/patch-client_CMT_cpp +++ b/games/vcmi/patches/patch-client_CMT_cpp @@ -1,7 +1,7 @@ Index: client/CMT.cpp --- client/CMT.cpp.orig +++ client/CMT.cpp -@@ -511,7 +511,7 @@ static void mainLoop() +@@ -419,7 +419,7 @@ static void mainLoop() // destruction of locked mutexes (fails an assertion), even in third-party libraries (as well as native libs on Android) // Android - std::quick_exit is available only starting from API level 21 // Mingw, macOS and iOS - std::quick_exit is unavailable (at least in current version of CI) diff --git a/games/vcmi/patches/patch-lib_CStopWatch_h b/games/vcmi/patches/patch-lib_CStopWatch_h deleted file mode 100644 index f861590e4e2..00000000000 --- a/games/vcmi/patches/patch-lib_CStopWatch_h +++ /dev/null @@ -1,21 +0,0 @@ -Index: lib/CStopWatch.h ---- lib/CStopWatch.h.orig -+++ lib/CStopWatch.h -@@ -9,7 +9,7 @@ - */ - #pragma once - --#ifdef __FreeBSD__ -+#ifdef __OpenBSD__ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/resource.h> -@@ -55,7 +55,7 @@ class CStopWatch (public) - private: - si64 clock() - { -- #ifdef __FreeBSD__ // TODO: enable also for Apple? -+ #ifdef __OpenBSD__ // TODO: enable also for Apple? - struct rusage usage; - getrusage(RUSAGE_SELF, &usage); - return static_cast<si64>(usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * 1000000 + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; diff --git a/games/vcmi/patches/patch-lib_CThreadHelper_cpp b/games/vcmi/patches/patch-lib_CThreadHelper_cpp new file mode 100644 index 00000000000..1f33c2cd3a0 --- /dev/null +++ b/games/vcmi/patches/patch-lib_CThreadHelper_cpp @@ -0,0 +1,12 @@ +Index: lib/CThreadHelper.cpp +--- lib/CThreadHelper.cpp.orig ++++ lib/CThreadHelper.cpp +@@ -109,7 +109,7 @@ void setThreadName(const std::string &name) + pthread_setname_np(name.c_str()); + #elif defined(VCMI_HAIKU) + rename_thread(find_thread(NULL), name.c_str()); +-#elif defined(VCMI_UNIX) ++#elif defined(VCMI_UNIX) && !defined(__OpenBSD__) + prctl(PR_SET_NAME, name.c_str(), 0, 0, 0); + #endif + } diff --git a/games/vcmi/patches/patch-lib_modding_CModVersion_h b/games/vcmi/patches/patch-lib_modding_CModVersion_h deleted file mode 100644 index ff95fd414b9..00000000000 --- a/games/vcmi/patches/patch-lib_modding_CModVersion_h +++ /dev/null @@ -1,12 +0,0 @@ -Index: lib/modding/CModVersion.h ---- lib/modding/CModVersion.h.orig -+++ lib/modding/CModVersion.h -@@ -10,7 +10,7 @@ - - #pragma once - --#if defined(__UCLIBC__) || defined(__FreeBSD__) -+#if defined(__UCLIBC__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #undef major - #undef minor - #undef patch diff --git a/games/vcmi/patches/patch-server_CVCMIServer_cpp b/games/vcmi/patches/patch-server_CVCMIServer_cpp deleted file mode 100644 index 6aa0e1279b0..00000000000 --- a/games/vcmi/patches/patch-server_CVCMIServer_cpp +++ /dev/null @@ -1,12 +0,0 @@ -Index: server/CVCMIServer.cpp ---- server/CVCMIServer.cpp.orig -+++ server/CVCMIServer.cpp -@@ -141,7 +141,7 @@ CVCMIServer::CVCMIServer(boost::program_options::varia - if(cmdLineOptions.count("run-by-client")) - { - logNetwork->error("Port must be specified when run-by-client is used!!"); --#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE) -+#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE) || defined(__OpenBSD__) - ::exit(0); - #else - std::quick_exit(0); diff --git a/games/vcmi/pkg/PLIST b/games/vcmi/pkg/PLIST index a875c9d533b..977c779052c 100644 --- a/games/vcmi/pkg/PLIST +++ b/games/vcmi/pkg/PLIST @@ -41,8 +41,15 @@ share/vcmi/Mods/vcmi/Data/debug/blocked.png share/vcmi/Mods/vcmi/Data/debug/grid.png share/vcmi/Mods/vcmi/Data/debug/spellRange.png share/vcmi/Mods/vcmi/Data/debug/visitable.png +share/vcmi/Mods/vcmi/Data/heroWindow/ +share/vcmi/Mods/vcmi/Data/heroWindow/artifactSlotEmpty.png +share/vcmi/Mods/vcmi/Data/heroWindow/backpackButtonIcon.png +share/vcmi/Mods/vcmi/Data/heroWindow/commanderButtonIcon.png share/vcmi/Mods/vcmi/Data/lobby/ share/vcmi/Mods/vcmi/Data/lobby/iconFolder.png +share/vcmi/Mods/vcmi/Data/lobby/iconPlayer.png +share/vcmi/Mods/vcmi/Data/lobby/iconSend.png +share/vcmi/Mods/vcmi/Data/lobby/selectionTabSortDate.png share/vcmi/Mods/vcmi/Data/lobby/townBorderBig.png share/vcmi/Mods/vcmi/Data/lobby/townBorderBigActivated.png share/vcmi/Mods/vcmi/Data/lobby/townBorderBigGrayedOut.png @@ -76,13 +83,10 @@ share/vcmi/Mods/vcmi/Data/s/std.verm @comment share/vcmi/Mods/vcmi/Data/s/testy.erm share/vcmi/Mods/vcmi/Data/s/testy.erm share/vcmi/Mods/vcmi/Data/settingsWindow/ -share/vcmi/Mods/vcmi/Data/settingsWindow/checkBoxEmpty.png share/vcmi/Mods/vcmi/Data/settingsWindow/frameAudio.png share/vcmi/Mods/vcmi/Data/settingsWindow/frameMovement.png share/vcmi/Mods/vcmi/Data/settingsWindow/frameStackQueue.png share/vcmi/Mods/vcmi/Data/settingsWindow/gear.png -share/vcmi/Mods/vcmi/Data/settingsWindow/lineHorizontal.png -share/vcmi/Mods/vcmi/Data/settingsWindow/lineVertical.png share/vcmi/Mods/vcmi/Data/settingsWindow/scrollSpeed1.png share/vcmi/Mods/vcmi/Data/settingsWindow/scrollSpeed2.png share/vcmi/Mods/vcmi/Data/settingsWindow/scrollSpeed3.png @@ -132,16 +136,6 @@ share/vcmi/Mods/vcmi/Sprites/battle/rangeHighlights/red/top.png share/vcmi/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeft.png share/vcmi/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeftCorner.png share/vcmi/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeftHalfCorner.png -share/vcmi/Mods/vcmi/Sprites/buttons/ -share/vcmi/Mods/vcmi/Sprites/buttons/backpack.json -share/vcmi/Mods/vcmi/Sprites/buttons/backpackButtonIcon.png -share/vcmi/Mods/vcmi/Sprites/buttons/backpackNormal.png -share/vcmi/Mods/vcmi/Sprites/buttons/backpackPressed.png -share/vcmi/Mods/vcmi/Sprites/buttons/commander.json -share/vcmi/Mods/vcmi/Sprites/buttons/commanderNormal.png -share/vcmi/Mods/vcmi/Sprites/buttons/commanderPressed.png -share/vcmi/Mods/vcmi/Sprites/heroWindow/ -share/vcmi/Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png share/vcmi/Mods/vcmi/Sprites/itpa.json share/vcmi/Mods/vcmi/Sprites/lobby/ share/vcmi/Mods/vcmi/Sprites/lobby/checkbox.json @@ -152,31 +146,8 @@ share/vcmi/Mods/vcmi/Sprites/lobby/checkboxOn.png share/vcmi/Mods/vcmi/Sprites/lobby/dropdown.json share/vcmi/Mods/vcmi/Sprites/lobby/dropdownNormal.png share/vcmi/Mods/vcmi/Sprites/lobby/dropdownPressed.png -share/vcmi/Mods/vcmi/Sprites/lobby/selectionTabSortDate.json -share/vcmi/Mods/vcmi/Sprites/lobby/selectionTabSortDate.png share/vcmi/Mods/vcmi/Sprites/mapFormatIcons/ share/vcmi/Mods/vcmi/Sprites/mapFormatIcons/vcmi1.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/ -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button190.json -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button190Normal.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button190NormalSelected.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button190Pressed.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button190PressedSelected.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button32.json -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button32Normal.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button32NormalSelected.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button32Pressed.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button32PressedSelected.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button46.json -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button46Normal.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button46NormalSelected.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button46Pressed.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button46PressedSelected.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button80.json -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button80Normal.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button80NormalSelected.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button80Pressed.png -share/vcmi/Mods/vcmi/Sprites/settingsWindow/button80PressedSelected.png share/vcmi/Mods/vcmi/Sprites/stackWindow/ share/vcmi/Mods/vcmi/Sprites/stackWindow/cancel-normal.png share/vcmi/Mods/vcmi/Sprites/stackWindow/cancel-pressed.png @@ -225,6 +196,7 @@ share/vcmi/Mods/vcmi/config/vcmi/english.json share/vcmi/Mods/vcmi/config/vcmi/french.json share/vcmi/Mods/vcmi/config/vcmi/german.json share/vcmi/Mods/vcmi/config/vcmi/polish.json +share/vcmi/Mods/vcmi/config/vcmi/portuguese.json share/vcmi/Mods/vcmi/config/vcmi/rmg/ share/vcmi/Mods/vcmi/config/vcmi/rmg/hdmod/ share/vcmi/Mods/vcmi/config/vcmi/rmg/hdmod/aroundamarsh.JSON @@ -351,13 +323,16 @@ share/vcmi/config/ share/vcmi/config/ERMU_to_picture.json share/vcmi/config/NEUTRAL.PAL share/vcmi/config/ai/ -share/vcmi/config/ai/object-priorities.txt +share/vcmi/config/ai/nkai/ +share/vcmi/config/ai/nkai/nkai-settings.json +share/vcmi/config/ai/nkai/object-priorities.txt share/vcmi/config/ambientSounds.json share/vcmi/config/artifacts.json share/vcmi/config/battleEffects.json share/vcmi/config/battleStartpos.json share/vcmi/config/battlefields.json share/vcmi/config/battles_graphics.json +share/vcmi/config/biomes.json share/vcmi/config/bonuses.json share/vcmi/config/campaignMedia.json share/vcmi/config/campaignSets.json @@ -433,11 +408,38 @@ share/vcmi/config/roads.json share/vcmi/config/schemas/ share/vcmi/config/schemas/artifact.json share/vcmi/config/schemas/battlefield.json +share/vcmi/config/schemas/biome.json share/vcmi/config/schemas/bonus.json share/vcmi/config/schemas/creature.json share/vcmi/config/schemas/faction.json share/vcmi/config/schemas/hero.json share/vcmi/config/schemas/heroClass.json +share/vcmi/config/schemas/lobbyProtocol/ +share/vcmi/config/schemas/lobbyProtocol/accountCreated.json +share/vcmi/config/schemas/lobbyProtocol/accountJoinsRoom.json +share/vcmi/config/schemas/lobbyProtocol/activateGameRoom.json +share/vcmi/config/schemas/lobbyProtocol/activeAccounts.json +share/vcmi/config/schemas/lobbyProtocol/activeGameRooms.json +share/vcmi/config/schemas/lobbyProtocol/changeRoomDescription.json +share/vcmi/config/schemas/lobbyProtocol/chatHistory.json +share/vcmi/config/schemas/lobbyProtocol/chatMessage.json +share/vcmi/config/schemas/lobbyProtocol/clientLogin.json +share/vcmi/config/schemas/lobbyProtocol/clientLoginSuccess.json +share/vcmi/config/schemas/lobbyProtocol/clientProxyLogin.json +share/vcmi/config/schemas/lobbyProtocol/clientRegister.json +share/vcmi/config/schemas/lobbyProtocol/gameStarted.json +share/vcmi/config/schemas/lobbyProtocol/inviteReceived.json +share/vcmi/config/schemas/lobbyProtocol/joinGameRoom.json +share/vcmi/config/schemas/lobbyProtocol/joinRoomSuccess.json +share/vcmi/config/schemas/lobbyProtocol/leaveGameRoom.json +share/vcmi/config/schemas/lobbyProtocol/matchesHistory.json +share/vcmi/config/schemas/lobbyProtocol/operationFailed.json +share/vcmi/config/schemas/lobbyProtocol/requestChatHistory.json +share/vcmi/config/schemas/lobbyProtocol/sendChatMessage.json +share/vcmi/config/schemas/lobbyProtocol/sendInvite.json +share/vcmi/config/schemas/lobbyProtocol/serverLogin.json +share/vcmi/config/schemas/lobbyProtocol/serverLoginSuccess.json +share/vcmi/config/schemas/lobbyProtocol/serverProxyLogin.json share/vcmi/config/schemas/mapHeader.json share/vcmi/config/schemas/mod.json share/vcmi/config/schemas/object.json @@ -455,6 +457,7 @@ share/vcmi/config/schemas/terrain.json share/vcmi/config/schemas/townBuilding.json share/vcmi/config/schemas/townSiege.json share/vcmi/config/schemas/townStructure.json +share/vcmi/config/shortcutsConfig.json share/vcmi/config/skills.json share/vcmi/config/spells/ share/vcmi/config/spells/ability.json @@ -473,6 +476,26 @@ share/vcmi/config/widgets/ share/vcmi/config/widgets/advancedOptionsTab.json share/vcmi/config/widgets/adventureMap.json share/vcmi/config/widgets/battleWindow2.json +share/vcmi/config/widgets/buttons/ +share/vcmi/config/widgets/buttons/campaignBonusSelection.json +share/vcmi/config/widgets/buttons/castleInterfaceQuickAccess.json +share/vcmi/config/widgets/buttons/heroBackpack.json +share/vcmi/config/widgets/buttons/heroCommander.json +share/vcmi/config/widgets/buttons/lobbyCreateRoom.json +share/vcmi/config/widgets/buttons/lobbyHideWindow.json +share/vcmi/config/widgets/buttons/lobbyJoinRoom.json +share/vcmi/config/widgets/buttons/lobbySendMessage.json +share/vcmi/config/widgets/buttons/pregameInvitePlayers.json +share/vcmi/config/widgets/buttons/pregameReturnToLobby.json +share/vcmi/config/widgets/buttons/selectionTabSortDate.json +share/vcmi/config/widgets/buttons/settingsWindow/ +share/vcmi/config/widgets/buttons/settingsWindow/button190.json +share/vcmi/config/widgets/buttons/settingsWindow/button32.json +share/vcmi/config/widgets/buttons/settingsWindow/button46.json +share/vcmi/config/widgets/buttons/settingsWindow/button80.json +share/vcmi/config/widgets/commonPrimitives.json +share/vcmi/config/widgets/extraOptionsTab.json +share/vcmi/config/widgets/lobbyWindow.json share/vcmi/config/widgets/mapOverview.json share/vcmi/config/widgets/playerOptionsTab.json share/vcmi/config/widgets/randomMapTab.json
