From df22d2cc0c4b4b6717495700bf41ab7050e58e88 Mon Sep 17 00:00:00 2001
From: pal1000 <liviuprodea@yahoo.com>
Date: Thu, 14 Mar 2024 20:38:54 -0700
Subject: [PATCH] LLVM MSVC build: Fix configuration for LLVM>=17 when its
 source is freshly cloned LLVM 18 doesn't allow this defect anymore, fixes
 6f33b110

---
 buildscript/modules/libva.cmd            | 2 +-
 buildscript/modules/llvm.cmd             | 1 +
 buildscript/modules/mesonsubprojects.cmd | 4 ++--
 releasenotes.md                          | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildscript/modules/libva.cmd b/buildscript/modules/libva.cmd
index 1dedf83d..b67db8ad 100644
--- a/buildscript/modules/libva.cmd
+++ b/buildscript/modules/libva.cmd
@@ -11,7 +11,7 @@
 @cd libva
 @for /f tokens^=2^ delims^=/^ eol^= %%a in ('git symbolic-ref --short refs/remotes/origin/HEAD 2^>^&^1') do @git checkout %%a
 @git pull --progress --tags --recurse-submodules origin
-@git checkout 2.20.0
+@git checkout 2.21.0
 )
 @IF %gitstate% GTR 0 echo.
 @IF "%pkgconfigstate%"=="0" GOTO nolibva
diff --git a/buildscript/modules/llvm.cmd b/buildscript/modules/llvm.cmd
index 66790093..b3b86e69 100644
--- a/buildscript/modules/llvm.cmd
+++ b/buildscript/modules/llvm.cmd
@@ -35,6 +35,7 @@
 @git checkout -f FETCH_HEAD
 @git clean -df
 @echo.
+@set llvmsrcver=%updllvmsrcver:.=%
 )
 
 @rem Apply is_trivially_copyable patch
diff --git a/buildscript/modules/mesonsubprojects.cmd b/buildscript/modules/mesonsubprojects.cmd
index f6f499fe..10b5fb97 100644
--- a/buildscript/modules/mesonsubprojects.cmd
+++ b/buildscript/modules/mesonsubprojects.cmd
@@ -96,10 +96,10 @@ set "exitloop="
 )
 @if %gitstate% GTR 0 for /f delims^=^ eol^= %%a in ('dir /b /a^:d "%devroot%\mesa\subprojects\DirectX-Header*" 2^>^&1') do @IF EXIST "%devroot%\mesa\subprojects\%%~nxa\" (
 @cd "%devroot%\mesa\subprojects\%%~nxa"
-@rem echo Using DirectX-Headers stable release...
+@echo Using DirectX-Headers stable release...
 @for /f tokens^=2^ delims^=/^ eol^= %%a in ('git symbolic-ref --short refs/remotes/origin/HEAD 2^>^&^1') do @git checkout %%a
 @git pull -f --progress --tags --recurse-submodules origin
-@git checkout 7a9f4d06911d30eecb56a4956dab29dcca2709ed
+@git checkout v1.613.0
 @cd "%devroot%\mesa"
 )
 @if %gitstate% GTR 0 echo.
diff --git a/releasenotes.md b/releasenotes.md
index 691c571f..d2718c57 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,3 +1,5 @@
+### Build script
+- LLVM MSVC build: Fix configuration for LLVM>=17 when its source is freshly cloned, LLVM 18 doesn't allow this defect anymore, fixes 6f33b110.
 ### Distribution
 - There is no need to patch Vulkan drivers JSON files to fix them since 24.1.0-devel, [Vulkan JSON generation has been fixed](https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27468).
 # 24.0.2