summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLone_Wolf2021-02-23 14:46:39 +0100
committerLone_Wolf2021-02-23 14:46:39 +0100
commitdc496274362d0b733efe9757871813302b62522c (patch)
tree9142cf6cc10c87e40e34f4ef96406f4d9af49455
parent9f29c3ff812617001a96d706824a551bd2d3d73b (diff)
downloadaur-dc496274362d0b733efe9757871813302b62522c.tar.gz
added patch to allow building clover / opencl with llvm trunk
-rw-r--r--.SRCINFO5
-rw-r--r--0001-clover-llvm13-use-FixedVectorType.patch16
-rw-r--r--PKGBUILD12
3 files changed, 28 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0d7874e9f98..b6d1fcfa35d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 21.1.0_devel.135442.34d6ce28e38
+ pkgver = 21.1.0_devel.135579.75c9adf0398
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -61,12 +61,15 @@ pkgbase = mesa-git
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 = eabf32299ab9fc89e2eddd6ac5a95ebc
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
sha512sums = 2e1b0773cee0511c5ca87a163fef5ce46e78d5a8ba99fa88eda73f5757ee00b103a072614c266fedd515d55bb5cb03c3f3b45f75869c6f0bde33c1f7f767984b
+ sha512sums = 2f16e3098a8b8a3083b158b0b6fe54cf4b216c99beb21d5e6774db2e18b829067e80f862468506687beddb562e568dfcac6deb60bb133e470601eee579920e7c
pkgname = mesa-git
diff --git a/0001-clover-llvm13-use-FixedVectorType.patch b/0001-clover-llvm13-use-FixedVectorType.patch
new file mode 100644
index 00000000000..78c4dda78a8
--- /dev/null
+++ b/0001-clover-llvm13-use-FixedVectorType.patch
@@ -0,0 +1,16 @@
+diff --unified --recursive --text mesa.orig/src/gallium/frontends/clover/llvm/metadata.hpp mesa.new/src/gallium/frontends/clover/llvm/metadata.hpp
+--- mesa.orig/src/gallium/frontends/clover/llvm/metadata.hpp 2021-02-14 13:15:16.994404651 +0100
++++ mesa.new/src/gallium/frontends/clover/llvm/metadata.hpp 2021-02-14 13:19:11.096855317 +0100
+@@ -129,7 +129,11 @@
+ break;
+ }
+ if (type->isVectorTy())
+- data += std::to_string(((::llvm::VectorType*)type)->getNumElements());
++#if LLVM_VERSION_MAJOR >= 13
++ data += std::to_string(((::llvm::FixedVectorType*)type)->getNumElements());
++#else
++ data += std::to_string(((::llvm::VectorType*)type)->getNumElements())
++#endif
+
+ } else {
+ ::llvm::raw_string_ostream os { data };
diff --git a/PKGBUILD b/PKGBUILD
index 0fd6863bfc0..02e98f28724 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=21.1.0_devel.135442.34d6ce28e38
+pkgver=21.1.0_devel.135579.75c9adf0398
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto'
@@ -27,13 +27,16 @@ url="https://www.mesa3d.org"
license=('custom')
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git'
'LICENSE'
- '8543.patch')
+ '8543.patch'
+ '0001-clover-llvm13-use-FixedVectorType.patch')
md5sums=('SKIP'
'5c65a0fe315dd347e09b1f2826a1df5a'
- 'febd615545826793ff84a016e59b516c')
+ 'febd615545826793ff84a016e59b516c'
+ 'eabf32299ab9fc89e2eddd6ac5a95ebc')
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
- '2e1b0773cee0511c5ca87a163fef5ce46e78d5a8ba99fa88eda73f5757ee00b103a072614c266fedd515d55bb5cb03c3f3b45f75869c6f0bde33c1f7f767984b')
+ '2e1b0773cee0511c5ca87a163fef5ce46e78d5a8ba99fa88eda73f5757ee00b103a072614c266fedd515d55bb5cb03c3f3b45f75869c6f0bde33c1f7f767984b'
+ '2f16e3098a8b8a3083b158b0b6fe54cf4b216c99beb21d5e6774db2e18b829067e80f862468506687beddb562e568dfcac6deb60bb133e470601eee579920e7c')
# 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.
@@ -100,6 +103,7 @@ prepare() {
fi
cd mesa
patch --forward --strip=1 --input="${srcdir}/8543.patch"
+ patch --forward --strip=1 --input="${srcdir}/0001-clover-llvm13-use-FixedVectorType.patch"
}
build () {