diff options
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | 0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch | 36 | ||||
-rw-r--r-- | PKGBUILD | 12 |
3 files changed, 5 insertions, 48 deletions
@@ -1,6 +1,6 @@ pkgbase = mesa-minimal-git pkgdesc = an open-source implementation of the OpenGL specification, stripped down git version - pkgver = 21.1.0_devel.135956.c77df59c9e6 + pkgver = 21.1.0_devel.135967.b33792b794f pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -56,15 +56,12 @@ pkgbase = mesa-minimal-git source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git source = LICENSE source = 0001-clover-llvm13-use-FixedVectorType.patch - source = 0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch md5sums = SKIP md5sums = 5c65a0fe315dd347e09b1f2826a1df5a md5sums = 5f0620ce35da2d1f80dc1b3c03eafc32 - md5sums = 02e6ec0777fd25a51f6e15ba3bdbfff2 sha512sums = SKIP sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2 sha512sums = c3a567df69a263c6b87d9c7887464ed03b5a0bf008caf180c45cf50dca3f4710e0eda3e453a7a69b89720e333c33b9aa7da1b7f9c79d72bb76d847b567558d19 - sha512sums = 694793099b05351bbcc83751499487b627c4daa13b5bdb93bf3f391372286ef8fb599d3e2a660452400ba56bb130454f067987a3d59214022055963e45f85779 pkgname = mesa-minimal-git diff --git a/0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch b/0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch deleted file mode 100644 index 2bebd52e8721..000000000000 --- a/0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5903405880c81dfffa9391d3df7e133da3160934 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com> -Date: Tue, 2 Mar 2021 02:59:23 -0500 -Subject: [PATCH] ac/llvm: fix ac_build_atomic_rmw with LLVM 13 - ---- - src/amd/llvm/ac_llvm_helper.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/amd/llvm/ac_llvm_helper.cpp b/src/amd/llvm/ac_llvm_helper.cpp -index ebeafaea553..0ab9517f431 100644 ---- a/src/amd/llvm/ac_llvm_helper.cpp -+++ b/src/amd/llvm/ac_llvm_helper.cpp -@@ -321,6 +321,9 @@ LLVMValueRef ac_build_atomic_rmw(struct ac_llvm_context *ctx, LLVMAtomicRMWBinOp - unsigned SSID = llvm::unwrap(ctx->context)->getOrInsertSyncScopeID(sync_scope); - return llvm::wrap(llvm::unwrap(ctx->builder) - ->CreateAtomicRMW(binop, llvm::unwrap(ptr), llvm::unwrap(val), -+#if LLVM_VERSION_MAJOR >= 13 -+ llvm::MaybeAlign(0), -+#endif - llvm::AtomicOrdering::SequentiallyConsistent, SSID)); - } - -@@ -331,6 +334,9 @@ LLVMValueRef ac_build_atomic_cmp_xchg(struct ac_llvm_context *ctx, LLVMValueRef - return llvm::wrap(llvm::unwrap(ctx->builder) - ->CreateAtomicCmpXchg(llvm::unwrap(ptr), llvm::unwrap(cmp), - llvm::unwrap(val), -+#if LLVM_VERSION_MAJOR >= 13 -+ llvm::MaybeAlign(0), -+#endif - llvm::AtomicOrdering::SequentiallyConsistent, - llvm::AtomicOrdering::SequentiallyConsistent, SSID)); - } --- -GitLab - @@ -12,7 +12,7 @@ pkgname=mesa-minimal-git pkgdesc="an open-source implementation of the OpenGL specification, stripped down git version" -pkgver=21.1.0_devel.135956.c77df59c9e6 +pkgver=21.1.0_devel.135967.b33792b794f pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'xorgproto' @@ -31,15 +31,13 @@ license=('custom') source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git' 'LICENSE' '0001-clover-llvm13-use-FixedVectorType.patch' - '0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch') +) md5sums=('SKIP' '5c65a0fe315dd347e09b1f2826a1df5a' - '5f0620ce35da2d1f80dc1b3c03eafc32' - '02e6ec0777fd25a51f6e15ba3bdbfff2') + '5f0620ce35da2d1f80dc1b3c03eafc32') sha512sums=('SKIP' '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2' - 'c3a567df69a263c6b87d9c7887464ed03b5a0bf008caf180c45cf50dca3f4710e0eda3e453a7a69b89720e333c33b9aa7da1b7f9c79d72bb76d847b567558d19' - '694793099b05351bbcc83751499487b627c4daa13b5bdb93bf3f391372286ef8fb599d3e2a660452400ba56bb130454f067987a3d59214022055963e45f85779') + 'c3a567df69a263c6b87d9c7887464ed03b5a0bf008caf180c45cf50dca3f4710e0eda3e453a7a69b89720e333c33b9aa7da1b7f9c79d72bb76d847b567558d19') # ninja grabs all available cores and leaves almost nothing for other processes. # this package uses the environment variable NINJAFLAGS to allow the user to change this behaviour @@ -59,9 +57,7 @@ prepare() { rm -rf _build fi cd mesa -# patch --forward --strip=1 --input="${srcdir}/0002-clover-additonal-include-for-mr8543-llvm12.patch" patch --forward --strip=1 --input="${srcdir}/0001-clover-llvm13-use-FixedVectorType.patch" - patch --forward --strip=1 --input="${srcdir}/0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch" } build () { |