Skip to content

Commit

Permalink
MSYS2: Python>=3.12 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@pal1000
pal1000 committed Nov 11, 2024
1 parent 0b6215f commit 9277742
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 49 deletions.
92 changes: 47 additions & 45 deletions buildinfo/mingw.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bsdtar 3.7.7-1
bzip2 1.0.8-4
ca-certificates 20240203-2
coreutils 8.32-5
curl 8.10.1-1
curl 8.11.0-1
dash 0.5.12-1
db 6.2.32-5
file 5.45-3
Expand All @@ -30,7 +30,7 @@ gdbm 1.24-1
getent 2.18.90-4
gettext 0.22.4-1
gmp 6.3.0-1
gnupg 2.4.5-1
gnupg 2.4.6-1
grep 1~3.0-6
gzip 1.13-1
heimdal-libs 7.8.0-5
Expand All @@ -41,15 +41,15 @@ libargp 20110921-4
libasprintf 0.22.4-1
libassuan 2.5.7-1
libbz2 1.0.8-4
libcurl 8.10.1-1
libcurl 8.11.0-1
libdb 6.2.32-5
libedit 20240517_3.1-1
libexpat 2.6.3-1
libexpat 2.6.4-1
libffi 3.4.6-1
libgcrypt 1.11.0-1
libgdbm 1.24-1
libgettextpo 0.22.4-1
libgnutls 3.8.7-1
libgnutls 3.8.8-1
libgpg-error 1.50-1
libhogweed 3.10-1
libiconv 1.17-1
Expand All @@ -75,25 +75,25 @@ libutil-linux 2.35.2-4
libxcrypt 4.4.36-1
libzstd 1.5.6-1
m4 1.4.19-2
mingw-w64-clang-x86_64-brotli 1.1.0-2
mingw-w64-clang-x86_64-brotli 1.1.0-3
mingw-w64-clang-x86_64-bzip2 1.0.8-3
mingw-w64-clang-x86_64-c-ares 1.34.2-1
mingw-w64-clang-x86_64-ca-certificates 20240203-1
mingw-w64-clang-x86_64-clang 18.1.8-1
mingw-w64-clang-x86_64-clang-libs 18.1.8-1
mingw-w64-clang-x86_64-clang 18.1.8-2
mingw-w64-clang-x86_64-clang-libs 18.1.8-2
mingw-w64-clang-x86_64-cmake 3.30.5-1
mingw-w64-clang-x86_64-compiler-rt 18.1.8-1
mingw-w64-clang-x86_64-compiler-rt 18.1.8-2
mingw-w64-clang-x86_64-cppdap 1.65-1
mingw-w64-clang-x86_64-crt-git 12.0.0.r369.g0d4221712-1
mingw-w64-clang-x86_64-curl 8.10.1-1
mingw-w64-clang-x86_64-crt-git 12.0.0.r369.g0d4221712-2
mingw-w64-clang-x86_64-curl 8.11.0-1
mingw-w64-clang-x86_64-directx-headers 1.614.1-1
mingw-w64-clang-x86_64-expat 2.6.3-1
mingw-w64-clang-x86_64-gdb 15.2-1
mingw-w64-clang-x86_64-expat 2.6.4-1
mingw-w64-clang-x86_64-gdb 15.2-2
mingw-w64-clang-x86_64-gettext-runtime 0.22.5-2
mingw-w64-clang-x86_64-glslang 14.3.0-1
mingw-w64-clang-x86_64-gmp 6.3.0-2
mingw-w64-clang-x86_64-headers-git 12.0.0.r369.g0d4221712-1
mingw-w64-clang-x86_64-jsoncpp 1.9.6-1
mingw-w64-clang-x86_64-headers-git 12.0.0.r369.g0d4221712-2
mingw-w64-clang-x86_64-jsoncpp 1.9.6-2
mingw-w64-clang-x86_64-libarchive 3.7.7-1
mingw-w64-clang-x86_64-libb2 0.98.1-2
mingw-w64-clang-x86_64-libc++ 18.1.8-2
Expand All @@ -112,13 +112,13 @@ mingw-w64-clang-x86_64-libunwind 18.1.8-2
mingw-w64-clang-x86_64-libuv 1.49.2-1
mingw-w64-clang-x86_64-libva 2.22.0-1
mingw-w64-clang-x86_64-libwinpthread-git 12.0.0.r369.g0d4221712-1
mingw-w64-clang-x86_64-libxml2 2.12.9-1
mingw-w64-clang-x86_64-libxml2 2.12.9-2
mingw-w64-clang-x86_64-libyaml 0.2.5-2
mingw-w64-clang-x86_64-lld 18.1.8-1
mingw-w64-clang-x86_64-llvm 18.1.8-1
mingw-w64-clang-x86_64-llvm-libs 18.1.8-1
mingw-w64-clang-x86_64-lld 18.1.8-2
mingw-w64-clang-x86_64-llvm 18.1.8-2
mingw-w64-clang-x86_64-llvm-libs 18.1.8-2
mingw-w64-clang-x86_64-lz4 1.10.0-1
mingw-w64-clang-x86_64-meson 1.6.0-1
mingw-w64-clang-x86_64-meson 1.6.0-2
mingw-w64-clang-x86_64-mpdecimal 4.0.0-1
mingw-w64-clang-x86_64-mpfr 4.2.1-2
mingw-w64-clang-x86_64-ncurses 6.5.20240831-1
Expand All @@ -129,10 +129,11 @@ mingw-w64-clang-x86_64-openssl 3.4.0-1
mingw-w64-clang-x86_64-p11-kit 0.25.5-1
mingw-w64-clang-x86_64-pkgconf 1~2.3.0-1
mingw-w64-clang-x86_64-polly 18.1.8-1
mingw-w64-clang-x86_64-python 3.11.10-1
mingw-w64-clang-x86_64-python-mako 1.3.5-2
mingw-w64-clang-x86_64-python-markupsafe 2.1.5-2
mingw-w64-clang-x86_64-python-yaml 6.0.2-2
mingw-w64-clang-x86_64-python 3.12.7-2
mingw-w64-clang-x86_64-python-mako 1.3.5-3
mingw-w64-clang-x86_64-python-markupsafe 2.1.5-3
mingw-w64-clang-x86_64-python-packaging 24.2-1
mingw-w64-clang-x86_64-python-yaml 6.0.2-3
mingw-w64-clang-x86_64-readline 8.2.013-1
mingw-w64-clang-x86_64-rhash 1.4.4-3
mingw-w64-clang-x86_64-spirv-headers 2~1.3.296.0-1
Expand All @@ -147,31 +148,31 @@ mingw-w64-clang-x86_64-vulkan-headers 1.3.296.0-1
mingw-w64-clang-x86_64-vulkan-loader 1.3.296.0-1
mingw-w64-clang-x86_64-winpthreads-git 12.0.0.r369.g0d4221712-1
mingw-w64-clang-x86_64-xxhash 0.8.2-2
mingw-w64-clang-x86_64-xz 5.6.3-1
mingw-w64-clang-x86_64-xz 5.6.3-2
mingw-w64-clang-x86_64-zlib 1.3.1-1
mingw-w64-clang-x86_64-zstd 1.5.6-2
mingw-w64-i686-binutils 2.43.1-1
mingw-w64-i686-brotli 1.1.0-2
mingw-w64-i686-brotli 1.1.0-3
mingw-w64-i686-bzip2 1.0.8-3
mingw-w64-i686-c-ares 1.34.2-1
mingw-w64-i686-ca-certificates 20240203-1
mingw-w64-i686-clang 18.1.8-1
mingw-w64-i686-clang-libs 18.1.8-1
mingw-w64-i686-clang 18.1.8-2
mingw-w64-i686-clang-libs 18.1.8-2
mingw-w64-i686-cmake 3.30.5-1
mingw-w64-i686-cppdap 1.65-1
mingw-w64-i686-crt-git 12.0.0.r369.g0d4221712-1
mingw-w64-i686-curl 8.10.1-1
mingw-w64-i686-crt-git 12.0.0.r369.g0d4221712-2
mingw-w64-i686-curl 8.11.0-1
mingw-w64-i686-directx-headers 1.614.1-1
mingw-w64-i686-expat 2.6.3-1
mingw-w64-i686-gcc 14.2.0-1
mingw-w64-i686-gcc-libs 14.2.0-1
mingw-w64-i686-gdb 15.2-1
mingw-w64-i686-expat 2.6.4-1
mingw-w64-i686-gcc 14.2.0-2
mingw-w64-i686-gcc-libs 14.2.0-2
mingw-w64-i686-gdb 15.2-2
mingw-w64-i686-gettext-runtime 0.22.5-2
mingw-w64-i686-glslang 14.3.0-1
mingw-w64-i686-gmp 6.3.0-2
mingw-w64-i686-headers-git 12.0.0.r369.g0d4221712-1
mingw-w64-i686-headers-git 12.0.0.r369.g0d4221712-2
mingw-w64-i686-isl 0.27-1
mingw-w64-i686-jsoncpp 1.9.6-1
mingw-w64-i686-jsoncpp 1.9.6-2
mingw-w64-i686-libarchive 3.7.7-1
mingw-w64-i686-libb2 0.98.1-2
mingw-w64-i686-libclc 18.1.8-1
Expand All @@ -188,12 +189,12 @@ mingw-w64-i686-libunistring 1.2-1
mingw-w64-i686-libuv 1.49.2-1
mingw-w64-i686-libva 2.22.0-1
mingw-w64-i686-libwinpthread-git 12.0.0.r369.g0d4221712-1
mingw-w64-i686-libxml2 2.12.9-1
mingw-w64-i686-libxml2 2.12.9-2
mingw-w64-i686-libyaml 0.2.5-2
mingw-w64-i686-llvm 18.1.8-1
mingw-w64-i686-llvm-libs 18.1.8-1
mingw-w64-i686-llvm 18.1.8-2
mingw-w64-i686-llvm-libs 18.1.8-2
mingw-w64-i686-lz4 1.10.0-1
mingw-w64-i686-meson 1.6.0-1
mingw-w64-i686-meson 1.6.0-2
mingw-w64-i686-mpc 1.3.1-2
mingw-w64-i686-mpdecimal 4.0.0-1
mingw-w64-i686-mpfr 4.2.1-2
Expand All @@ -204,10 +205,11 @@ mingw-w64-i686-openssl 3.4.0-1
mingw-w64-i686-p11-kit 0.25.5-1
mingw-w64-i686-pkgconf 1~2.3.0-1
mingw-w64-i686-polly 18.1.8-1
mingw-w64-i686-python 3.11.10-1
mingw-w64-i686-python-mako 1.3.5-2
mingw-w64-i686-python-markupsafe 2.1.5-2
mingw-w64-i686-python-yaml 6.0.2-2
mingw-w64-i686-python 3.12.7-2
mingw-w64-i686-python-mako 1.3.5-3
mingw-w64-i686-python-markupsafe 2.1.5-3
mingw-w64-i686-python-packaging 24.2-1
mingw-w64-i686-python-yaml 6.0.2-3
mingw-w64-i686-readline 8.2.013-1
mingw-w64-i686-rhash 1.4.4-3
mingw-w64-i686-spirv-headers 2~1.3.296.0-1
Expand All @@ -223,7 +225,7 @@ mingw-w64-i686-vulkan-loader 1.3.296.0-1
mingw-w64-i686-windows-default-manifest 6.4-4
mingw-w64-i686-winpthreads-git 12.0.0.r369.g0d4221712-1
mingw-w64-i686-xxhash 0.8.2-2
mingw-w64-i686-xz 5.6.3-1
mingw-w64-i686-xz 5.6.3-2
mingw-w64-i686-zlib 1.3.1-1
mingw-w64-i686-zstd 1.5.6-2
mintty 1~3.7.6-1
Expand Down
4 changes: 2 additions & 2 deletions buildinfo/msvc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Ressource Hacker 5.2.7.427
Git 2.47.0.2
Visual Studio Build Tools 2022 v17.11.5
Windows SDK 10.1.26100.1742
Windows Driver Kit 10.1.26100.1882
Windows Driver Kit 10.1.26100.2161
Nuget Commandline tool 6.11.1.2
Python 3.13.0

Expand All @@ -19,7 +19,7 @@ pip 24.3.1
PyYAML 6.0.2
setuptools 75.3.0

CMake 3.30.5
CMake 3.31.0
Ninja 1.12.1
LLVM 19.1.3
SPIRV Tools 2024.4.1
Expand Down
2 changes: 1 addition & 1 deletion buildscript/modules/msys.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@IF NOT EXIST "%msysloc%" set msysloc=%devroot%\msys32
@endlocal&set msysloc=%msysloc%
@set runmsys=call "%devroot%\%projectname%\buildscript\modules\runmsys.cmd"
@set mingwpkglst={cc,clang,cmake,directx-headers,gdb,glslang,libclc,libelf,libva,meson,pkgconf,polly,python-mako,python-yaml,spirv-headers,spirv-llvm-translator,spirv-tools,vulkan-headers,vulkan-loader,zstd}
@set mingwpkglst={cc,clang,cmake,directx-headers,gdb,glslang,libclc,libelf,libva,meson,pkgconf,polly,python-mako,python-packaging,python-yaml,spirv-headers,spirv-llvm-translator,spirv-tools,vulkan-headers,vulkan-loader,zstd}
3 changes: 2 additions & 1 deletion releasenotes.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
### Build script
- Fix build configuration crash with LLVM disabled or unavailable - discovered in [#205](https://github.com/pal1000/mesa-dist-win/discussions/205);
- [24.2 regression] Build script enables llvmpipe even if LLVM is disabled or unavailable;
- debug: Fix logging Mesa3D build configuration command if it ends with a number.
- debug: Fix logging Mesa3D build configuration command if it ends with a number;
- MSYS2: Python>=3.12 support.
# 24.2.6
- Updated Mesa3D to [24.2.6](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.2/docs/relnotes/24.2.6.rst?ref_type=heads&plain=0).
### Build script
Expand Down

0 comments on commit 9277742

Please sign in to comment.