summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD16
2 files changed, 17 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 462d385015a6..aed6253c7ed3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesa-git
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
url = https://www.mesa3d.org
arch = x86_64
@@ -37,13 +37,13 @@ pkgbase = mesa-git
depends = glslang
depends = llvm-libs-minimal-git
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = mesa=19.2.0_devel.111265.e459d6d6dff-1
- provides = vulkan-intel=19.2.0_devel.111265.e459d6d6dff-1
- provides = vulkan-radeon=19.2.0_devel.111265.e459d6d6dff-1
- provides = libva-mesa-driver=19.2.0_devel.111265.e459d6d6dff-1
- provides = mesa-vdpau=19.2.0_devel.111265.e459d6d6dff-1
- provides = vulkan-driver=19.2.0_devel.111265.e459d6d6dff-1
- provides = opencl-mesa=19.2.0_devel.111265.e459d6d6dff-1
+ provides = mesa=19.2.0_devel.111394.d68218dbca9-1
+ provides = vulkan-intel=19.2.0_devel.111394.d68218dbca9-1
+ provides = vulkan-radeon=19.2.0_devel.111394.d68218dbca9-1
+ provides = libva-mesa-driver=19.2.0_devel.111394.d68218dbca9-1
+ provides = mesa-vdpau=19.2.0_devel.111394.d68218dbca9-1
+ provides = vulkan-driver=19.2.0_devel.111394.d68218dbca9-1
+ provides = opencl-mesa=19.2.0_devel.111394.d68218dbca9-1
provides = opengl-driver
provides = opencl-driver
conflicts = mesa
diff --git a/PKGBUILD b/PKGBUILD
index 73894a2b3b6f..3409ac1eacbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=mesa-git
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
arch=('x86_64')
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.
#
# 1: llvm-minimal-git (aur) preferred value
-# 2: llvm-git (aur)
-# 3 llvm-svn (lordheavy unofficial repo)
+# 2: AUR llvm-git
+# 3: llvm-git from LordHeavy unofficial repo
# 4 llvm (stable from extra) Default value
#
+
if [[ ! $MESA_WHICH_LLVM ]] ; then
MESA_WHICH_LLVM=4
fi
@@ -54,13 +55,14 @@ case $MESA_WHICH_LLVM in
;;
2)
# aur llvm-git
- makedepends+=('llvm-git')
- depends+=('llvm-libs-git')
+ # depending on aur-llvm-* to avoid mixup with LH llvm-git
+ makedepends+=('aur-llvm-git')
+ depends+=('aur-llvm-libs-git')
;;
3)
# mesa-git/llvm-svn (lordheavy unofficial repo)
- makedepends+=('llvm-svn' 'clang-svn')
- depends+=('llvm-libs-svn')
+ makedepends+=('llvm-git' 'clang-git')
+ depends+=('llvm-libs-git')
;;
4)
# extra/llvm