summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-09-03 02:58:48 +0200
committerLW-archlinux2019-09-03 02:58:48 +0200
commitc4d7449dff64993303a6c44e986a5bad2de5e285 (patch)
treed87ebaf38bd6ef2a1701d6529a0317082e8b9f1d
parenta73bf6fe5a6d8096f3814b2e86e2d1fc42759fe5 (diff)
downloadaur-c4d7449dff64993303a6c44e986a5bad2de5e285.tar.gz
opencl build fail was due to llvm trunk commits that were reverted, opencl support re-enabled
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD9
2 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad7789821a2e..403763c5f655 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.3.0_devel.114998.966a455bb91
+ pkgver = 19.3.0_devel.115005.538820ff5ff
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -22,7 +22,8 @@ pkgbase = mesa-git
makedepends = wayland-protocols
makedepends = meson
makedepends = ninja
- makedepends = llvm-minimal-git
+ makedepends = llvm=8.0.1
+ makedepends = clang=8.0.1
depends = libdrm
depends = libxxf86vm
depends = libxdamage
@@ -35,14 +36,14 @@ pkgbase = mesa-git
depends = lm_sensors
depends = libclc
depends = glslang
- depends = llvm-libs-minimal-git
+ depends = llvm-libs=8.0.1
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = mesa=19.3.0_devel.114998.966a455bb91-1
- provides = vulkan-intel=19.3.0_devel.114998.966a455bb91-1
- provides = vulkan-radeon=19.3.0_devel.114998.966a455bb91-1
- provides = vulkan-mesa-layer=19.3.0_devel.114998.966a455bb91-1
- provides = libva-mesa-driver=19.3.0_devel.114998.966a455bb91-1
- provides = mesa-vdpau=19.3.0_devel.114998.966a455bb91-1
+ provides = mesa=19.3.0_devel.115005.538820ff5ff-1
+ provides = vulkan-intel=19.3.0_devel.115005.538820ff5ff-1
+ provides = vulkan-radeon=19.3.0_devel.115005.538820ff5ff-1
+ provides = vulkan-mesa-layer=19.3.0_devel.115005.538820ff5ff-1
+ provides = libva-mesa-driver=19.3.0_devel.115005.538820ff5ff-1
+ provides = mesa-vdpau=19.3.0_devel.115005.538820ff5ff-1
provides = vulkan-driver
provides = opencl-
provides = opengl-driver
diff --git a/PKGBUILD b/PKGBUILD
index 114648f75909..d54b515124cf 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.3.0_devel.114998.966a455bb91
+pkgver=19.3.0_devel.115005.538820ff5ff
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto'
@@ -94,7 +94,10 @@ prepare() {
fi
cd mesa
- patch --forward --strip=1 --input="$srcdir"/ArrayRefized-CompilerInvocation-CreateFromArgs.patch
+ if [[ $MESA_WHICH_LLVM < 4 ]]; then
+ # this patch is only needed when building against llvm trunk
+ patch --forward --strip=1 --input="$srcdir"/ArrayRefized-CompilerInvocation-CreateFromArgs.patch
+ fi
}
build () {
@@ -127,7 +130,7 @@ build () {
-D lmsensors=true \
-D osmesa=gallium \
-D shared-glapi=true \
- -D gallium-opencl=disabled \
+ -D gallium-opencl=icd \
-D valgrind=false \
-D vulkan-overlay-layer=true \
-D tools=[]