Support 2024 12 (#146)

* update imgui * update nix shell * update sdl and spdlog * better detection of core count on macos * format + tidy + imgui iwyu + macos13 runner * clang-format acting weird
krupkat · Dec 31, 2024 · c18458d · c18458d
1 parent 11a00d4
commit c18458d
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,10 +12,10 @@ permissions:
 
 env:
   BUILD_TYPE: Release
-  SDL_VERSION: "release-2.30.7"
+  SDL_VERSION: "release-2.30.10"
   OPENCV_VERSION: "4.10.0"
   CATCH_VERSION: "v3.7.1"
-  SPDLOG_VERSION: "v1.14.1"
+  SPDLOG_VERSION: "v1.15.0"
   EXIV2_VERSION: "v0.28.3"
   GENERATOR: "Ninja Multi-Config"
 
@@ -385,7 +385,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-12, macos-14]
+        os: [macos-13, macos-14]
 
     steps:
     - uses: actions/checkout@v4
@@ -412,7 +412,7 @@ jobs:
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
           -DCMAKE_INSTALL_PREFIX=install \
           `cat ../misc/build/opencv-minimal-flags.txt`
-        cmake --build build --target install -j $(nproc)
+        cmake --build build --target install -j `sysctl -n hw.logicalcpu`
         cd ..
 
     - name: Cache exiv2
@@ -430,7 +430,7 @@ jobs:
         cmake -B build \
           -DCMAKE_INSTALL_PREFIX=install \
           `cat ../misc/build/exiv2-minimal-flags.txt`
-        cmake --build build --target install -j $(nproc)
+        cmake --build build --target install -j `sysctl -n hw.logicalcpu`
         cd ..
 
     - name: Configure CMake
@@ -444,7 +444,7 @@ jobs:
           -Dexiv2_ROOT=exiv2/install
 
     - name: Build
-      run: cmake --build build -j $(nproc) --target install
+      run: cmake --build build -j `sysctl -n hw.logicalcpu` --target install
 
     - name: Run Tests
       run: |

diff --git a/external/imgui b/external/imgui
diff --git a/misc/build/build-bullseye.sh b/misc/build/build-bullseye.sh
@@ -1,8 +1,8 @@
 export BUILD_TYPE='Release'
-export SDL_VERSION='release-2.30.7'
+export SDL_VERSION='release-2.30.10'
 # export OPENCV_VERSION='4.10.0'
 export CATCH_VERSION='v3.7.1'
-export SPDLOG_VERSION='v1.14.1'
+export SPDLOG_VERSION='v1.15.0'
 export EXIV2_VERSION='v0.28.3'
 # export GENERATOR='Ninja Multi-Config'
 

diff --git a/misc/build/build-macos.sh b/misc/build/build-macos.sh
@@ -1,10 +1,10 @@
 # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action
 
 export BUILD_TYPE='Release'
-export SDL_VERSION='release-2.30.7'
+export SDL_VERSION='release-2.30.10'
 export OPENCV_VERSION='4.10.0'
 export CATCH_VERSION='v3.7.1'
-export SPDLOG_VERSION='v1.14.1'
+export SPDLOG_VERSION='v1.15.0'
 export EXIV2_VERSION='v0.28.3'
 export GENERATOR='Ninja Multi-Config'
 
@@ -18,7 +18,7 @@ cmake -B build \
   -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
   -DCMAKE_INSTALL_PREFIX=install \
   `cat ../misc/build/opencv-minimal-flags.txt`
-cmake --build build --target install -j $(nproc)
+cmake --build build --target install -j `sysctl -n hw.logicalcpu`
 cd ..
 
 
@@ -27,7 +27,7 @@ cd exiv2
 cmake -B build \
   -DCMAKE_INSTALL_PREFIX=install \
   `cat ../misc/build/exiv2-minimal-flags.txt`
-cmake --build build --target install -j $(nproc)
+cmake --build build --target install -j `sysctl -n hw.logicalcpu`
 cd ..
 
 cmake -B build \
@@ -38,7 +38,7 @@ cmake -B build \
   -DOpenCV_ROOT=opencv/install \
   -Dexiv2_ROOT=exiv2/install
 
-cmake --build build -j $(nproc) --target install
+cmake --build build -j `sysctl -n hw.logicalcpu` --target install
 cd build
 ctest --output-on-failure
 cd ..

diff --git a/misc/build/build-ubuntu-20.sh b/misc/build/build-ubuntu-20.sh
@@ -1,10 +1,10 @@
 # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action
 
 export BUILD_TYPE='Release'
-export SDL_VERSION='release-2.30.7'
+export SDL_VERSION='release-2.30.10'
 export OPENCV_VERSION='4.10.0'
 export CATCH_VERSION='v3.7.1'
-export SPDLOG_VERSION='v1.14.1'
+export SPDLOG_VERSION='v1.15.0'
 export EXIV2_VERSION='v0.28.3'
 export GENERATOR='Ninja Multi-Config'
 

diff --git a/misc/build/build-ubuntu-22.sh b/misc/build/build-ubuntu-22.sh
@@ -1,10 +1,10 @@
 # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action
 
 export BUILD_TYPE='Release'
-export SDL_VERSION='release-2.30.7'
+export SDL_VERSION='release-2.30.10'
 export OPENCV_VERSION='4.10.0'
 export CATCH_VERSION='v3.7.1'
-export SPDLOG_VERSION='v1.14.1'
+export SPDLOG_VERSION='v1.15.0'
 export EXIV2_VERSION='v0.28.3'
 export GENERATOR='Ninja Multi-Config'
 

diff --git a/misc/build/build-universal.sh b/misc/build/build-universal.sh
@@ -1,8 +1,8 @@
 export BUILD_TYPE='Release'
-export SDL_VERSION='release-2.30.7'
+export SDL_VERSION='release-2.30.10'
 export OPENCV_VERSION='4.10.0'
 export CATCH_VERSION='v3.7.1'
-export SPDLOG_VERSION='v1.14.1'
+export SPDLOG_VERSION='v1.15.0'
 export EXIV2_VERSION='v0.28.3'
 export GENERATOR='Ninja Multi-Config'
 export C_COMPILER='gcc'

diff --git a/misc/build/build-windows-latest.ps1 b/misc/build/build-windows-latest.ps1
@@ -1,10 +1,10 @@
 # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action
 
 $env:BUILD_TYPE = 'Release'
-$env:SDL_VERSION = 'release-2.30.7'
+$env:SDL_VERSION = 'release-2.30.10'
 $env:OPENCV_VERSION = '4.10.0'
 $env:CATCH_VERSION = 'v3.7.1'
-$env:SPDLOG_VERSION = 'v1.14.1'
+$env:SPDLOG_VERSION = 'v1.15.0'
 $env:EXIV2_VERSION = 'v0.28.3'
 $env:GENERATOR = 'Ninja Multi-Config'
 

diff --git a/misc/build/nix/default.nix b/misc/build/nix/default.nix
@@ -13,6 +13,6 @@ pkgs.mkShell {
     exiv2
     dbus
     (python3.withPackages (pkgs: with pkgs; [ pyyaml ]))
-    clang-tools_15
+    clang-tools_18
   ];
 }
diff --git a/xpano/utils/fmt.h b/xpano/utils/fmt.h
@@ -8,6 +8,10 @@
 
 #include <spdlog/fmt/fmt.h>
 
+#if FMT_VERSION >= 110000
+#include <spdlog/fmt/bundled/ranges.h>  // fmt::join moved here in fmt 11.0.0
+#endif
+
 #else
 
 #include <fmt/core.h>
+1 −1		.github/workflows/static-analysis.yml
+21 −20		backends/imgui_impl_allegro5.cpp
+5 −5		backends/imgui_impl_allegro5.h
+3 −3		backends/imgui_impl_android.cpp
+3 −3		backends/imgui_impl_android.h
+99 −86		backends/imgui_impl_dx10.cpp
+2 −2		backends/imgui_impl_dx10.h
+116 −93		backends/imgui_impl_dx11.cpp
+14 −2		backends/imgui_impl_dx11.h
+139 −67		backends/imgui_impl_dx12.cpp
+44 −16		backends/imgui_impl_dx12.h
+127 −115		backends/imgui_impl_dx9.cpp
+2 −1		backends/imgui_impl_dx9.h
+30 −13		backends/imgui_impl_glfw.cpp
+3 −3		backends/imgui_impl_glfw.h
+3 −2		backends/imgui_impl_glut.cpp
+3 −2		backends/imgui_impl_glut.h
+1 −1		backends/imgui_impl_metal.h
+18 −19		backends/imgui_impl_metal.mm
+17 −13		backends/imgui_impl_opengl2.cpp
+2 −0		backends/imgui_impl_opengl2.h
+28 −23		backends/imgui_impl_opengl3.cpp
+1 −1		backends/imgui_impl_opengl3.h
+6 −0		backends/imgui_impl_opengl3_loader.h
+3 −3		backends/imgui_impl_osx.h
+11 −11		backends/imgui_impl_osx.mm
+24 −22		backends/imgui_impl_sdl2.cpp
+5 −5		backends/imgui_impl_sdl2.h
+29 −29		backends/imgui_impl_sdl3.cpp
+5 −5		backends/imgui_impl_sdl3.h
+20 −9		backends/imgui_impl_sdlrenderer2.cpp
+10 −1		backends/imgui_impl_sdlrenderer2.h
+22 −11		backends/imgui_impl_sdlrenderer3.cpp
+10 −1		backends/imgui_impl_sdlrenderer3.h
+127 −96		backends/imgui_impl_vulkan.cpp
+35 −19		backends/imgui_impl_vulkan.h
+48 −17		backends/imgui_impl_wgpu.cpp
+12 −2		backends/imgui_impl_wgpu.h
+110 −85		backends/imgui_impl_win32.cpp
+2 −2		backends/imgui_impl_win32.h
+821 −242		docs/CHANGELOG.txt
+20 −19		docs/FAQ.md
+2 −2		docs/README.md
+4 −6		docs/TODO.txt
+1 −1		examples/example_android_opengl3/main.cpp
+3 −0		examples/example_glfw_opengl3/Makefile.emscripten
+7 −1		examples/example_glfw_opengl3/main.cpp
+1 −1		examples/example_glfw_vulkan/CMakeLists.txt
+2 −2		examples/example_glfw_vulkan/build_win32.bat
+4 −3		examples/example_glfw_vulkan/build_win64.bat
+4 −4		examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj
+3 −0		examples/example_glfw_wgpu/Makefile.emscripten
+3 −0		examples/example_sdl2_opengl3/Makefile.emscripten
+14 −1		examples/example_sdl2_opengl3/main.cpp
+5 −1		examples/example_sdl2_vulkan/build_win32.bat
+14 −0		examples/example_sdl2_vulkan/build_win64.bat
+5 −5		examples/example_sdl2_vulkan/example_sdl2_vulkan.vcxproj
+3 −0		examples/example_sdl3_opengl3/Makefile.emscripten
+7 −1		examples/example_sdl3_opengl3/build_win32.bat
+14 −0		examples/example_sdl3_opengl3/build_win64.bat
+15 −2		examples/example_sdl3_opengl3/main.cpp
+1 −1		examples/example_sdl3_sdlrenderer3/main.cpp
+14 −0		examples/example_sdl3_vulkan/build_win32.bat
+14 −0		examples/example_sdl3_vulkan/build_win64.bat
+190 −0		examples/example_sdl3_vulkan/example_sdl3_vulkan.vcxproj
+64 −0		examples/example_sdl3_vulkan/example_sdl3_vulkan.vcxproj.filters
+607 −0		examples/example_sdl3_vulkan/main.cpp
+1 −2		examples/example_win32_directx12/build_win32.bat
+5 −5		examples/example_win32_directx12/example_win32_directx12.vcxproj
+81 −28		examples/example_win32_directx12/main.cpp
+10 −0		examples/imgui_examples.sln
+13 −5		imconfig.h
+960 −523		imgui.cpp
+173 −134		imgui.h
+86 −27		imgui_demo.cpp
+318 −172		imgui_draw.cpp
+184 −328		imgui_internal.h
+8 −4		imgui_tables.cpp
+255 −179		imgui_widgets.cpp
+51 −15		misc/fonts/binary_to_compressed_c.cpp
+22 −4		misc/freetype/README.md
+29 −11		misc/freetype/imgui_freetype.cpp
+7 −0		misc/freetype/imgui_freetype.h