default to llvm-minimal

2 files changed, 11 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4bfc0a749280..381564131a75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,7 +20,7 @@ pkgbase = mesa-minimal+-git
 	makedepends = ninja
 	makedepends = glslang
 	makedepends = llvm
-	makedepends = lib32-llvm=11.0.0
+	makedepends = llvm-minimal-git
 	depends = libdrm
 	depends = libxxf86vm
 	depends = libxdamage
@@ -31,7 +31,7 @@ pkgbase = mesa-minimal+-git
 	depends = vulkan-icd-loader
 	depends = zstd
 	depends = llvm-libs
-	depends = lib32-llvm-libs=11.0.0
+	depends = llvm-libs-minimal-git
 	optdepends = opengl-man-pages: for the OpenGL API man pages
 	optdepends = llvm-minimal-git: opencl
 	optdepends = libclc: opencl
diff --git a/PKGBUILD b/PKGBUILD
index f0662bee3d48..89876123c11d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -54,30 +54,30 @@ sha512sums=('SKIP'
 #
 
 if [[ ! $MESA_WHICH_LLVM ]] ; then
-    MESA_WHICH_LLVM=4
+    MESA_WHICH_LLVM=1
 fi
 
 case $MESA_WHICH_LLVM in
     1)
         # aur lone_wolf-llvm-git
-        makedepends+=('lib32-llvm-minimal-git')
-        depends+=('lib32-llvm-libs-minimal-git')
+        makedepends+=('llvm-minimal-git')
+        depends+=('llvm-libs-minimal-git')
         ;;
     2)
         # aur llvm-git
         # depending on aur-lib32-llvm-* to avoid mixup with LH llvm-git
-        makedepends+=('aur-lib32-llvm-git')
-        depends+=('aur-lib32-llvm-libs-git')
+        makedepends+=('aur-llvm-git')
+        depends+=('aur-llvm-libs-git')
         ;;
     3)
         # mesa-git/llvm-git (lordheavy unofficial repo)
-        makedepends+=('lib32-llvm-git')
-        depends+=('lib32-llvm-libs-git')
+        makedepends+=('llvm-git')
+        depends+=('llvm-libs-git')
         ;;
     4)
         # extra/llvm
-        makedepends+=(lib32-llvm=11.0.0)
-        depends+=(lib32-llvm-libs=11.0.0)
+        makedepends+=(llvm=11.1.0)
+        depends+=(llvm-libs=11.1.0)
         ;;
     *)
 esac