From c18e2a417553ebf2d9c638fb7976981f08046ef5 Mon Sep 17 00:00:00 2001 From: Lone_Wolf Date: Fri, 10 Apr 2020 22:46:10 +0200 Subject: [PATCH] opencl was failing unless certain depends were installed, added optdepends to clarify. --- .SRCINFO | 9 ++++++--- PKGBUILD | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 21b2228..eae86f9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 20.1.0_devel.121982.dbdd0149ed5 + pkgver = 20.1.0_devel.122181.7aa6720ba4e pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -21,7 +21,8 @@ pkgbase = mesa-git makedepends = wayland-protocols makedepends = meson makedepends = ninja - makedepends = llvm-minimal-git + makedepends = llvm=9.0.1 + makedepends = clang=9.0.1 depends = libdrm depends = libxxf86vm depends = libxdamage @@ -36,8 +37,10 @@ pkgbase = mesa-git depends = glslang depends = vulkan-icd-loader depends = zstd - depends = llvm-libs-minimal-git + depends = llvm-libs=9.0.1 optdepends = opengl-man-pages: for the OpenGL API man pages + optdepends = clang: opencl + optdepends = compiler-rt: opencl provides = mesa provides = opencl-mesa provides = vulkan-intel diff --git a/PKGBUILD b/PKGBUILD index 8c7e580..a93e983 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ pkgname=mesa-git pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=20.1.0_devel.121982.dbdd0149ed5 +pkgver=20.1.0_devel.122181.7aa6720ba4e pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'xorgproto' @@ -54,22 +54,26 @@ case $MESA_WHICH_LLVM in # aur llvm-minimal-git makedepends+=('llvm-minimal-git') depends+=('llvm-libs-minimal-git') + optdepends+=('llvm-minimal-git: opencl') ;; 2) # aur llvm-git # depending on aur-llvm-* to avoid mixup with LH llvm-git makedepends+=('aur-llvm-git') depends+=('aur-llvm-libs-git') + optdepends+=('llvm-git: opencl') ;; 3) # mesa-git/llvm-git (lordheavy unofficial repo) makedepends+=('llvm-git' 'clang-git') depends+=('llvm-libs-git') + optdepends+=('clang-git: opencl' 'compiler-rt: opencl') ;; 4) # extra/llvm makedepends+=(llvm=9.0.1 clang=9.0.1) depends+=(llvm-libs=9.0.1) + optdepends+=('clang: opencl' 'compiler-rt: opencl') ;; *) esac