rusticl support added to builds with llvm-minimal-git

2 files changed, 27 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df5cf91ad2fb..d5d2413aea07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 24.2.0_devel.190412.6cde457ab60.cf414e8
+	pkgver = 24.2.0_devel.190415.8cd53d95fe3.cf414e8
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -53,9 +53,11 @@ pkgbase = mesa-git
 	depends = python
 	depends = xcb-util-keysyms
 	depends = llvm-libs=17.0.6
+	depends = clang
+	depends = libclc
+	depends = spirv-llvm-translator
+	depends = spirv-tools
 	optdepends = opengl-man-pages: for the OpenGL API man pages
-	optdepends = clang: opencl
-	optdepends = compiler-rt: opencl
 	provides = vulkan-mesa-layers
 	provides = opencl-clover-mesa
 	provides = opencl-driver
diff --git a/PKGBUILD b/PKGBUILD
index f56da0208b04..c65a23b33cfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=mesa-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=24.2.0_devel.190412.6cde457ab60.cf414e8
+pkgver=24.2.0_devel.190415.8cd53d95fe3.cf414e8
 pkgrel=1
 arch=('x86_64')
 makedepends=(
@@ -154,8 +154,21 @@ case $MESA_WHICH_LLVM in
             'spirv-llvm-translator-minimal-git'
             'clang-minimal-git'
             'clang-opencl-headers-minimal-git'
+            'rust'
+            'rust-bindgen'
+            'spirv-tools-git'
+            'glslang-minimal-git'
+        )
+        depends+=(
+            'llvm-libs-minimal-git'
+            'spirv-llvm-translator-minimal-git'
+            'libclc-minimal-git'
+            'spirv-tools-git'
+            'clang-libs-minimal-git'
+            'clang-opencl-headers-minimal-git'
         )
-        depends+=('llvm-libs-minimal-git')
+        conflicts+=('opencl-rusticl-mesa')
+        provides+=('opencl-rusticl-mesa')
         ;;
     2)
         # aur llvm-git
@@ -193,8 +206,13 @@ case $MESA_WHICH_LLVM in
             'rust'
             'rust-bindgen'
         )
-        depends+=(llvm-libs=17.0.6)
-        optdepends+=('clang: opencl' 'compiler-rt: opencl')
+        depends+=(
+            'llvm-libs=17.0.6'
+            'clang'
+            'libclc'
+            'spirv-llvm-translator'
+            'spirv-tools'
+        )
         conflicts+=('opencl-rusticl-mesa')
         provides+=('opencl-rusticl-mesa')
         _rusticl=true