summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-06-04 18:42:52 +0200
committerLW-archlinux2019-06-04 18:42:52 +0200
commitd4da5e510898f23a9afbcfaa7b3f88e851a4e502 (patch)
tree399eda9b7c7fb94c2fd474eba7fd175df156e1de
parent27d7dab9fa3381c21a20d43a0dd936957937e060 (diff)
downloadaur-d4da5e510898f23a9afbcfaa7b3f88e851a4e502.tar.gz
changed depends to distinguish between aur lib32-llv-git and lib32-llvm-git from LH unoffical repo
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD17
2 files changed, 15 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 725980b333b..717439c272f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 19.2.0_devel.111287.b31a31bba51
+ pkgver = 19.2.0_devel.111397.73dda855129
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -36,11 +36,11 @@ pkgbase = lib32-mesa-git
depends = glslang
depends = lib32-llvm-libs-minimal-git
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = lib32-mesa=19.2.0_devel.111287.b31a31bba51-1
- provides = lib32-vulkan-intel=19.2.0_devel.111287.b31a31bba51-1
- provides = lib32-vulkan-radeon=19.2.0_devel.111287.b31a31bba51-1
- provides = lib32-libva-mesa-driver=19.2.0_devel.111287.b31a31bba51-1
- provides = lib32-mesa-vdpau=19.2.0_devel.111287.b31a31bba51-1
+ provides = lib32-mesa=19.2.0_devel.111397.73dda855129-1
+ provides = lib32-vulkan-intel=19.2.0_devel.111397.73dda855129-1
+ provides = lib32-vulkan-radeon=19.2.0_devel.111397.73dda855129-1
+ provides = lib32-libva-mesa-driver=19.2.0_devel.111397.73dda855129-1
+ provides = lib32-mesa-vdpau=19.2.0_devel.111397.73dda855129-1
provides = lib32-opengl-driver
conflicts = lib32-mesa
conflicts = lib32-vulkan-intel
diff --git a/PKGBUILD b/PKGBUILD
index 6fa74bfba02..6f32915f5cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=(lib32-mesa-git)
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=19.2.0_devel.111287.b31a31bba51
+pkgver=19.2.0_devel.111397.73dda855129
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -44,7 +44,7 @@ sha512sums=('SKIP'
#
# 1: llvm-minimal-git (aur) preferred value
# 2: llvm-git (aur)
-# 3 llvm-svn (lordheavy unoffical repo)
+# 3 llvm-git (lordheavy unoffical repo)
# 4 llvm (stable from extra) default value
#
# N.B. make sure lib32-mesa-git uses same value for this as mesa-git to avoid problems !
@@ -62,13 +62,14 @@ case $MESA_WHICH_LLVM in
;;
2)
# aur llvm-git
- makedepends+=('lib32-llvm-git')
- depends+=('lib32-llvm-libs-git')
+ # depending on aur-lib32-llvm-* to avoid mixup with LH llvm-git
+ makedepends+=('aur-lib32-llvm-git')
+ depends+=('aur-lib32-llvm-libs-git')
;;
3)
- # mesa-git/llvm-svn (lordheavy unofficial repo)
- makedepends+=('lib32-llvm-svn')
- depends+=('lib32-llvm-libs-svn')
+ # mesa-git/llvm-git (lordheavy unofficial repo)
+ makedepends+=('lib32-llvm-git')
+ depends+=('lib32-llvm-libs-git')
;;
4)
# extra/llvm
@@ -134,7 +135,7 @@ build () {
-D tools=[] \
meson configure _build
- ninja $NINJAFLAGS -C _build
+ ninja $NINJAFLAGS -C _build
}
package() {