mesa: updated to 24.2.5

4 files changed, 25 insertions, 31 deletions

diff --git a/repos/extra/mesa/.checksum b/repos/extra/mesa/.checksum
index 7ef8edfe..3a2cb33c 100644
--- a/repos/extra/mesa/.checksum
+++ b/repos/extra/mesa/.checksum
@@ -1 +1 @@
-b2752049b53c67cdba73af1d72003a1e888a13074e87b7eb8ac59fe4f7b79420  mesa-24.0.8.tar.xz
+6bb5308509f7e1650e7e7be9b03d339f56ffdd0667ce99d32a08736e96893d70  mesa-24.2.5.tar.xz
diff --git a/repos/extra/mesa/.files b/repos/extra/mesa/.files
index 9dd54050..565f4a92 100644
--- a/repos/extra/mesa/.files
+++ b/repos/extra/mesa/.files
@@ -12,34 +12,33 @@ drwxr-xr-x root/root    usr/include/GL/internal/
 -rw-r--r-- root/root    usr/include/xa_tracker.h
 drwxr-xr-x root/root    usr/lib/
 drwxr-xr-x root/root    usr/lib/dri/
--rwxr-xr-x root/root    usr/lib/dri/crocus_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/i915_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/iris_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/kms_swrast_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/nouveau_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/nouveau_drv_video.so
--rwxr-xr-x root/root    usr/lib/dri/r300_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/r600_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/r600_drv_video.so -> usr/lib/dri/nouveau_drv_video.so
--rwxr-xr-x root/root    usr/lib/dri/radeonsi_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/radeonsi_drv_video.so -> usr/lib/dri/nouveau_drv_video.so
--rwxr-xr-x root/root    usr/lib/dri/swrast_dri.so -> usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/virtio_gpu_dri.so
--rwxr-xr-x root/root    usr/lib/dri/virtio_gpu_drv_video.so -> usr/lib/dri/nouveau_drv_video.so
--rwxr-xr-x root/root    usr/lib/dri/vmwgfx_dri.so -> usr/lib/dri/virtio_gpu_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/crocus_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/i915_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/iris_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/kms_swrast_dri.so -> libdril_dri.so
+-rwxr-xr-x root/root    usr/lib/dri/libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/nouveau_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/nouveau_drv_video.so -> ../libgallium-24.2.5.so
+lrwxrwxrwx root/root    usr/lib/dri/r300_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/r600_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/r600_drv_video.so -> ../libgallium-24.2.5.so
+lrwxrwxrwx root/root    usr/lib/dri/radeonsi_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/radeonsi_drv_video.so -> ../libgallium-24.2.5.so
+lrwxrwxrwx root/root    usr/lib/dri/swrast_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/virtio_gpu_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/virtio_gpu_drv_video.so -> ../libgallium-24.2.5.so
+lrwxrwxrwx root/root    usr/lib/dri/vmwgfx_dri.so -> libdril_dri.so
+lrwxrwxrwx root/root    usr/lib/dri/zink_dri.so -> libdril_dri.so
 lrwxrwxrwx root/root    usr/lib/libEGL_mesa.so -> libEGL_mesa.so.0
 lrwxrwxrwx root/root    usr/lib/libEGL_mesa.so.0 -> libEGL_mesa.so.0.0.0
 -rwxr-xr-x root/root    usr/lib/libEGL_mesa.so.0.0.0
+-rwxr-xr-x root/root    usr/lib/libgallium-24.2.5.so
 lrwxrwxrwx root/root    usr/lib/libgbm.so -> libgbm.so.1
 lrwxrwxrwx root/root    usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
 -rwxr-xr-x root/root    usr/lib/libgbm.so.1.0.0
 lrwxrwxrwx root/root    usr/lib/libglapi.so -> libglapi.so.0
 lrwxrwxrwx root/root    usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
 -rwxr-xr-x root/root    usr/lib/libglapi.so.0.0.0
--rwxr-xr-x root/root    usr/lib/libvulkan_intel.so
--rwxr-xr-x root/root    usr/lib/libvulkan_intel_hasvk.so
--rwxr-xr-x root/root    usr/lib/libvulkan_lvp.so
--rwxr-xr-x root/root    usr/lib/libvulkan_radeon.so
 lrwxrwxrwx root/root    usr/lib/libxatracker.so -> libxatracker.so.2
 lrwxrwxrwx root/root    usr/lib/libxatracker.so.2 -> libxatracker.so.2.5.0
 -rwxr-xr-x root/root    usr/lib/libxatracker.so.2.5.0
@@ -50,13 +49,6 @@ drwxr-xr-x root/root    usr/lib/pkgconfig/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/drirc.d/
 -rw-r--r-- root/root    usr/share/drirc.d/00-mesa-defaults.conf
--rw-r--r-- root/root    usr/share/drirc.d/00-radv-defaults.conf
 drwxr-xr-x root/root    usr/share/glvnd/
 drwxr-xr-x root/root    usr/share/glvnd/egl_vendor.d/
 -rw-r--r-- root/root    usr/share/glvnd/egl_vendor.d/50_mesa.json
-drwxr-xr-x root/root    usr/share/vulkan/
-drwxr-xr-x root/root    usr/share/vulkan/icd.d/
--rw-r--r-- root/root    usr/share/vulkan/icd.d/intel_hasvk_icd.x86_64.json
--rw-r--r-- root/root    usr/share/vulkan/icd.d/intel_icd.x86_64.json
--rw-r--r-- root/root    usr/share/vulkan/icd.d/lvp_icd.x86_64.json
--rw-r--r-- root/root    usr/share/vulkan/icd.d/radeon_icd.x86_64.json
diff --git a/repos/extra/mesa/abuild b/repos/extra/mesa/abuild
index 25b2523e..4628b346 100644
--- a/repos/extra/mesa/abuild
+++ b/repos/extra/mesa/abuild
@@ -1,14 +1,12 @@
 name=mesa
-version=24.0.8
-release=2
+version=24.2.5
+release=1
 source="https://archive.mesa3d.org/$name-$version.tar.xz"
 keep_static=1
 [ -f $SPM_PKGDB/wayland ] && platform="-Dplatforms=wayland"
 [ -f $SPM_PKGDB/libx11 ] && platform="-Dplatforms=x11"
 [ -f $SPM_PKGDB/libx11 ] && [ -f $SPM_PKGDB/wayland ] && platform="-Dplatforms=wayland,x11"
-[ -f $SPM_PKGDB/llvm ] || buildopt="-Dllvm=disabled -Dvulkan-drivers="
 build_opt="
-	$buildopt
 	$platform
 	-Dgallium-drivers=auto
 	-Dvalgrind=disabled
@@ -16,4 +14,5 @@ build_opt="
 	-Dglx=disabled
 	-Dglvnd=true
 	-Db_lto=false
+	-Dvulkan-drivers=
 "
diff --git a/repos/extra/mesa/depends b/repos/extra/mesa/depends
index 7465d5d0..296aa1a3 100644
--- a/repos/extra/mesa/depends
+++ b/repos/extra/mesa/depends
@@ -6,3 +6,6 @@ wayland-protocols
 elfutils
 libxshmfence
 libxrandr
+libclc
+python-pyyaml
+python-ply