8543.patch has been applied in upstream so removing it here.
This commit is contained in:
parent
8fee969aef
commit
328f494747
5
.SRCINFO
5
.SRCINFO
@ -1,6 +1,6 @@
|
||||
pkgbase = mesa-git
|
||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||
pkgver = 21.1.0_devel.135579.75c9adf0398
|
||||
pkgver = 21.1.0_devel.135859.a1e9a5d6534
|
||||
pkgrel = 1
|
||||
url = https://www.mesa3d.org
|
||||
arch = x86_64
|
||||
@ -60,15 +60,12 @@ pkgbase = mesa-git
|
||||
conflicts = vulkan-swrast
|
||||
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git
|
||||
source = LICENSE
|
||||
source = 8543.patch
|
||||
source = 0001-clover-llvm13-use-FixedVectorType.patch
|
||||
md5sums = SKIP
|
||||
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
|
||||
md5sums = febd615545826793ff84a016e59b516c
|
||||
md5sums = 5f0620ce35da2d1f80dc1b3c03eafc32
|
||||
sha512sums = SKIP
|
||||
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
|
||||
sha512sums = 2e1b0773cee0511c5ca87a163fef5ce46e78d5a8ba99fa88eda73f5757ee00b103a072614c266fedd515d55bb5cb03c3f3b45f75869c6f0bde33c1f7f767984b
|
||||
sha512sums = c3a567df69a263c6b87d9c7887464ed03b5a0bf008caf180c45cf50dca3f4710e0eda3e453a7a69b89720e333c33b9aa7da1b7f9c79d72bb76d847b567558d19
|
||||
|
||||
pkgname = mesa-git
|
||||
|
42
8543.patch
42
8543.patch
@ -1,42 +0,0 @@
|
||||
From 67b36d1e81dcdce97daa6eab4a6a7e60c6d3949a Mon Sep 17 00:00:00 2001
|
||||
From: Vinson Lee <vlee@freedesktop.org>
|
||||
Date: Sat, 16 Jan 2021 22:55:41 -0800
|
||||
Subject: [PATCH] clover: Fix build with llvm-12.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fix build error after LLVM commit c495dfe0268b ("[clang][cli] NFC:
|
||||
Decrease the scope of ParseLangArgs parameters").
|
||||
|
||||
../src/gallium/frontends/clover/llvm/invocation.cpp: In function ‘std::unique_ptr<clang::CompilerInstance> {anonymous}::create_compiler_instance(const clover::device&, const string&, const std::vector<std::__cxx11::basic_string<char> >&, std::string&)’:
|
||||
../src/gallium/frontends/clover/llvm/invocation.cpp:252:55: error: cannot convert ‘clang::PreprocessorOptions’ to ‘std::vector<std::__cxx11::basic_string<char> >&’
|
||||
252 | c->getPreprocessorOpts(),
|
||||
| ~~~~~~~~~~~~~~~~~~~~~~^~
|
||||
| |
|
||||
| clang::PreprocessorOptions
|
||||
|
||||
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
|
||||
---
|
||||
src/gallium/frontends/clover/llvm/invocation.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||
index be0f3976b92..bcbec21cd1c 100644
|
||||
--- a/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||
+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||
@@ -249,7 +249,11 @@ namespace {
|
||||
|
||||
c->getInvocation().setLangDefaults(c->getLangOpts(),
|
||||
compat::ik_opencl, ::llvm::Triple(target.triple),
|
||||
+#if LLVM_VERSION_MAJOR >= 12
|
||||
+ c->getPreprocessorOpts().Includes,
|
||||
+#else
|
||||
c->getPreprocessorOpts(),
|
||||
+#endif
|
||||
get_language_version(opts, device_clc_version));
|
||||
|
||||
c->createDiagnostics(new clang::TextDiagnosticPrinter(
|
||||
--
|
||||
GitLab
|
||||
|
6
PKGBUILD
6
PKGBUILD
@ -12,7 +12,7 @@
|
||||
|
||||
pkgname=mesa-git
|
||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||
pkgver=21.1.0_devel.135662.b17ec53c814
|
||||
pkgver=21.1.0_devel.135967.b33792b794f
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'python-mako' 'xorgproto'
|
||||
@ -27,15 +27,12 @@ url="https://www.mesa3d.org"
|
||||
license=('custom')
|
||||
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git'
|
||||
'LICENSE'
|
||||
'8543.patch'
|
||||
'0001-clover-llvm13-use-FixedVectorType.patch')
|
||||
md5sums=('SKIP'
|
||||
'5c65a0fe315dd347e09b1f2826a1df5a'
|
||||
'febd615545826793ff84a016e59b516c'
|
||||
'5f0620ce35da2d1f80dc1b3c03eafc32')
|
||||
sha512sums=('SKIP'
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
|
||||
'2e1b0773cee0511c5ca87a163fef5ce46e78d5a8ba99fa88eda73f5757ee00b103a072614c266fedd515d55bb5cb03c3f3b45f75869c6f0bde33c1f7f767984b'
|
||||
'c3a567df69a263c6b87d9c7887464ed03b5a0bf008caf180c45cf50dca3f4710e0eda3e453a7a69b89720e333c33b9aa7da1b7f9c79d72bb76d847b567558d19')
|
||||
|
||||
# NINJAFLAGS is an env var used to pass commandline options to ninja
|
||||
@ -102,7 +99,6 @@ prepare() {
|
||||
rm -rf _build
|
||||
fi
|
||||
cd mesa
|
||||
patch --forward --strip=1 --input="${srcdir}/8543.patch"
|
||||
patch --forward --strip=1 --input="${srcdir}/0001-clover-llvm13-use-FixedVectorType.patch"
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user