Build broken on master

[R-Goc]

Master doesn't build from a clean state, failing when patching imgui-populate.

-- CPM: Adding package ImGui@1.92.8 (v1.92.8-docking to E:/Caches/cpm/imgui/eff6278e890fa4456dacbb781970d8fbac129b28)
-- Populating imgui
-- Configuring done (0.1s)
-- Generating done (0.1s)
-- Build files have been written to: E:/lib/tracy/profiler/build/_deps/imgui-subbuild
[1/9] Creating directories for 'imgui-populate'
[1/9] Performing download step (git clone) for 'imgui-populate'
Cloning into 'eff6278e890fa4456dacbb781970d8fbac129b28'...
HEAD is now at b61e563 Merge branch 'master' into docking
[2/9] Performing update step for 'imgui-populate'
-- Already at requested tag: v1.92.8-docking
[3/9] Performing patch step for 'imgui-populate'
patching file imconfig.h
patching file backends/imgui_impl_opengl3_loader.h
Hunk 1 FAILED 180/180.
 #define GL_VERSION                        0x1F02
 #define GL_EXTENSIONS                     0x1F03
 #define GL_LINEAR                         0x2601
+#define GL_LINEAR_MIPMAP_LINEAR           0x2703
 #define GL_TEXTURE_MAG_FILTER             0x2800
 #define GL_TEXTURE_MIN_FILTER             0x2801
 #define GL_TEXTURE_WRAP_S                 0x2802
FAILED: [code=1] imgui-populate-prefix/src/imgui-populate-stamp/imgui-populate-patch E:/lib/tracy/profiler/build/_deps/imgui-subbuild/imgui-populate-prefix/src/imgui-populate-stamp/imgui-populate-patch
C:\WINDOWS\system32\cmd.exe /C "cd /D E:\Caches\cpm\imgui\eff6278e890fa4456dacbb781970d8fbac129b28 && C:\Users\rysza\.w64devkit\w64devkit\bin\patch.exe -p1 < E:/lib/tracy/cmake/imgui-emscripten.patch && C:/Users/rysza/.w64devkit/w64devkit/bin/patch.exe -p1 < E:/lib/tracy/cmake/imgui-loader.patch && "C:\Program Files\Microsoft Visual Studio\18\Insiders\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -E touch E:/lib/tracy/profiler/build/_deps/imgui-subbuild/imgui-populate-prefix/src/imgui-populate-stamp/imgui-populate-patch"
ninja: build stopped: subcommand failed.
CMake Error at C:/Program Files/Microsoft Visual Studio/18/Insiders/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-4.3/Modules/FetchContent.cmake:1931 (message):
  Build step for imgui failed: 1
Call Stack (most recent call first):
  C:/Program Files/Microsoft Visual Studio/18/Insiders/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-4.3/Modules/FetchContent.cmake:1622 (__FetchContent_populateSubbuild)
  C:/Program Files/Microsoft Visual Studio/18/Insiders/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-4.3/Modules/FetchContent.cmake:2010 (__FetchContent_doPopulation)
  C:/Program Files/Microsoft Visual Studio/18/Insiders/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-4.3/Modules/FetchContent.cmake:1991:EVAL:1 (__FetchContent_Populate)
  C:/Program Files/Microsoft Visual Studio/18/Insiders/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-4.3/Modules/FetchContent.cmake:1991 (cmake_language)
  E:/lib/tracy/cmake/CPM.cmake:1106 (FetchContent_Populate)
  E:/lib/tracy/cmake/CPM.cmake:895 (cpm_fetch_package)
  E:/lib/tracy/cmake/vendor.cmake:137 (CPMAddPackage)
  CMakeLists.txt:34 (include)

[wolfpld]

Not what CI shows.

Problems like this are caused by programs putting random stuff like broken patch.exe into PATH.

[R-Goc]

Yeah I looked at what patch it was using and it's from busybox. What patch version do you recommend for windows? I haven't had problems with this one yet, and I'm not exactly sure what else to use

[R-Goc]

Tried with patch that comes shipped with Perl:

[3/9] Performing patch step for 'imgui-populate'
patching file imconfig.h
Assertation failed!

Program: C:\Strawberry\c\bin\patch.exe
File: .\src\patch\2.5.9\patch-2.5.9-src\patch.c, Line 354

This is a bit absurd

[wolfpld]

Patch 2.5.9 is 22 years old.

[R-Goc]

That's what latest strawberry Perl ships. The one from the latest BusyBox doesn't work either.

[R-Goc]

I built the latest stable patch release from source(way more effort than I expected) and this still fails:

-- Already at requested tag: v1.92.8-docking
[3/9] Performing patch step for 'imgui-populate'
patching file imconfig.h
Hunk #1 FAILED at 113 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file imconfig.h.rej
FAILED: [code=1] imgui-populate-prefix/src/imgui-populate-stamp/imgui-populate-patch E:/lib/tracy/profiler/build/_deps/imgui-subbuild/imgui-populate-prefix/src/imgui-populate-stamp/imgui-populate-patch
C:\WINDOWS\system32\cmd.exe /C "cd /D E:\Caches\cpm\imgui\2bcfa7684f8fd0d62d17337007aac0d97b30cb0f && E:\local\bin\patch.exe -p1 < E:/lib/tracy/cmake/imgui-emscripten.patch && E:/local/bin/patch.exe -p1 < E:/lib/tracy/cmake/imgui-loader.patch && "C:\Program Files\Microsoft Visual Studio\18\Insiders\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -E touch E:/lib/tracy/profiler/build/_deps/imgui-subbuild/imgui-populate-prefix/src/imgui-populate-stamp/imgui-populate-patch"
ninja: build stopped: subcommand failed.

[R-Goc]

So the fault is actually not patch. The patch file itself contains LF line endings, while the source that gets downloaded contains CRLF. See the source file:

cat -A E:\Caches\cpm\imgui\2bcfa7684f8fd0d62d17337007aac0d97b30cb0f\backends\imgui_impl_opengl3_loader.h
//-----------------------------------------------------------------------------^M$
// About imgui_impl_opengl3_loader.h:^M$
//^M$
// We embed our own OpenGL loader to not require user to provide their own or to have to use ours,^M$
// which proved to be endless problems for users.^M$
// Our loader is custom-generated, based on gl3w but automatically filtered to only include^M$
// enums/functions that we use in our imgui_impl_opengl3.cpp source file in order to be small.^M$

And the patch file:

cat -A E:/lib/tracy/cmake/imgui-loader.patch
diff --git i/backends/imgui_impl_opengl3_loader.h w/backends/imgui_impl_opengl3_loader.h$
index 4ca0536..a1ff572 100644$
--- i/backends/imgui_impl_opengl3_loader.h$
+++ w/backends/imgui_impl_opengl3_loader.h$
@@ -180,6 +180,7 @@ typedef khronos_uint8_t GLubyte;$
 #define GL_VERSION                        0x1F02$
 #define GL_EXTENSIONS                     0x1F03$
 #define GL_LINEAR                         0x2601$
+#define GL_LINEAR_MIPMAP_LINEAR           0x2703$
 #define GL_TEXTURE_MAG_FILTER             0x2800$
 #define GL_TEXTURE_MIN_FILTER             0x2801$

My global git config has autocrlf set to false so I'm not sure where those are coming from.

[R-Goc]

Well they come from here: https://github.com/ocornut/imgui/blob/master/.gitattributes
Not sure what I'm supposed to do about this? Also not sure how that works in CI then

[R-Goc]

I solved this by recloning tracy with autocrlf set to true. Also building with clang-cl fails in the freetype build with this error:

Building RC object _deps\freetype-build\CMakeFiles\freetype.dir\src\base\ftver.rc.res
FAILED: [code=1] _deps/freetype-build/CMakeFiles/freetype.dir/src/base/ftver.rc.res
ccache C:/PROGRA~1/MICROS~4/18/Insiders/Common7/IDE/COMMON~1/MICROS~1/CMake/CMake/bin/cmcldeps.exe RC E:\Caches\cpm\freetype\adf3abb0a96c3adc6d84b8bfd7172192db267d75\src\base\ftver.rc _deps\freetype-build\CMakeFiles\freetype.dir\src\base\ftver.rc.res.d _deps\freetype-build\CMakeFiles\freetype.dir\src\base\ftver.rc.res "Note: including file: " "E:/LLVM/bin/clang-cl.exe" C:\PROGRA~2\WI3CF2~1\10\bin\100261~1.0\x64\rc.exe -DFT2_BUILD_LIBRARY -DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR -I E:\lib\tracy\profiler\build\_deps\freetype-build\include -I E:\Caches\cpm\freetype\adf3abb0a96c3adc6d84b8bfd7172192db267d75\include -I E:\lib\tracy\profiler\build\_deps\freetype-build\include\freetype\config -DWIN32 /fo _deps\freetype-build\CMakeFiles\freetype.dir\src\base\ftver.rc.res E:\Caches\cpm\freetype\adf3abb0a96c3adc6d84b8bfd7172192db267d75\src\base\ftver.rc
clang-cl: error: no such file or directory: '/fo'