summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-05-14 16:00:44 +0200
committerLW-archlinux2019-05-14 16:00:44 +0200
commit38447c32eabf8de3c809abdb110732b5076c0756 (patch)
tree2f0104dc120b4ae27a180819769c88b6026caf14
parentffc8c0ee0475048f9bbb4bd55e67c4c8b370051e (diff)
downloadaur-38447c32eabf8de3c809abdb110732b5076c0756.tar.gz
switched envvar to MESA_WHICH_LLVM with new default=4 llvm (stable from extra)
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD12
2 files changed, 15 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e6f1fb7daab6..5224ac7e5241 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.110903.974c4d679c2
+ pkgver = 19.2.0_devel.110943.73055ae1c9f
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -38,13 +38,13 @@ pkgbase = mesa-git
depends = glslang
depends = lone_wolf-llvm-libs-git
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = mesa=19.2.0_devel.110903.974c4d679c2-1
- provides = vulkan-intel=19.2.0_devel.110903.974c4d679c2-1
- provides = vulkan-radeon=19.2.0_devel.110903.974c4d679c2-1
- provides = libva-mesa-driver=19.2.0_devel.110903.974c4d679c2-1
- provides = mesa-vdpau=19.2.0_devel.110903.974c4d679c2-1
- provides = vulkan-driver=19.2.0_devel.110903.974c4d679c2-1
- provides = opencl-mesa=19.2.0_devel.110903.974c4d679c2-1
+ provides = mesa=19.2.0_devel.110943.73055ae1c9f-1
+ provides = vulkan-intel=19.2.0_devel.110943.73055ae1c9f-1
+ provides = vulkan-radeon=19.2.0_devel.110943.73055ae1c9f-1
+ provides = libva-mesa-driver=19.2.0_devel.110943.73055ae1c9f-1
+ provides = mesa-vdpau=19.2.0_devel.110943.73055ae1c9f-1
+ provides = vulkan-driver=19.2.0_devel.110943.73055ae1c9f-1
+ provides = opencl-mesa=19.2.0_devel.110943.73055ae1c9f-1
provides = opengl-driver
provides = opencl-driver
conflicts = mesa
diff --git a/PKGBUILD b/PKGBUILD
index 3a55a3280995..2e470c7e1ccc 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.110903.974c4d679c2
+pkgver=19.2.0_devel.110943.73055ae1c9f
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto'
@@ -31,17 +31,19 @@ md5sums=('SKIP'
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
-# mesa_which_llvm is an evironment variable used to determine which llvm package tree is used to built mesa-git against
+# MESA_WHICH_LLVM is an environment variable used to determine which llvm package tree is used to built mesa-git against.
+# Adding a line to makepkg.conf that sets this value is the simplest way to ensure a specific choice.
+#
# 1: lone_wolf-llvm-git (aur) Default value
# 2: llvm-git (aur)
# 3 llvm-svn (lordheavy unoffical repo)
# 4 llvm (stable from extra)
#
-if [[ ! $mesa_which_llvm ]] ; then
- mesa_which_llvm=1
+if [[ ! $MESA_WHICH_LLVM ]] ; then
+ MESA_WHICH_LLVM=4
fi
-case $mesa_which_llvm in
+case $MESA_WHICH_LLVM in
1)
# aur lone_wolf-llvm-git
makedepends+=('lone_wolf-llvm-git' 'lone_wolf-clang-git')