mesa: update to 25.2.3

Author: onlylunix

srcpkgs/mesa/patches/musl-endian.patch

@@ -1,17 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=25.1.9
+version=25.2.3
 revision=1
 build_style=meson
 _llvmver=19
-_syn_version=2.0.68
-_proc_macro_version=1.0.86
-_quote_version=1.0.33
-_unicode_ident_version=1.0.12
-_paste_version=1.0.14
+
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dlibunwind=disabled -Dglvnd=enabled -Dgbm=enabled 
+ -Degl=enabled -Dgles1=enabled -Dglx=dri
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
@@ -20,31 +16,100 @@ makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel"
+ libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua54-devel
+ libarchive-devel libXext-devel libpng-devel"
 depends="libglvnd"
 short_desc="Open source implementation of OpenGL and Vulkan"
 maintainer="Orphaned <[email protected]>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
+
 distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz
- https://crates.io/api/v1/crates/syn/${_syn_version}/download>syn-${_syn_version}.tar.gz
- https://crates.io/api/v1/crates/proc-macro2/${_proc_macro_version}/download>proc-macro2-${_proc_macro_version}.tar.gz
- https://crates.io/api/v1/crates/quote/${_quote_version}/download>quote-${_quote_version}.tar.gz
- https://crates.io/api/v1/crates/unicode-ident/${_unicode_ident_version}/download>unicode-ident-${_unicode_ident_version}.tar.gz
- https://crates.io/api/v1/crates/paste/${_paste_version}/download>paste-${_paste_version}.tar.gz"
-checksum="412df33a1bb3c785ed698555a3972118a37c458e7accf6ae53f4bb87b3db454a
- 901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9
- 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
- 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
+ https://crates.io/api/v1/crates/zerocopy/0.8.13/download>zerocopy-0.8.13.tar.gz
+ https://crates.io/api/v1/crates/zerocopy-derive/0.8.13/download>zerocopy-derive-0.8.13.tar.gz
+ https://crates.io/api/v1/crates/unicode-ident/1.0.12/download>unicode-ident-1.0.12.tar.gz
+ https://crates.io/api/v1/crates/ucd-trie/0.1.6/download>ucd-trie-0.1.6.tar.gz
+ https://crates.io/api/v1/crates/thiserror/2.0.11/download>thiserror-2.0.11.tar.gz
+ https://crates.io/api/v1/crates/thiserror-impl/2.0.11/download>thiserror-impl-2.0.11.tar.gz
+ https://crates.io/api/v1/crates/syn/2.0.87/download>syn-2.0.87.tar.gz
+ https://crates.io/api/v1/crates/rustix/1.0.7/download>rustix-1.0.7.tar.gz
+ https://crates.io/api/v1/crates/rustc-hash/2.1.1/download>rustc-hash-2.1.1.tar.gz
+ https://crates.io/api/v1/crates/roxmltree/0.20.0/download>roxmltree-0.20.0.tar.gz
+ https://crates.io/api/v1/crates/remain/0.2.12/download>remain-0.2.12.tar.gz
+ https://crates.io/api/v1/crates/quote/1.0.35/download>quote-1.0.35.tar.gz
+ https://crates.io/api/v1/crates/proc-macro2/1.0.86/download>proc-macro2-1.0.86.tar.gz
+ https://crates.io/api/v1/crates/pest_meta/2.8.0/download>pest_meta-2.8.0.tar.gz
+ https://crates.io/api/v1/crates/pest_generator/2.8.0/download>pest_generator-2.8.0.tar.gz
+ https://crates.io/api/v1/crates/pest_derive/2.8.0/download>pest_derive-2.8.0.tar.gz
+ https://crates.io/api/v1/crates/pest/2.8.0/download>pest-2.8.0.tar.gz
+ https://crates.io/api/v1/crates/paste/1.0.14/download>paste-1.0.14.tar.gz
+ https://crates.io/api/v1/crates/once_cell/1.8.0/download>once_cell-1.8.0.tar.gz
+ https://crates.io/api/v1/crates/log/0.4.27/download>log-0.4.27.tar.gz
+ https://crates.io/api/v1/crates/libc/0.2.168/download>libc-0.2.168.tar.gz
+ https://crates.io/api/v1/crates/indexmap/2.2.6/download>indexmap-2.2.6.tar.gz
+ https://crates.io/api/v1/crates/hashbrown/0.14.1/download>hashbrown-0.14.1.tar.gz
+ https://crates.io/api/v1/crates/errno/0.3.12/download>errno-0.3.12.tar.gz
+ https://crates.io/api/v1/crates/equivalent/1.0.1/download>equivalent-1.0.1.tar.gz
+ https://crates.io/api/v1/crates/cfg-if/1.0.0/download>cfg-if-1.0.0.tar.gz
+ https://crates.io/api/v1/crates/bitflags/2.9.1/download>bitflags-2.9.1.tar.gz"
+
+checksum="f2d6b28562f1d6cb9c17ee8e58eeade7aa5faf927ae71065eadb41e17f92b4f8
+ 67914ab451f3bfd2e69e5e9d2ef3858484e7074d63f204fd166ec391b54de21d
+ 7988d73a4303ca289df03316bc490e934accf371af6bc745393cf3c2c5c4f25d
  3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
- de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-skip_extraction="syn-${_syn_version}.tar.gz
- proc-macro2-${_proc_macro_version}.tar.gz
- quote-${_quote_version}.tar.gz
- unicode-ident-${_unicode_ident_version}.tar.gz
- paste-${_paste_version}.tar.gz"
+ ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9
+ d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc
+ 26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2
+ 25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d
+ c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+ 357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d
+ 6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97
+ 1ad5e011230cad274d0532460c5ab69828ea47ae75681b42a841663efffaf794
+ 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
+ 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
+ 7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0
+ db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841
+ d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5
+ 198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6
+ de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
+ 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56
+ 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
+ 5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d
+ 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
+ 7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12
+ cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18
+ 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+ baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+ 1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+skip_extraction="zerocopy-0.8.13.tar.gz
+ zerocopy-derive-0.8.13.tar.gz
+ unicode-ident-1.0.12.tar.gz
+ ucd-trie-0.1.6.tar.gz
+ thiserror-2.0.11.tar.gz
+ thiserror-impl-2.0.11.tar.gz
+ syn-2.0.87.tar.gz
+ rustix-1.0.7.tar.gz
+ rustc-hash-2.1.1.tar.gz
+ roxmltree-0.20.0.tar.gz
+ remain-0.2.12.tar.gz
+ quote-1.0.35.tar.gz
+ proc-macro2-1.0.86.tar.gz
+ pest_meta-2.8.0.tar.gz
+ pest_generator-2.8.0.tar.gz
+ pest_derive-2.8.0.tar.gz
+ pest-2.8.0.tar.gz
+ paste-1.0.14.tar.gz
+ once_cell-1.8.0.tar.gz
+ log-0.4.27.tar.gz
+ libc-0.2.168.tar.gz
+ indexmap-2.2.6.tar.gz
+ hashbrown-0.14.1.tar.gz
+ errno-0.3.12.tar.gz
+ equivalent-1.0.1.tar.gz
+ cfg-if-1.0.0.tar.gz
+ bitflags-2.9.1.tar.gz"
 
 build_helper="qemu"
 build_options="wayland"
@@ -91,7 +156,6 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
 		_have_intel=yes
 		_have_vmware=yes
-		_have_nine=yes
 		;;
 	armv[67]*|aarch64*)
 		_have_arm=yes
@@ -133,6 +197,10 @@ if [ "$_have_intel" ]; then
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
+
+	case "$XBPS_TARGET_MACHINE" in
+	x86_64*) configure_args+=" -Dintel-rt=enabled" ;;
+	esac
 fi
 
 if [ "$_have_nv" ]; then
@@ -166,18 +234,10 @@ if [ "$_have_virgl" ]; then
 	_vulkan_drivers+=",virtio"
 fi
 
-if [ "$_have_nine" ]; then
-	configure_args+=" -Dgallium-nine=true"
-fi
-
 if [ "$_have_vmware" ]; then
 	_gallium_drivers+=",svga"
-	configure_args+=" -Dgallium-xa=enabled"
-	subpackages+=" libxatracker"
 	# transitional dummy packages
 	subpackages+=" mesa-vmwgfx-dri"
-else
-	configure_args+=" -Dgallium-xa=disabled"
 fi
 
 # enabled currently by amd drivers
@@ -186,7 +246,8 @@ if [ "$_have_opencl" ]; then
 	makedepends+=" clang${_llvmver} libclc${_llvmver} rust
 	 SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
+	# configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021" # meson.build:4:0: ERROR: Unknown option: "gallium-opencl"
+	configure_args+=" -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
@@ -209,7 +270,7 @@ configure_args+=" ${_vulkan_drivers}"
 
 if [ "$_have_vulkan" ]; then
 	_have_zink=yes
-	configure_args+=" -Dvulkan-layers=device-select,overlay"
+	configure_args+=" -Dvulkan-layers=device-select,overlay,screenshot,vram-report-limit"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
 	fi
@@ -239,11 +300,33 @@ _prepare_subproject() {
 }
 
 post_extract() {
-	_prepare_subproject syn ${_syn_version}
-	_prepare_subproject proc-macro2 ${_proc_macro_version}
-	_prepare_subproject quote ${_quote_version}
-	_prepare_subproject unicode-ident ${_unicode_ident_version}
-	_prepare_subproject paste ${_paste_version}
+	_prepare_subproject zerocopy 0.8.13
+	_prepare_subproject zerocopy-derive 0.8.13
+	_prepare_subproject unicode-ident 1.0.12
+	_prepare_subproject ucd-trie 0.1.6
+	_prepare_subproject thiserror 2.0.11
+	_prepare_subproject thiserror-impl 2.0.11
+	_prepare_subproject syn 2.0.87
+	_prepare_subproject rustix 1.0.7
+	_prepare_subproject rustc-hash 2.1.1
+	_prepare_subproject roxmltree 0.20.0
+	_prepare_subproject remain 0.2.12
+	_prepare_subproject quote 1.0.35
+	_prepare_subproject proc-macro2 1.0.86
+	_prepare_subproject pest_meta 2.8.0
+	_prepare_subproject pest_generator 2.8.0
+	_prepare_subproject pest_derive 2.8.0
+	_prepare_subproject pest 2.8.0
+	_prepare_subproject paste 1.0.14
+	_prepare_subproject once_cell 1.8.0
+	_prepare_subproject log 0.4.27
+	_prepare_subproject libc 0.2.168
+	_prepare_subproject indexmap 2.2.6
+	_prepare_subproject hashbrown 0.14.1
+	_prepare_subproject errno 0.3.12
+	_prepare_subproject equivalent 1.0.1
+	_prepare_subproject cfg-if 1.0.0
+	_prepare_subproject bitflags 2.9.1
 }
 
 post_configure() {
@@ -285,6 +368,14 @@ post_install() {
 				${icd} > ${icd/.${arch}/.${oarch}}
 		done
 	done
+
+	# fix 
+	# /usr/share/vulkan/icd.d/*.i686*.json
+	# "library_arch": "64" -> "library_arch": "32"
+	case "${arch}" in
+		x86_64) sed -i 's|"library_arch": "64"|"library_arch": "32"|' ${DESTDIR}/usr/share/vulkan/icd.d/*.i686*.json ;;
+		*) ;; 
+	esac
 }
 
 mesa-libgallium_package() {
@@ -313,9 +404,6 @@ libgbm-devel_package() {
 
 MesaLib-devel_package() {
 	depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
-	if [ "$_have_vmware" ]; then
-		depends+=" libxatracker>=${version}_${revision}"
-	fi
 	if [ "$_have_opencl" ]; then
 		depends+=" mesa-opencl>=${version}_${revision}"
 	fi
@@ -326,30 +414,18 @@ MesaLib-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/libEGL_mesa.so
 		vmove usr/lib/libGLX_mesa.so
-		if [ "$_have_vmware" ]; then
-			vmove usr/lib/libxatracker.so
-		fi
+
 		if [ "$_have_opencl" ]; then
-			vmove usr/lib/libMesaOpenCL.so
 			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
 
-libxatracker_package() {
-	short_desc="Mesa XA tracker interface library"
-	pkg_install() {
-		vmove "usr/lib/libxatracker*.so.*"
-	}
-}
-
 mesa-opencl_package() {
 	short_desc="Mesa implementation of OpenCL (r600+ only)"
 	depends="libclc${_llvmver}"
 	pkg_install() {
 		vmove etc/OpenCL
-		vmove usr/lib/gallium-pipe
-		vmove "usr/lib/libMesaOpenCL.so.*"
 		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }