From fc69045602ef98fa40795ca73e923745b5d0a45d Mon Sep 17 00:00:00 2001 From: pal1000 Date: Thu, 9 May 2024 03:24:52 -0700 Subject: [PATCH] Release 24.0.7 --- buildinfo/mingw.txt | 48 ++++++++++++++++----------------- buildinfo/msvc.txt | 7 ++--- buildscript/modules/envdump.cmd | 3 +++ buildscript/modules/llvm.cmd | 2 +- buildscript/modules/spirv.cmd | 2 +- buildscript/modules/zstd.cmd | 2 +- packages.txt | 12 ++++----- readme.md | 2 +- releasenotes.md | 4 +++ 9 files changed, 45 insertions(+), 37 deletions(-) diff --git a/buildinfo/mingw.txt b/buildinfo/mingw.txt index 027848c2..2e271808 100644 --- a/buildinfo/mingw.txt +++ b/buildinfo/mingw.txt @@ -3,7 +3,7 @@ Build environment Windows 10.0.20348 Ressource Hacker 5.2.7.427 7-Zip 23.01 ultra compression -Git 2.44.0.1 +Git 2.45.0.1 OpenCLonD3D12 ICD 2024.04.04 MSYS2 environment @@ -13,7 +13,7 @@ bash 5.2.026-1 bash-completion 2.11-3 bison 3.8.2-5 brotli 1.1.0-1 -bsdtar 3.7.3-1 +bsdtar 3.7.4-1 bzip2 1.0.8-4 ca-certificates 20240203-1 coreutils 8.32-5 @@ -50,7 +50,7 @@ libgcrypt 1.10.3-1 libgdbm 1.23-1 libgettextpo 0.22.4-1 libgnutls 3.8.5-1 -libgpg-error 1.48-1 +libgpg-error 1.49-1 libgpgme 1.23.2-1 libhogweed 3.9.1-1 libiconv 1.17-1 @@ -71,7 +71,7 @@ libreadline 8.2.010-1 libsqlite 3.45.3-1 libssh2 1.11.0-1 libtasn1 4.19.0-1 -libunistring 1.1-2 +libunistring 1.2-1 libutil-linux 2.35.2-4 libxcrypt 4.4.36-1 libzstd 1.5.6-1 @@ -83,8 +83,8 @@ mingw-w64-i686-c-ares 1.28.1-1 mingw-w64-i686-ca-certificates 20240203-1 mingw-w64-i686-clang 18.1.4-1 mingw-w64-i686-clang-libs 18.1.4-1 -mingw-w64-i686-cmake 3.29.2-1 -mingw-w64-i686-crt-git 11.0.0.r680.g257321cea-1 +mingw-w64-i686-cmake 3.29.3-1 +mingw-w64-i686-crt-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-i686-curl 8.7.1-1 mingw-w64-i686-directx-headers 1.613.1-1 mingw-w64-i686-expat 2.6.2-1 @@ -94,10 +94,10 @@ mingw-w64-i686-gdb 14.2-1 mingw-w64-i686-gettext-runtime 0.22.5-2 mingw-w64-i686-glslang 14.1.0-1 mingw-w64-i686-gmp 6.3.0-2 -mingw-w64-i686-headers-git 11.0.0.r680.g257321cea-1 +mingw-w64-i686-headers-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-i686-isl 0.26-1 mingw-w64-i686-jsoncpp 1.9.5-3 -mingw-w64-i686-libarchive 3.7.3-1 +mingw-w64-i686-libarchive 3.7.4-1 mingw-w64-i686-libb2 0.98.1-2 mingw-w64-i686-libclc 18.1.4-1 mingw-w64-i686-libelf 0.8.13-7 @@ -112,7 +112,7 @@ mingw-w64-i686-libtre-git r177.07e66d0-2 mingw-w64-i686-libunistring 1.2-1 mingw-w64-i686-libuv 1.48.0-1 mingw-w64-i686-libva 2.21.0-1 -mingw-w64-i686-libwinpthread-git 11.0.0.r680.g257321cea-1 +mingw-w64-i686-libwinpthread-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-i686-libxml2 2.12.6-1 mingw-w64-i686-llvm 18.1.4-1 mingw-w64-i686-llvm-libs 18.1.4-1 @@ -123,8 +123,8 @@ mingw-w64-i686-mpdecimal 4.0.0-1 mingw-w64-i686-mpfr 4.2.1-2 mingw-w64-i686-ncurses 6.4.20231217-1 mingw-w64-i686-nghttp2 1.61.0-1 -mingw-w64-i686-ninja 1.11.1-3 -mingw-w64-i686-openssl 3.3.0-1 +mingw-w64-i686-ninja 1.12.0-1 +mingw-w64-i686-openssl 3.3.0-2 mingw-w64-i686-p11-kit 0.25.3-2 mingw-w64-i686-pkgconf 1~2.2.0-1 mingw-w64-i686-polly 18.1.4-1 @@ -144,7 +144,7 @@ mingw-w64-i686-tzdata 2024a-1 mingw-w64-i686-vulkan-headers 1.3.280.0-1 mingw-w64-i686-vulkan-loader 1.3.280.0-1 mingw-w64-i686-windows-default-manifest 6.4-4 -mingw-w64-i686-winpthreads-git 11.0.0.r680.g257321cea-1 +mingw-w64-i686-winpthreads-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-i686-xxhash 0.8.2-2 mingw-w64-i686-xz 5.6.1-2 mingw-w64-i686-zlib 1.3.1-1 @@ -156,8 +156,8 @@ mingw-w64-ucrt-x86_64-c-ares 1.28.1-1 mingw-w64-ucrt-x86_64-ca-certificates 20240203-1 mingw-w64-ucrt-x86_64-clang 18.1.4-1 mingw-w64-ucrt-x86_64-clang-libs 18.1.4-1 -mingw-w64-ucrt-x86_64-cmake 3.29.2-1 -mingw-w64-ucrt-x86_64-crt-git 11.0.0.r680.g257321cea-1 +mingw-w64-ucrt-x86_64-cmake 3.29.3-1 +mingw-w64-ucrt-x86_64-crt-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-ucrt-x86_64-curl 8.7.1-1 mingw-w64-ucrt-x86_64-directx-headers 1.613.1-1 mingw-w64-ucrt-x86_64-expat 2.6.2-1 @@ -167,10 +167,10 @@ mingw-w64-ucrt-x86_64-gdb 14.2-1 mingw-w64-ucrt-x86_64-gettext-runtime 0.22.5-2 mingw-w64-ucrt-x86_64-glslang 14.1.0-1 mingw-w64-ucrt-x86_64-gmp 6.3.0-2 -mingw-w64-ucrt-x86_64-headers-git 11.0.0.r680.g257321cea-1 +mingw-w64-ucrt-x86_64-headers-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-ucrt-x86_64-isl 0.26-1 mingw-w64-ucrt-x86_64-jsoncpp 1.9.5-3 -mingw-w64-ucrt-x86_64-libarchive 3.7.3-1 +mingw-w64-ucrt-x86_64-libarchive 3.7.4-1 mingw-w64-ucrt-x86_64-libb2 0.98.1-2 mingw-w64-ucrt-x86_64-libclc 18.1.4-1 mingw-w64-ucrt-x86_64-libelf 0.8.13-7 @@ -185,7 +185,7 @@ mingw-w64-ucrt-x86_64-libtre-git r177.07e66d0-2 mingw-w64-ucrt-x86_64-libunistring 1.2-1 mingw-w64-ucrt-x86_64-libuv 1.48.0-1 mingw-w64-ucrt-x86_64-libva 2.21.0-1 -mingw-w64-ucrt-x86_64-libwinpthread-git 11.0.0.r680.g257321cea-1 +mingw-w64-ucrt-x86_64-libwinpthread-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-ucrt-x86_64-libxml2 2.12.6-1 mingw-w64-ucrt-x86_64-llvm 18.1.4-1 mingw-w64-ucrt-x86_64-llvm-libs 18.1.4-1 @@ -196,8 +196,8 @@ mingw-w64-ucrt-x86_64-mpdecimal 4.0.0-1 mingw-w64-ucrt-x86_64-mpfr 4.2.1-2 mingw-w64-ucrt-x86_64-ncurses 6.4.20231217-1 mingw-w64-ucrt-x86_64-nghttp2 1.61.0-1 -mingw-w64-ucrt-x86_64-ninja 1.11.1-3 -mingw-w64-ucrt-x86_64-openssl 3.3.0-1 +mingw-w64-ucrt-x86_64-ninja 1.12.0-1 +mingw-w64-ucrt-x86_64-openssl 3.3.0-2 mingw-w64-ucrt-x86_64-p11-kit 0.25.3-2 mingw-w64-ucrt-x86_64-pkgconf 1~2.2.0-1 mingw-w64-ucrt-x86_64-polly 18.1.4-1 @@ -217,7 +217,7 @@ mingw-w64-ucrt-x86_64-tzdata 2024a-1 mingw-w64-ucrt-x86_64-vulkan-headers 1.3.280.0-1 mingw-w64-ucrt-x86_64-vulkan-loader 1.3.280.0-1 mingw-w64-ucrt-x86_64-windows-default-manifest 6.4-4 -mingw-w64-ucrt-x86_64-winpthreads-git 11.0.0.r680.g257321cea-1 +mingw-w64-ucrt-x86_64-winpthreads-git 11.0.0.r731.g8fdf7c9b5-1 mingw-w64-ucrt-x86_64-xxhash 0.8.2-2 mingw-w64-ucrt-x86_64-xz 5.6.1-2 mingw-w64-ucrt-x86_64-zlib 1.3.1-1 @@ -226,15 +226,15 @@ mintty 1~3.7.1-1 mpfr 4.2.1-1 msys2-keyring 1~20240410-1 msys2-launcher 1.5-1 -msys2-runtime 3.4.10-8 -nano 7.2-1 +msys2-runtime 3.5.3-2 +nano 8.0-1 ncurses 6.4-2 nettle 3.9.1-1 openssl 3.3.0-1 p11-kit 0.25.3-1 -pacman 6.0.2-14 +pacman 6.0.2-15 pacman-contrib 1.10.5-1 -pacman-mirrors 20240210-1 +pacman-mirrors 20240504-1 patch 2.7.6-2 perl 5.38.2-1 pinentry 1.2.1-1 diff --git a/buildinfo/msvc.txt b/buildinfo/msvc.txt index 91741cd5..e3a1686b 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 23.01 ultra compression -Git 2.44.0.1 +Git 2.45.0.1 Visual Studio Community 2022 v17.9.6 Windows SDK 10.1.22621.3233 Windows Driver Kit 10.1.22621.2428 @@ -18,9 +18,9 @@ meson 1.4.0 pip 24.0 setuptools 69.5.1 -CMake 3.29.2 +CMake 3.29.3 Ninja 1.12.0 -LLVM 18.1.4 +LLVM 18.1.5 SPIRV Tools 2024.2.1 flex 2.6.4 Bison 3.8.2 @@ -30,3 +30,4 @@ OpenCLonD3D12 ICD 2024.04.04 libva 2.21.0 VA-API 1.21.0 DirectX headers 1.613.1 +zstd 1.5.6 diff --git a/buildscript/modules/envdump.cmd b/buildscript/modules/envdump.cmd index 25ea9340..5b5ab9f1 100644 --- a/buildscript/modules/envdump.cmd +++ b/buildscript/modules/envdump.cmd @@ -158,6 +158,9 @@ set "exitloop=" @set "exitloop=" ) +@rem Add zstd to build environment info +@IF %toolchain%==msvc if EXIST "%devroot%\zstd\zstd\%hostabi%\lib\pkgconfig\libzstd.pc" FOR /F tokens^=1-2^ eol^= %%a IN ('type "%devroot%\zstd\zstd\%hostabi%\lib\pkgconfig\libzstd.pc"') DO @IF /I "%%a"=="Version:" echo zstd %%b>>"%devroot%\%projectname%\buildinfo\msvc.txt" + @rem Dump MSYS2 environment @IF NOT %toolchain%==msvc echo.>>"%devroot%\%projectname%\buildinfo\mingw.txt" @IF NOT %toolchain%==msvc echo MSYS2 environment>>"%devroot%\%projectname%\buildinfo\mingw.txt" diff --git a/buildscript/modules/llvm.cmd b/buildscript/modules/llvm.cmd index bc71cea6..9cdb1633 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=18.1.4 +@set updllvmsrcver=18.1.5 @if /I "%legacyllvm%"=="y" set updllvmsrcver=17.0.6 @set llvmsrcver=0 @set llvmsrcloc="%devroot%\llvm-project\llvm\CMakeLists.txt" diff --git a/buildscript/modules/spirv.cmd b/buildscript/modules/spirv.cmd index 6a5ab30e..23ec55ed 100644 --- a/buildscript/modules/spirv.cmd +++ b/buildscript/modules/spirv.cmd @@ -4,7 +4,7 @@ @IF EXIST "%devroot%\spirv-tools\DEPS" IF NOT EXIST "%devroot%\spirv-tools\external\spirv-headers\" IF %gitstate% EQU 0 set canspvtools=0 @if %cmakestate% EQU 0 set canspvtools=0 -@set spvtoolsrel=v2024.2rc1 +@set spvtoolsrel=v2024.2.rc1 @IF EXIST "%devroot%\spirv-tools\external\" IF %gitstate% GTR 0 ( @echo Updating SPIRV tools source code... @cd "%devroot%\spirv-tools" diff --git a/buildscript/modules/zstd.cmd b/buildscript/modules/zstd.cmd index 7c2f38c2..0159af44 100644 --- a/buildscript/modules/zstd.cmd +++ b/buildscript/modules/zstd.cmd @@ -11,7 +11,7 @@ @cd zstd @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 v1.5.6 +@git checkout 1232d4c45d18f124e44fe382b11dee095566b610 ) @IF %gitstate% GTR 0 echo. @IF "%pkgconfigstate%"=="0" GOTO nozstd diff --git a/packages.txt b/packages.txt index 90e2f91c..4804cea1 100644 --- a/packages.txt +++ b/packages.txt @@ -1,6 +1,6 @@ -mesa3d-24.0.6-development-pack-msvc.7z -..\mesa3d-24.0.6-release-msvc.7z -..\mesa3d-24.0.6-debug-info-msvc.7z -mesa3d-24.0.6-development-pack-mingw.7z -..\mesa3d-24.0.6-release-mingw.7z -..\mesa3d-24.0.6-debug-mingw.7z +mesa3d-24.0.7-development-pack-msvc.7z +..\mesa3d-24.0.7-release-msvc.7z +..\mesa3d-24.0.7-debug-info-msvc.7z +mesa3d-24.0.7-development-pack-mingw.7z +..\mesa3d-24.0.7-release-mingw.7z +..\mesa3d-24.0.7-debug-mingw.7z diff --git a/readme.md b/readme.md index 11a32056..50f85ea2 100644 --- a/readme.md +++ b/readme.md @@ -24,7 +24,7 @@ - [OpenGL context configuration override](#opengl-context-configuration-override) - [How to set environment variables](#how-to-set-environment-variables) # Downloads -Mesa 24.0.6 builds with Visual Studio and MSYS2 Mingw-w64 are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases). +Mesa 24.0.7 builds with Visual Studio and MSYS2 Mingw-w64 are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases). # Sponsorship mesa-dist-win project was given a sponsorship that was extended until November 1st 2024. Sponsorship consists in a free VPS to use as build machine with 12 GB RAM, 6 threads [AMD EPYC 7542](https://www.amd.com/en/products/cpu/amd-epyc-7542) and 150 GB NVMe SSD from [Petrosky](https://petrosky.io/pal1000), a virtual private server hosting company thanks to [@Directox01](https://github.com/Directox01). diff --git a/releasenotes.md b/releasenotes.md index 87b71041..c0d458fe 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,5 +1,9 @@ +# 24.0.7 +- Updated Mesa3D to [24.0.7](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.0/docs/relnotes/24.0.7.rst?ref_type=heads&plain=0). ### Build script - d3d12: Support disabling graphics pipeline - [[24.1+](https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27997)]. +### Build environment +- MSVC: Add zstd version. # 24.0.6 - Updated Mesa3D to [24.0.6](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.0/docs/relnotes/24.0.6.rst?ref_type=heads&plain=0). Also includes 24.1.0-rc1 pre-release MSVC build. ### Build script