From ab8567fdca845e25c36b9af6a570771eba206c60 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Thu, 27 Aug 2026 16:53:53 +0500 Subject: [PATCH] build-deps: point to the existing `remove_tr1.patch` Tested that it applies cleanly even though commit is outdated. --- win/build-deps.cmd | 4 +++- .../OpenCOLLADA_CommonFWriteBufferFlusher_tr1.patch | 13 ------------- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 win/patches/OpenCOLLADA_CommonFWriteBufferFlusher_tr1.patch diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 5d7e96580d..2e5e2636f8 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -42,6 +42,7 @@ echo. setlocal EnableDelayedExpansion set SCRIPT_DIR=%~dp0 +for %%I in ("%SCRIPT_DIR%..") do set "REPO_ROOT=%%~fI" :: Make sure vcvarsall.bat is called and dev env set is up. IF "%VSINSTALLDIR%"=="" ( @@ -453,6 +454,7 @@ set DEPENDENCY_INSTALL_NAME=OpenCOLLADA set NEXT_DEPENDENCY_LABEL=OCCT :: Always clone it, even if it's installed, because it contains xml headers we need. :: Use a fixed revision in order to prevent introducing breaking changes +:: TODO: commit is almost 3 years behind the latest version used in nix/build-all.py, need to test and bump. call :GitCloneAndCheckoutRevision https://github.com/KhronosGroup/OpenCOLLADA.git "%DEPENDENCY_DIR%" 064a60b65c2c31b94f013820856bc84fb1937cc6 call :CheckInstallation @@ -467,7 +469,7 @@ IF NOT %ERRORLEVEL%==0 git apply --reject --whitespace=fix "%~dp0patches\OpenCOL :: std::tr1::unordered_map was a legacy MSVC compatibility shim kept around through VS2022's STL, but newer :: toolsets (e.g. VS2026/v145) no longer provide it, breaking the build with error C2039: 'tr1' is not a member of 'std'. findstr /C:"typedef std::unordered_map MarkIdToFilePos;" common\libBuffer\include\CommonFWriteBufferFlusher.h>NUL -IF NOT %ERRORLEVEL%==0 git apply --reject --whitespace=fix "%~dp0patches\OpenCOLLADA_CommonFWriteBufferFlusher_tr1.patch" --ignore-whitespace +IF NOT %ERRORLEVEL%==0 git apply --reject --whitespace=fix "%REPO_ROOT%\nix\patches\opencollada\remove_tr1.patch" --ignore-whitespace :: NOTE OpenCOLLADA has been observed to have problems with switching between debug and release builds so :: uncomment to following line in order to delete the CMakeCache.txt always if experiencing problems. REM IF EXIST "%DEPENDENCY_DIR%\%BUILD_DIR%\CMakeCache.txt". del "%DEPENDENCY_DIR%\%BUILD_DIR%\CMakeCache.txt" diff --git a/win/patches/OpenCOLLADA_CommonFWriteBufferFlusher_tr1.patch b/win/patches/OpenCOLLADA_CommonFWriteBufferFlusher_tr1.patch deleted file mode 100644 index 9e2a62b5b6..0000000000 --- a/win/patches/OpenCOLLADA_CommonFWriteBufferFlusher_tr1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common/libBuffer/include/CommonFWriteBufferFlusher.h b/common/libBuffer/include/CommonFWriteBufferFlusher.h -index c7af45b2..62b0f991 100644 ---- a/common/libBuffer/include/CommonFWriteBufferFlusher.h -+++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h -@@ -58,7 +58,7 @@ namespace Common - #else - typedef __int64 FilePosType; - #endif -- typedef std::tr1::unordered_map MarkIdToFilePos; -+ typedef std::unordered_map MarkIdToFilePos; - - public: - static const size_t DEFAUL_BUFFER_SIZE = 64*1024;