summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD13
2 files changed, 14 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d7ad7e34eba..ada03bdaee6 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.110903.974c4d679c2
+ pkgver = 19.2.0_devel.110943.73055ae1c9f
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -36,11 +36,11 @@ pkgbase = lib32-mesa-git
depends = glslang
depends = lone_wolf-lib32-llvm-libs-git
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = lib32-mesa=19.2.0_devel.110903.974c4d679c2-1
- provides = lib32-vulkan-intel=19.2.0_devel.110903.974c4d679c2-1
- provides = lib32-vulkan-radeon=19.2.0_devel.110903.974c4d679c2-1
- provides = lib32-libva-mesa-driver=19.2.0_devel.110903.974c4d679c2-1
- provides = lib32-mesa-vdpau=19.2.0_devel.110903.974c4d679c2-1
+ provides = lib32-mesa=19.2.0_devel.110943.73055ae1c9f-1
+ provides = lib32-vulkan-intel=19.2.0_devel.110943.73055ae1c9f-1
+ provides = lib32-vulkan-radeon=19.2.0_devel.110943.73055ae1c9f-1
+ provides = lib32-libva-mesa-driver=19.2.0_devel.110943.73055ae1c9f-1
+ provides = lib32-mesa-vdpau=19.2.0_devel.110943.73055ae1c9f-1
provides = lib32-opengl-driver
conflicts = lib32-mesa
conflicts = lib32-vulkan-intel
diff --git a/PKGBUILD b/PKGBUILD
index 66ae24388a0..de0fbcd10ed 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.110903.974c4d679c2
+pkgver=19.2.0_devel.110943.73055ae1c9f
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -36,19 +36,22 @@ sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe')
-# 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)
#
# N.B. make sure lib32-mesa-git uses same value for this as mesa-git to avoid problems !
+#
-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-lib32-llvm-git')