Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from pal1000:master #32

Merged
merged 1 commit into from
Mar 8, 2025
Merged

[pull] master from pal1000:master #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 20 additions & 95 deletions buildinfo/mingw.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ curl 8.12.1-1
dash 0.5.12-1
db 6.2.32-5
file 5.46-1
filesystem 2024.12.18-1
filesystem 2025.02.23-1
findutils 4.10.0-2
flex 2.6.4-4
gawk 5.3.1-1
Expand Down Expand Up @@ -60,12 +60,12 @@ libksba 1.6.7-1
liblz4 1.10.0-1
liblzma 5.6.4-1
libnettle 3.10.1-1
libnghttp2 1.64.0-1
libnghttp2 1.65.0-1
libnpth 1.8-1
libopenssl 3.4.1-1
libp11-kit 0.25.5-2
libpcre 8.45-5
libpcre2_8 10.44-1
libpcre2_8 10.45-1
libpsl 0.21.5-2
libreadline 8.2.013-1
libsqlite 3.46.1-1
Expand All @@ -76,102 +76,26 @@ libutil-linux 2.40.2-2
libxcrypt 4.4.38-1
libzstd 1.5.7-1
m4 1.4.19-2
mingw-w64-clang-x86_64-brotli 1.1.0-4
mingw-w64-clang-x86_64-bzip2 1.0.8-3
mingw-w64-clang-x86_64-c-ares 1.34.4-1
mingw-w64-clang-x86_64-ca-certificates 20241223-1
mingw-w64-clang-x86_64-clang 19.1.7-1
mingw-w64-clang-x86_64-clang-libs 19.1.7-1
mingw-w64-clang-x86_64-cmake 3.31.5-1
mingw-w64-clang-x86_64-compiler-rt 19.1.7-1
mingw-w64-clang-x86_64-cppdap 1.65-1
mingw-w64-clang-x86_64-crt-git 12.0.0.r509.g079e6092b-1
mingw-w64-clang-x86_64-curl 8.12.1-1
mingw-w64-clang-x86_64-directx-headers 1.615.0-1
mingw-w64-clang-x86_64-expat 2.6.4-1
mingw-w64-clang-x86_64-gdb 16.2-1
mingw-w64-clang-x86_64-gettext-runtime 0.23.1-1
mingw-w64-clang-x86_64-glslang 15.1.0-1
mingw-w64-clang-x86_64-gmp 6.3.0-2
mingw-w64-clang-x86_64-headers-git 12.0.0.r509.g079e6092b-1
mingw-w64-clang-x86_64-jsoncpp 1.9.6-3
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++ 19.1.7-1
mingw-w64-clang-x86_64-libclc 19.1.7-1
mingw-w64-clang-x86_64-libelf 0.8.13-7
mingw-w64-clang-x86_64-libffi 3.4.7-1
mingw-w64-clang-x86_64-libiconv 1.18-1
mingw-w64-clang-x86_64-libidn2 2.3.7-2
mingw-w64-clang-x86_64-libpsl 0.21.5-3
mingw-w64-clang-x86_64-libssh2 1.11.1-1
mingw-w64-clang-x86_64-libsystre 1.0.1-6
mingw-w64-clang-x86_64-libtasn1 4.20.0-1
mingw-w64-clang-x86_64-libtre 0.9.0-1
mingw-w64-clang-x86_64-libunistring 1.3-1
mingw-w64-clang-x86_64-libunwind 19.1.7-1
mingw-w64-clang-x86_64-libuv 1.50.0-1
mingw-w64-clang-x86_64-libva 2.22.0-2
mingw-w64-clang-x86_64-libwinpthread-git 12.0.0.r509.g079e6092b-1
mingw-w64-clang-x86_64-libxml2 2.12.10-1
mingw-w64-clang-x86_64-libyaml 0.2.5-2
mingw-w64-clang-x86_64-lld 19.1.7-1
mingw-w64-clang-x86_64-llvm 19.1.7-1
mingw-w64-clang-x86_64-llvm-libs 19.1.7-1
mingw-w64-clang-x86_64-lz4 1.10.0-1
mingw-w64-clang-x86_64-meson 1.7.0-1
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.20241228-3
mingw-w64-clang-x86_64-nghttp2 1.64.0-1
mingw-w64-clang-x86_64-nghttp3 1.8.0-1
mingw-w64-clang-x86_64-ninja 1.12.1-1
mingw-w64-clang-x86_64-openssl 3.4.1-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 19.1.7-1
mingw-w64-clang-x86_64-python 3.12.9-3
mingw-w64-clang-x86_64-python-mako 1.3.9-1
mingw-w64-clang-x86_64-python-markupsafe 3.0.2-1
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.5-1
mingw-w64-clang-x86_64-spirv-headers 2~1.4.304.1-1
mingw-w64-clang-x86_64-spirv-llvm-translator 19.1.4-1
mingw-w64-clang-x86_64-spirv-tools 3~1.4.304.1-1
mingw-w64-clang-x86_64-sqlite3 3.47.2-1
mingw-w64-clang-x86_64-tcl 8.6.13-1
mingw-w64-clang-x86_64-termcap 1.3.1-7
mingw-w64-clang-x86_64-tk 8.6.13-1
mingw-w64-clang-x86_64-tzdata 2025a-1
mingw-w64-clang-x86_64-vulkan-headers 1.4.304.1-1
mingw-w64-clang-x86_64-vulkan-loader 1.4.304.1-1
mingw-w64-clang-x86_64-winpthreads-git 12.0.0.r509.g079e6092b-1
mingw-w64-clang-x86_64-xxhash 0.8.3-1
mingw-w64-clang-x86_64-xz 5.6.4-1
mingw-w64-clang-x86_64-zlib 1.3.1-1
mingw-w64-clang-x86_64-zstd 1.5.7-1
mingw-w64-i686-binutils 2.44-1
mingw-w64-i686-brotli 1.1.0-4
mingw-w64-i686-bzip2 1.0.8-3
mingw-w64-i686-c-ares 1.34.4-1
mingw-w64-i686-ca-certificates 20241223-1
mingw-w64-i686-clang 19.1.7-1
mingw-w64-i686-clang-libs 19.1.7-1
mingw-w64-i686-cmake 3.31.5-1
mingw-w64-i686-clang 20.1.0-1
mingw-w64-i686-clang-libs 20.1.0-1
mingw-w64-i686-cmake 3.31.6-1
mingw-w64-i686-cppdap 1.65-1
mingw-w64-i686-crt-git 12.0.0.r509.g079e6092b-1
mingw-w64-i686-crt-git 12.0.0.r566.gb02533108-1
mingw-w64-i686-curl 8.12.1-1
mingw-w64-i686-directx-headers 1.615.0-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-gcc 14.2.0-3
mingw-w64-i686-gcc-libs 14.2.0-3
mingw-w64-i686-gdb 16.2-1
mingw-w64-i686-gettext-runtime 0.23.1-1
mingw-w64-i686-gettext-runtime 0.24-1
mingw-w64-i686-glslang 15.1.0-1
mingw-w64-i686-gmp 6.3.0-2
mingw-w64-i686-headers-git 12.0.0.r509.g079e6092b-1
mingw-w64-i686-headers-git 12.0.0.r566.gb02533108-1
mingw-w64-i686-isl 0.27-1
mingw-w64-i686-jsoncpp 1.9.6-3
mingw-w64-i686-libarchive 3.7.7-1
Expand All @@ -186,20 +110,21 @@ mingw-w64-i686-libsystre 1.0.1-6
mingw-w64-i686-libtasn1 4.20.0-1
mingw-w64-i686-libtre 0.9.0-1
mingw-w64-i686-libunistring 1.3-1
mingw-w64-i686-libuv 1.50.0-1
mingw-w64-i686-libuv 1.50.0-2
mingw-w64-i686-libva 2.22.0-2
mingw-w64-i686-libwinpthread-git 12.0.0.r509.g079e6092b-1
mingw-w64-i686-libwinpthread-git 12.0.0.r566.gb02533108-1
mingw-w64-i686-libxml2 2.12.10-1
mingw-w64-i686-libyaml 0.2.5-2
mingw-w64-i686-llvm 19.1.7-1
mingw-w64-i686-llvm-libs 19.1.7-1
mingw-w64-i686-lld 20.1.0-1
mingw-w64-i686-llvm 20.1.0-1
mingw-w64-i686-llvm-libs 20.1.0-1
mingw-w64-i686-lz4 1.10.0-1
mingw-w64-i686-meson 1.7.0-1
mingw-w64-i686-mpc 1.3.1-2
mingw-w64-i686-mpdecimal 4.0.0-1
mingw-w64-i686-mpfr 4.2.1-2
mingw-w64-i686-ncurses 6.5.20241228-3
mingw-w64-i686-nghttp2 1.64.0-1
mingw-w64-i686-nghttp2 1.65.0-1
mingw-w64-i686-ninja 1.12.1-1
mingw-w64-i686-openssl 3.4.1-1
mingw-w64-i686-p11-kit 0.25.5-1
Expand All @@ -211,7 +136,7 @@ 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.5-1
mingw-w64-i686-spirv-headers 2~1.4.304.1-1
mingw-w64-i686-spirv-headers 2~1.4.304.1-2
mingw-w64-i686-spirv-tools 3~1.4.304.1-1
mingw-w64-i686-sqlite3 3.47.2-1
mingw-w64-i686-tcl 8.6.13-1
Expand All @@ -221,7 +146,7 @@ mingw-w64-i686-tzdata 2025a-1
mingw-w64-i686-vulkan-headers 1.4.304.1-1
mingw-w64-i686-vulkan-loader 1.4.304.1-1
mingw-w64-i686-windows-default-manifest 6.4-4
mingw-w64-i686-winpthreads-git 12.0.0.r509.g079e6092b-1
mingw-w64-i686-winpthreads-git 12.0.0.r566.gb02533108-1
mingw-w64-i686-xxhash 0.8.3-1
mingw-w64-i686-xz 5.6.4-1
mingw-w64-i686-zlib 1.3.1-1
Expand All @@ -230,7 +155,7 @@ mintty 1~3.7.7-2
mpfr 4.2.1-1
msys2-keyring 1~20250214-1
msys2-launcher 1.5-3
msys2-runtime 3.5.7-2
msys2-runtime 3.5.7-3
nano 8.3-1
ncurses 6.5.20240831-2
nettle 3.10.1-1
Expand Down
6 changes: 3 additions & 3 deletions buildscript/modules/mesa3d.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,8 @@
@set cangles=1
@IF %galliumcount% EQU 0 set cangles=0

@rem Workaround https://gitlab.freedesktop.org/mesa/mesa/-/issues/12573 by using LLD linker with GCC
@IF %intmesaver% GEQ 25000 IF %toolchain%==gcc set CC_LD=lld
@IF %intmesaver% GEQ 25000 IF %toolchain%==gcc set CXX_LD=lld
@rem Workaround https://gitlab.freedesktop.org/mesa/mesa/-/issues/12573 by disabling EGL and GLES
@IF %intmesaver:~0,3% EQU 250 IF %toolchain%==gcc set cangles=0

@IF %intmesaver% LSS 21300 IF %cangles% EQU 1 call "%devroot%\%projectname%\bin\modules\prompt.cmd" gles "Do you want to build GLAPI as a shared library and standalone GLES drivers (y/n):"
@IF %intmesaver% GEQ 21300 IF %cangles% EQU 1 call "%devroot%\%projectname%\bin\modules\prompt.cmd" gles "Do you want to build standalone GLES drivers (y/n):"
Expand All @@ -422,6 +421,7 @@
@set osmesa=n
@set canosmesa=1
@if /I NOT "%glswrast%"=="y" if /I NOT "%swrdrv%"=="y" set canosmesa=0
@IF %intmesaver% GEQ 25100 set canosmesa=0
@if %canosmesa% EQU 1 IF %intmesaver% LSS 21000 call "%devroot%\%projectname%\bin\modules\prompt.cmd" osmesa "Do you want to build off-screen rendering drivers (y/n):"
@if %canosmesa% EQU 1 IF %intmesaver% GEQ 21000 call "%devroot%\%projectname%\bin\modules\prompt.cmd" osmesa "Do you want to build off-screen rendering driver (y/n):"
@rem osmesa classic is gone in Mesa 21.0 and newer
Expand Down
2 changes: 1 addition & 1 deletion buildscript/modules/msys.cmd
View file
Open in desktop
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={clang,cmake,directx-headers,gdb,glslang,libclc,libelf,libva,lld,meson,pkgconf,polly,python-mako,python-packaging,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}
2 changes: 1 addition & 1 deletion releasenotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Build script
- Workaround https://gitlab.freedesktop.org/mesa/mesa/-/issues/12573 by using LLD linker with GCC.
- osmesa has been removed in 25.1.
# 25.0.0
- Updated Mesa3D to [25.0.0](https://gitlab.freedesktop.org/mesa/mesa/-/blob/25.0/docs/relnotes/25.0.0.rst?ref_type=heads&plain=0).
### Build script
Expand Down