changed depends to distinguish between aur llvm-git and llvm-git from LH unoffical repo

This commit is contained in:
LW-archlinux 2019-06-04 16:33:43 +02:00
parent 0cb3b57c1b
commit 2914250db5
2 changed files with 17 additions and 15 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 19.2.0_devel.111265.e459d6d6dff pkgver = 19.2.0_devel.111394.d68218dbca9
pkgrel = 1 pkgrel = 1
url = https://www.mesa3d.org url = https://www.mesa3d.org
arch = x86_64 arch = x86_64
@ -37,13 +37,13 @@ pkgbase = mesa-git
depends = glslang depends = glslang
depends = llvm-libs-minimal-git depends = llvm-libs-minimal-git
optdepends = opengl-man-pages: for the OpenGL API man pages optdepends = opengl-man-pages: for the OpenGL API man pages
provides = mesa=19.2.0_devel.111265.e459d6d6dff-1 provides = mesa=19.2.0_devel.111394.d68218dbca9-1
provides = vulkan-intel=19.2.0_devel.111265.e459d6d6dff-1 provides = vulkan-intel=19.2.0_devel.111394.d68218dbca9-1
provides = vulkan-radeon=19.2.0_devel.111265.e459d6d6dff-1 provides = vulkan-radeon=19.2.0_devel.111394.d68218dbca9-1
provides = libva-mesa-driver=19.2.0_devel.111265.e459d6d6dff-1 provides = libva-mesa-driver=19.2.0_devel.111394.d68218dbca9-1
provides = mesa-vdpau=19.2.0_devel.111265.e459d6d6dff-1 provides = mesa-vdpau=19.2.0_devel.111394.d68218dbca9-1
provides = vulkan-driver=19.2.0_devel.111265.e459d6d6dff-1 provides = vulkan-driver=19.2.0_devel.111394.d68218dbca9-1
provides = opencl-mesa=19.2.0_devel.111265.e459d6d6dff-1 provides = opencl-mesa=19.2.0_devel.111394.d68218dbca9-1
provides = opengl-driver provides = opengl-driver
provides = opencl-driver provides = opencl-driver
conflicts = mesa conflicts = mesa

View File

@ -11,7 +11,7 @@
pkgname=mesa-git pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version" pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=19.2.0_devel.111265.e459d6d6dff pkgver=19.2.0_devel.111394.d68218dbca9
pkgrel=1 pkgrel=1
arch=('x86_64') arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto' makedepends=('git' 'python-mako' 'xorgproto'
@ -38,10 +38,11 @@ sha512sums=('SKIP'
# Adding a line to makepkg.conf that sets this value is the simplest way to ensure a specific choice. # Adding a line to makepkg.conf that sets this value is the simplest way to ensure a specific choice.
# #
# 1: llvm-minimal-git (aur) preferred value # 1: llvm-minimal-git (aur) preferred value
# 2: llvm-git (aur) # 2: AUR llvm-git
# 3 llvm-svn (lordheavy unofficial repo) # 3: llvm-git from LordHeavy unofficial repo
# 4 llvm (stable from extra) Default value # 4 llvm (stable from extra) Default value
# #
if [[ ! $MESA_WHICH_LLVM ]] ; then if [[ ! $MESA_WHICH_LLVM ]] ; then
MESA_WHICH_LLVM=4 MESA_WHICH_LLVM=4
fi fi
@ -54,13 +55,14 @@ case $MESA_WHICH_LLVM in
;; ;;
2) 2)
# aur llvm-git # aur llvm-git
makedepends+=('llvm-git') # depending on aur-llvm-* to avoid mixup with LH llvm-git
depends+=('llvm-libs-git') makedepends+=('aur-llvm-git')
depends+=('aur-llvm-libs-git')
;; ;;
3) 3)
# mesa-git/llvm-svn (lordheavy unofficial repo) # mesa-git/llvm-svn (lordheavy unofficial repo)
makedepends+=('llvm-svn' 'clang-svn') makedepends+=('llvm-git' 'clang-git')
depends+=('llvm-libs-svn') depends+=('llvm-libs-git')
;; ;;
4) 4)
# extra/llvm # extra/llvm