From daaee5106179e59cb39fa4ae800efc35b8ac065f Mon Sep 17 00:00:00 2001
From: emmett1 <emmett1.2miligrams@protonmail.com>
Date: Tue, 9 Jul 2024 23:43:07 +0800
Subject: mesa: enable vulkan-drivers when llvm installed

---
 repos/extra/mesa/.files | 11 +++++++++++
 repos/extra/mesa/abuild | 14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'repos')

diff --git a/repos/extra/mesa/.files b/repos/extra/mesa/.files
index ce9da5f1..9dd54050 100644
--- a/repos/extra/mesa/.files
+++ b/repos/extra/mesa/.files
@@ -36,6 +36,10 @@ lrwxrwxrwx root/root    usr/lib/libgbm.so.1 -> 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
@@ -46,6 +50,13 @@ 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 5835d848..25b2523e 100644
--- a/repos/extra/mesa/abuild
+++ b/repos/extra/mesa/abuild
@@ -1,19 +1,19 @@
 name=mesa
 version=24.0.8
-release=1
+release=2
 source="https://archive.mesa3d.org/$name-$version.tar.xz"
 keep_static=1
-[ -f $SPM_PKGDB/wayland ] && build_opt="-Dplatforms=wayland"
-[ -f $SPM_PKGDB/libx11 ] && build_opt="-Dplatforms=x11"
-[ -f $SPM_PKGDB/libx11 ] && [ -f $SPM_PKGDB/wayland ] && build_opt="-Dplatforms=wayland,x11"
+[ -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="
-	$build_opt
+	$buildopt
+	$platform
 	-Dgallium-drivers=auto
-	-Dvulkan-drivers=""
 	-Dvalgrind=disabled
 	-Dlibunwind=disabled
 	-Dglx=disabled
 	-Dglvnd=true
-	-Dllvm=disabled
 	-Db_lto=false
 "
-- 
cgit v1.2.3