update to latest version https://github.com/beyond-all-reason/spring/compare/spring_bar_%7BBAR105%7D105.1.1-2472-ga5aa45c...spring_bar_%7BBAR105%7D105.1.1-2511-g747f18b
https://github.com/rlcevg/CircuitAI/compare/aded4d13fcec74a3416e7055fcfb8275e49061a1...3dee671176bdae7e6b1dd46a3c6c2c0d03c48755 One more patch merged upstream, thx thfr@. Use patch -E to drop the file. While there, I mute portcheck long lines report by removing the space on url. I also noticed other long lines and adjusted indentation (portcheck use awk length, looks like it does not handle tabulation size). Only two versions changed in DIST_TUPLE, see distinfo. Tested on BAR, barbarianIA works again. Index: Makefile =================================================================== RCS file: /cvs/ports/games/recoil-rts/Makefile,v diff -u -p -r1.6 Makefile --- Makefile 14 May 2024 02:50:23 -0000 1.6 +++ Makefile 16 Jun 2024 05:37:37 -0000 @@ -4,14 +4,14 @@ ONLY_FOR_ARCHS = amd64 COMMENT = real-time strategy game engine for Beyond All Reason # To keep version in sync with Beyond All Reason: use version information at: -# https://github.com/beyond-all-reason/BYAR-Chobby/blob/master/dist_cfg/config.json +#https://github.com/beyond-all-reason/BYAR-Chobby/blob/master/dist_cfg/config.json # under setups->package->id: "manual-linux", see downloads->resources or # launch->engine MJ = 105 # don't reduce ${MN} to just single digit to avoid update-plist going berserk MN = 1.1 -BLD = 2472 -HASH = ga5aa45c +BLD = 2511 +HASH = g747f18b V = ${MJ}.${MN}pl${BLD} # ${IN_ENGINE_V} is what recoil uses/displays internally IN_ENGINE_V = ${MJ}.${MN:C/\..*//} @@ -23,26 +23,30 @@ PKGNAME = recoil-rts-0.${V} DIST_STRING = spring_bar_%7BBAR${MJ}%7D${MAJ}.${MN}-${BLD}-${HASH} DIST_TUPLE += github beyond-all-reason spring ${DIST_STRING} . -DIST_TUPLE += github USCiLab cereal d1fcec807b372f04e4c1041b3058e11c12853e6e \ +DIST_TUPLE += github USCiLab cereal \ + d1fcec807b372f04e4c1041b3058e11c12853e6e \ rts/lib/cereal # BSD-3 -DIST_TUPLE += github skypjack entt e4ccb878f47245a319704912435d3c89f34ad6be \ +DIST_TUPLE += github skypjack entt \ + e4ccb878f47245a319704912435d3c89f34ad6be \ rts/lib/entt # MIT -DIST_TUPLE += github gflags gflags f8a0efe03aa69b3336d8e228b37d4ccb17324b88 \ +DIST_TUPLE += github gflags gflags \ + f8a0efe03aa69b3336d8e228b37d4ccb17324b88 \ rts/lib/gflags # BSD-3 -DIST_TUPLE += github wolfpld tracy 5a1f5371b792c12aea324213e1dc738b2923ae21 \ +DIST_TUPLE += github wolfpld tracy \ + 5a1f5371b792c12aea324213e1dc738b2923ae21 \ rts/lib/tracy # BSD-3 DIST_TUPLE += github rlcevg CircuitAI \ - aded4d13fcec74a3416e7055fcfb8275e49061a1 AI/Skirmish/BARb \ - # GPL-2.0 + 3dee671176bdae7e6b1dd46a3c6c2c0d03c48755 \ + AI/Skirmish/BARb # GPL-2.0 DIST_TUPLE += github rlcevg CircuitAI \ - edc74149c281e2140f28c091ed74310c11611cc7 AI/Skirmish/CircuitAI \ - # GPL-2.0 + edc74149c281e2140f28c091ed74310c11611cc7 \ + AI/Skirmish/CircuitAI # GPL-2.0 DIST_TUPLE += github spring SpringMapConvNG \ - 0ddd86eaa8871dc0833c69f931f55cd856c5009d tools/mapcompile \ - # GPL-2.0 + 0ddd86eaa8871dc0833c69f931f55cd856c5009d \ + tools/mapcompile # GPL-2.0 DIST_TUPLE += github beyond-all-reason pr-downloader \ - bdac30330eccb5ec73da299922491f3f4ee8debe tools/pr-downloader \ - # GPL-2.0 + bdac30330eccb5ec73da299922491f3f4ee8debe \ + tools/pr-downloader # GPL-2.0 DIST_TUPLE += github cameron314 readerwriterqueue \ 8e7627d18c2108aca178888d88514179899a044f \ tools/pr-downloader/src/lib/readerwriterqueue # BSD-2 @@ -58,7 +62,8 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL WANTLIB += c curl execinfo fontconfig freetype jsoncpp m minizip ogg WANTLIB += openal vorbis vorbisfile z -FIX_CRLF_FILES = tools/pr-downloader/src/lib/readerwriterqueue/benchmarks/systemtime.h +FIX_CRLF_FILES = \ + tools/pr-downloader/src/lib/readerwriterqueue/benchmarks/systemtime.h COMPILER = base-clang ports-gcc MODULES = devel/cmake Index: distinfo =================================================================== RCS file: /cvs/ports/games/recoil-rts/distinfo,v diff -u -p -r1.3 distinfo --- distinfo 14 May 2024 02:50:23 -0000 1.3 +++ distinfo 16 Jun 2024 05:37:37 -0000 @@ -1,19 +1,19 @@ SHA256 (USCiLab-cereal-d1fcec807b372f04e4c1041b3058e11c12853e6e.tar.gz) = 1Es3qUX8IoNvYuZiUmm4ZfP8BZu3jSXXWqucH4r/Mmc= SHA256 (beyond-all-reason-pr-downloader-bdac30330eccb5ec73da299922491f3f4ee8debe.tar.gz) = gwxe0bl/0tEFJV/f/OWaB5rkQhN1UXomLOccEUFb660= -SHA256 (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2472-ga5aa45c.tar.gz) = dwWRGvo76Wk+0j8czyojEEUWavYh7PEdo8mgHSE27qE= +SHA256 (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2511-g747f18b.tar.gz) = B7oJy6E+lzWRTagejmC5QCXP+6JBQpdrZ+3w3yFDgP8= SHA256 (cameron314-readerwriterqueue-8e7627d18c2108aca178888d88514179899a044f.tar.gz) = zOGtadLg/b/tn6tvYPYrvR9SExfgr14gUVngVtjPR80= SHA256 (gflags-gflags-f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz) = TSIvq48e3kcJzf9BfRWhM2+GLXM0qBq/dtCcFez5rNE= -SHA256 (rlcevg-CircuitAI-aded4d13fcec74a3416e7055fcfb8275e49061a1.tar.gz) = wwZrf2GReh0OPE3ScYA+96QajUcFIbqn6pYynx8eacc= +SHA256 (rlcevg-CircuitAI-3dee671176bdae7e6b1dd46a3c6c2c0d03c48755.tar.gz) = anC1SjlVT3uMkIP4JtYPR3W1r/GjAW9XPrviyVOPPJ0= SHA256 (rlcevg-CircuitAI-edc74149c281e2140f28c091ed74310c11611cc7.tar.gz) = GYOK6lYFsrtXEutfPc4mDu9zxPLvCeJNW/so3u49q5g= SHA256 (skypjack-entt-e4ccb878f47245a319704912435d3c89f34ad6be.tar.gz) = gjepEu03F+8u4ifBNNEHM8Tvo9UeizLvZ5Ni4b4HCdM= SHA256 (spring-SpringMapConvNG-0ddd86eaa8871dc0833c69f931f55cd856c5009d.tar.gz) = lYjmnme8KMbYUH8CuQrFvtTdi6rKHmWAaMxb7Cd/ssU= SHA256 (wolfpld-tracy-5a1f5371b792c12aea324213e1dc738b2923ae21.tar.gz) = ZJdi2a7Yha8LBWJdrdB0Jrn8/Y/5ASrs8FG2VsBm7NM= SIZE (USCiLab-cereal-d1fcec807b372f04e4c1041b3058e11c12853e6e.tar.gz) = 386786 SIZE (beyond-all-reason-pr-downloader-bdac30330eccb5ec73da299922491f3f4ee8debe.tar.gz) = 342401 -SIZE (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2472-ga5aa45c.tar.gz) = 23003975 +SIZE (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2511-g747f18b.tar.gz) = 23007139 SIZE (cameron314-readerwriterqueue-8e7627d18c2108aca178888d88514179899a044f.tar.gz) = 41260 SIZE (gflags-gflags-f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz) = 96474 -SIZE (rlcevg-CircuitAI-aded4d13fcec74a3416e7055fcfb8275e49061a1.tar.gz) = 1564276 +SIZE (rlcevg-CircuitAI-3dee671176bdae7e6b1dd46a3c6c2c0d03c48755.tar.gz) = 1564925 SIZE (rlcevg-CircuitAI-edc74149c281e2140f28c091ed74310c11611cc7.tar.gz) = 1381839 SIZE (skypjack-entt-e4ccb878f47245a319704912435d3c89f34ad6be.tar.gz) = 678128 SIZE (spring-SpringMapConvNG-0ddd86eaa8871dc0833c69f931f55cd856c5009d.tar.gz) = 21487 Index: patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp =================================================================== RCS file: /cvs/ports/games/recoil-rts/patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp,v diff -u -p -r1.2 patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp --- patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp 6 May 2024 00:29:29 -0000 1.2 +++ patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp 16 Jun 2024 05:37:37 -0000 @@ -3,7 +3,7 @@ fix C++17 error when working with sortin Index: AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp --- AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp.orig +++ AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp -@@ -552,7 +552,9 @@ void CEconomyManager::Init() +@@ -542,7 +542,9 @@ void CEconomyManager::Init() ? (mspInfoEnd.pull - mspInfoBegin.pull) / (mspInfoEnd.mex - mspInfoBegin.mex) : 0.f; } Index: patches/patch-rts_Lua_LuaUtils_cpp =================================================================== RCS file: patches/patch-rts_Lua_LuaUtils_cpp diff -N patches/patch-rts_Lua_LuaUtils_cpp --- patches/patch-rts_Lua_LuaUtils_cpp 5 May 2024 17:18:12 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -avoid collision with ctype.h macro _L - -Index: rts/Lua/LuaUtils.cpp ---- rts/Lua/LuaUtils.cpp.orig -+++ rts/Lua/LuaUtils.cpp -@@ -1391,9 +1391,9 @@ int LuaUtils::PushDebugTraceback(lua_State* L) - - - --LuaUtils::ScopedDebugTraceBack::ScopedDebugTraceBack(lua_State* _L) -- : L(_L) -- , errFuncIdx(PushDebugTraceback(_L)) -+LuaUtils::ScopedDebugTraceBack::ScopedDebugTraceBack(lua_State* L) -+ : L(L) -+ , errFuncIdx(PushDebugTraceback(L)) - { - assert(errFuncIdx >= 0); - }
