diff --git a/buildinfo/msvc.txt b/buildinfo/msvc.txt
index 3b03f0f..9b56fc5 100644
--- a/buildinfo/msvc.txt
+++ b/buildinfo/msvc.txt
@@ -3,7 +3,7 @@ Build environment
 Windows 10.0.20348
 Ressource Hacker 5.2.7.427
 7-Zip 24.08 ultra compression
-Git 2.47.0.2
+Git 2.47.1.1
 Visual Studio Build Tools 2022 v17.11.6
 Windows SDK 10.1.26100.1742
 Windows Driver Kit 10.1.26100.2161
@@ -17,11 +17,11 @@ MarkupSafe 3.0.2
 meson      1.6.0
 pip        24.3.1
 PyYAML     6.0.2
-setuptools 75.5.0
+setuptools 75.6.0
 
-CMake 3.31.0
+CMake 3.31.1
 Ninja 1.12.1
-LLVM 19.1.3
+LLVM 19.1.4
 SPIRV Tools 2024.4.1
 flex 2.6.4
 Bison 3.8.2
diff --git a/buildscript/modules/llvm.cmd b/buildscript/modules/llvm.cmd
index 8a61621..11d53ae 100644
--- a/buildscript/modules/llvm.cmd
+++ b/buildscript/modules/llvm.cmd
@@ -12,7 +12,7 @@
 @if /I NOT "%cfgllvmbuild%"=="y" GOTO skipllvm
 
 @rem Get/update LLVM source code
-@set updllvmsrcver=19.1.3
+@set updllvmsrcver=19.1.4
 @if /I "%legacyllvm%"=="y" set updllvmsrcver=18.1.8
 @set llvmsrcver=0
 @set llvmsrcloc="%devroot%\llvm-project\cmake\Modules\LLVMVersion.cmake"
diff --git a/buildscript/modules/mesa3d.cmd b/buildscript/modules/mesa3d.cmd
index f593fb9..9a865b4 100644
--- a/buildscript/modules/mesa3d.cmd
+++ b/buildscript/modules/mesa3d.cmd
@@ -70,9 +70,6 @@
 @IF %disableootpatch%==1 GOTO configmesabuild
 
 @REM Collect information about Mesa3D code. Apply out of tree patches.
-@echo Ensure Python virtual environment compatibility...
-@"%devroot%\%projectname%\buildscript\assets\venv\Scripts\python.exe" "%devroot%\%projectname%\buildscript\modules\venvcompat.py"
-@echo.
 
 @rem Enable S3TC texture cache
 @IF %intmesaver% NEQ 23200 IF %intmesaver% NEQ 23201 IF %intmesaver% NEQ 23202 call "%devroot%\%projectname%\buildscript\modules\applypatch.cmd" s3tc
diff --git a/buildscript/modules/pythonpackages.cmd b/buildscript/modules/pythonpackages.cmd
index 1003af0..30e7003 100644
--- a/buildscript/modules/pythonpackages.cmd
+++ b/buildscript/modules/pythonpackages.cmd
@@ -18,6 +18,10 @@
 )
 @call "%devroot%\%projectname%\buildscript\assets\venv\Scripts\activate.bat"
 
+@echo Ensure Python virtual environment compatibility...
+@copy /Y "%devroot%\%projectname%\buildscript\assets\venv\Scripts\python.exe" "%devroot%\%projectname%\buildscript\assets\venv\Scripts\python3.exe"
+@echo.
+
 @setlocal
 @rem Install missing python packages.
 @rem State tracking is irrelevant for Python packages as they can easily be added via Pypi if missing.
diff --git a/buildscript/modules/venvcompat.py b/buildscript/modules/venvcompat.py
deleted file mode 100644
index 0a08afa..0000000
--- a/buildscript/modules/venvcompat.py
+++ /dev/null
@@ -1,13 +0,0 @@
-def search_and_replace(file_path, search_word, replace_word):
-   with open(file_path, 'r') as file:
-      file_contents = file.read()
-
-      updated_contents = file_contents.replace(search_word, replace_word)
-
-   with open(file_path, 'w') as file:
-      file.write(updated_contents)
-
-file_path = 'meson.build'
-search_word = '\'python3\''
-replace_word = ''
-search_and_replace(file_path, search_word, replace_word)
\ No newline at end of file
diff --git a/releasenotes.md b/releasenotes.md
index 94da8a4..1144bc6 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,6 +1,7 @@
 ### Build script
 - MSVC: Implement [workaround](https://github.com/mpv-player/mpv/pull/15325) for [lp_test_arit build failure](https://gitlab.freedesktop.org/mesa/mesa/-/issues/11462) with [Windows SDK 10.0.26100.x](https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907);
-- MSYS2: Use default stability and security cflags and ldflags from [makeppkg-mingw tool configuration](https://github.com/msys2/MSYS2-packages/blob/master/pacman/makepkg_mingw.conf).
+- MSYS2: Use default stability and security cflags and ldflags from [makeppkg-mingw tool configuration](https://github.com/msys2/MSYS2-packages/blob/master/pacman/makepkg_mingw.conf);
+- MSVC build: Ensure Python virtual environment compatibility in a [cleaner way without patching Mesa3D source code](https://gitlab.freedesktop.org/mesa/mesa/-/issues/10319#note_2670841).
 # 24.2.7
 - Updated Mesa3D to [24.2.7](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.2/docs/relnotes/24.2.7.rst?ref_type=heads&plain=0).
 ### Build script