mesa-git patch for llvm trunk builds included in master, removed it

This commit is contained in:
LW-archlinux 2019-09-05 18:19:30 +02:00
parent c4d7449dff
commit 6ddefddc83
3 changed files with 11 additions and 38 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 19.3.0_devel.115005.538820ff5ff
pkgver = 19.3.0_devel.115092.3f5b541fc8b
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@ -38,12 +38,12 @@ pkgbase = mesa-git
depends = glslang
depends = llvm-libs=8.0.1
optdepends = opengl-man-pages: for the OpenGL API man pages
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 = mesa=19.3.0_devel.115092.3f5b541fc8b-1
provides = vulkan-intel=19.3.0_devel.115092.3f5b541fc8b-1
provides = vulkan-radeon=19.3.0_devel.115092.3f5b541fc8b-1
provides = vulkan-mesa-layer=19.3.0_devel.115092.3f5b541fc8b-1
provides = libva-mesa-driver=19.3.0_devel.115092.3f5b541fc8b-1
provides = mesa-vdpau=19.3.0_devel.115092.3f5b541fc8b-1
provides = vulkan-driver
provides = opencl-
provides = opengl-driver
@ -57,13 +57,10 @@ pkgbase = mesa-git
conflicts = mesa-vdpau
source = mesa::git://anongit.freedesktop.org/mesa/mesa
source = LICENSE
source = ArrayRefized-CompilerInvocation-CreateFromArgs.patch
md5sums = SKIP
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
md5sums = 52394ac3164a6e2f568a10ec09839a25
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
sha512sums = 80ff36cc13c884a07f7fe8d5997014094c18a9d47c206afa14cb73dc964c6cffb9e1427939111354ee519c553887fe1dc2bae5a6911cf3d6b7f326a28fa28f31
pkgname = mesa-git

View File

@ -1,14 +0,0 @@
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 0a677ce2eaa..0ce3e970303 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -200,7 +200,7 @@ namespace {
const std::string &device_clc_version = dev.device_clc_version();
if (!clang::CompilerInvocation::CreateFromArgs(
- c->getInvocation(), copts.data(), copts.data() + copts.size(), diag))
+ c->getInvocation(), copts, diag))
throw invalid_build_options_error();
diag_buffer->FlushDiagnostics(diag);

View File

@ -11,7 +11,7 @@
pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=19.3.0_devel.115005.538820ff5ff
pkgver=19.3.0_devel.115092.3f5b541fc8b
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto'
@ -25,15 +25,11 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-laye
url="https://www.mesa3d.org"
license=('custom')
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
'LICENSE'
'ArrayRefized-CompilerInvocation-CreateFromArgs.patch'
)
'LICENSE')
md5sums=('SKIP'
'5c65a0fe315dd347e09b1f2826a1df5a'
'52394ac3164a6e2f568a10ec09839a25')
'5c65a0fe315dd347e09b1f2826a1df5a')
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
'80ff36cc13c884a07f7fe8d5997014094c18a9d47c206afa14cb73dc964c6cffb9e1427939111354ee519c553887fe1dc2bae5a6911cf3d6b7f326a28fa28f31')
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
# NINJAFLAGS is an env var used to pass commandline options to ninja
# NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
@ -92,12 +88,6 @@ prepare() {
if [ -d _build ]; then
rm -rf _build
fi
cd mesa
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 () {