update sdl to 3.2.26

to include git log depth for better sorting in the release page

.github/workflows/cd.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0
@@ -34,15 +34,7 @@ jobs:
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
+      run: . .github/workflows/tag_version.bash
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
 
     - name: Compress artifacts
       shell: bash
@@ -78,12 +70,12 @@ jobs:
             ndk_abi: x86_64
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         repository: 'Green-Sky/vcpkg_android_triplets'
         path: 'vcpkg_android_triplets'
@@ -141,15 +133,7 @@ jobs:
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
+      run: . .github/workflows/tag_version.bash
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
 
     - name: rename apk
       id: rename_apk
@@ -178,7 +162,7 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0
@@ -204,8 +188,18 @@ jobs:
     #- uses: ilammy/setup-nasm@v1
 
     - name: Configure CMake
+      env:
+        CXXFLAGS: "/D_MSVC_STL_HARDENING=1"
       # TODO: og asan had this -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
-      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DTOMATO_BREAKPAD=ON -DTOMATO_TOX_AV=ON -DTOMATO_ASAN=${{matrix.type == 'asan' && 'ON' || 'OFF'}}
+      run: cmake -G Ninja
+        -B ${{github.workspace}}/build
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+        -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON
+        -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF
+        -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
+        -DTOMATO_BREAKPAD=ON -DTOMATO_TOX_AV=ON
+        -DTOMATO_ASAN=${{matrix.type == 'asan' && 'ON' || 'OFF'}}
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -t tomato
@@ -213,15 +207,7 @@ jobs:
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
+      run: . .github/workflows/tag_version.bash
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
 
     - name: Clean temporary artifacts
       # msvc sometimes produces .ilk files, which are used for linking only
@@ -265,22 +251,15 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
+        fetch-depth: 0
 
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
+      run: . .github/workflows/tag_version.bash
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
 
     - name: Install Dependencies
       run: sudo apt update && sudo apt -y install unar
@@ -337,22 +316,15 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
+        fetch-depth: 0
 
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
+      run: . .github/workflows/tag_version.bash
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
 
     - name: Download artifacts
       id: download-artifact

.github/workflows/ci.yml

@@ -179,7 +179,15 @@ jobs:
         arch: amd64
 
     - name: Configure CMake
-      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
+      env:
+        CXXFLAGS: "/D_MSVC_STL_HARDENING=1"
+      run: cmake -G Ninja
+        -B ${{github.workspace}}/build
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+        -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON
+        -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF
+        -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato

.github/workflows/tag_version.bash

@@ -0,0 +1,10 @@
+# taken from llama.cpp
+# needs BRANCH_NAME set
+SHORT_HASH="$(git rev-parse --short=7 HEAD)"
+DEPTH="$(git rev-list --count HEAD)"
+if [[ "${BRANCH_NAME}" == "master" ]]; then
+	echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT
+else
+	SAFE_NAME=$(echo "${BRANCH_NAME}" | tr '/' '-')
+	echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
+fi

external/sdl/CMakeLists.txt

@@ -55,7 +55,8 @@ if (NOT TARGET SDL3::SDL3)
 		#GIT_TAG f6864924f76e1a0b4abaefc76ae2ed22b1a8916e # tip 05-03-2025 (3.2.8)
 		#GIT_TAG 877399b2b2cf21e67554ed9046410f268ce1d1b2 # 3.2.10
 		#GIT_TAG 5ac37a8ffcf89da390404c1016833d56e2d67ae4 # 3.2.12
-		GIT_TAG a8589a84226a6202831a3d49ff4edda4acab9acd # 3.2.24
+		#GIT_TAG a8589a84226a6202831a3d49ff4edda4acab9acd # 3.2.24
+		GIT_TAG badbf8da4ee72b3ef599c721ffc9899e8d7c8d90 # 3.2.26
 
 		FIND_PACKAGE_ARGS # for the future
 	)

flake.lock

@@ -119,17 +119,17 @@
     "sdl3": {
       "flake": false,
       "locked": {
-        "lastModified": 1759427552,
+        "lastModified": 1761843138,
-        "narHash": "sha256-LUkj9Rrf+zOW0IdV7aGccb/5bKh3TWf1IGtQkCDHd4k=",
+        "narHash": "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k=",
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "a8589a84226a6202831a3d49ff4edda4acab9acd",
+        "rev": "badbf8da4ee72b3ef599c721ffc9899e8d7c8d90",
         "type": "github"
       },
       "original": {
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "a8589a84226a6202831a3d49ff4edda4acab9acd",
+        "rev": "badbf8da4ee72b3ef599c721ffc9899e8d7c8d90",
         "type": "github"
       }
     },

flake.nix

@@ -13,7 +13,7 @@
       flake = false;
     };
     sdl3 = {
-      url = "github:libsdl-org/SDL/a8589a84226a6202831a3d49ff4edda4acab9acd"; # keep in sync with cmake
+      url = "github:libsdl-org/SDL/badbf8da4ee72b3ef599c721ffc9899e8d7c8d90"; # keep in sync with cmake
       flake = false;
     };
     sdl3_image = {