opencl build fail was due to llvm trunk commits that were reverted, opencl support re-enabled

This commit is contained in:
LW-archlinux 2019-09-03 02:58:48 +02:00
parent a73bf6fe5a
commit c4d7449dff
2 changed files with 16 additions and 12 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version 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 pkgrel = 1
url = https://www.mesa3d.org url = https://www.mesa3d.org
arch = x86_64 arch = x86_64
@ -22,7 +22,8 @@ pkgbase = mesa-git
makedepends = wayland-protocols makedepends = wayland-protocols
makedepends = meson makedepends = meson
makedepends = ninja makedepends = ninja
makedepends = llvm-minimal-git makedepends = llvm=8.0.1
makedepends = clang=8.0.1
depends = libdrm depends = libdrm
depends = libxxf86vm depends = libxxf86vm
depends = libxdamage depends = libxdamage
@ -35,14 +36,14 @@ pkgbase = mesa-git
depends = lm_sensors depends = lm_sensors
depends = libclc depends = libclc
depends = glslang depends = glslang
depends = llvm-libs-minimal-git depends = llvm-libs=8.0.1
optdepends = opengl-man-pages: for the OpenGL API man pages optdepends = opengl-man-pages: for the OpenGL API man pages
provides = mesa=19.3.0_devel.114998.966a455bb91-1 provides = mesa=19.3.0_devel.115005.538820ff5ff-1
provides = vulkan-intel=19.3.0_devel.114998.966a455bb91-1 provides = vulkan-intel=19.3.0_devel.115005.538820ff5ff-1
provides = vulkan-radeon=19.3.0_devel.114998.966a455bb91-1 provides = vulkan-radeon=19.3.0_devel.115005.538820ff5ff-1
provides = vulkan-mesa-layer=19.3.0_devel.114998.966a455bb91-1 provides = vulkan-mesa-layer=19.3.0_devel.115005.538820ff5ff-1
provides = libva-mesa-driver=19.3.0_devel.114998.966a455bb91-1 provides = libva-mesa-driver=19.3.0_devel.115005.538820ff5ff-1
provides = mesa-vdpau=19.3.0_devel.114998.966a455bb91-1 provides = mesa-vdpau=19.3.0_devel.115005.538820ff5ff-1
provides = vulkan-driver provides = vulkan-driver
provides = opencl- provides = opencl-
provides = opengl-driver provides = opengl-driver

View File

@ -11,7 +11,7 @@
pkgname=mesa-git pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version" 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 pkgrel=1
arch=('x86_64') arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto' makedepends=('git' 'python-mako' 'xorgproto'
@ -94,7 +94,10 @@ prepare() {
fi fi
cd mesa 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 () { build () {
@ -127,7 +130,7 @@ build () {
-D lmsensors=true \ -D lmsensors=true \
-D osmesa=gallium \ -D osmesa=gallium \
-D shared-glapi=true \ -D shared-glapi=true \
-D gallium-opencl=disabled \ -D gallium-opencl=icd \
-D valgrind=false \ -D valgrind=false \
-D vulkan-overlay-layer=true \ -D vulkan-overlay-layer=true \
-D tools=[] -D tools=[]