summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorReza Jahanbakhshi2022-05-09 14:39:38 +0200
committerReza Jahanbakhshi2022-05-09 14:39:38 +0200
commit18ee692fc4fb64391483eb880e4fca6afd939176 (patch)
treef23d442d8a9f21428bf7f928995d86ea771ad786
parent58c71d98489aadcf751193332d51ec4a553b8736 (diff)
downloadaur-18ee692fc4fb64391483eb880e4fca6afd939176.tar.gz
coroutine patch is no longer necessary.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
-rw-r--r--workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch15
3 files changed, 5 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1839c606e06d..6fb8dd319a0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 22.2.0_devel.153422.cfec9a55ea6.6aa0994e8686145503079d47a8bd2ae8
+ pkgver = 22.2.0_devel.153446.7ea2e86a8b5.3cc0e974fa373c7b4680878df5ed6e21
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -62,12 +62,9 @@ pkgbase = mesa-git
conflicts = mesa-libgl
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
source = LICENSE
- source = workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch
md5sums = SKIP
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
- md5sums = a4e1e8a8a90b6434b80d8ec859747e0c
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
- sha512sums = ee96c9c3c29cfd7bffc1ee72fecf6bdd9a4ac7245afa11e7b28432e8695fc9d16d241cb8330029e5460cc54898258b87bc73d99fc1bf9743ce9bb718a85f5806
pkgname = mesa-git
diff --git a/PKGBUILD b/PKGBUILD
index f6ace0a26b1e..f6d7d9de6134 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=22.2.0_devel.153440.ad864a7c150.3cc0e974fa373c7b4680878df5ed6e21
+pkgver=22.2.0_devel.153458.c881e718d44.d41d8cd98f00b204e9800998ecf8427e
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto'
@@ -26,14 +26,11 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-laye
url="https://www.mesa3d.org"
license=('custom')
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
- 'LICENSE'
- 'workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch')
+ 'LICENSE')
md5sums=('SKIP'
- '5c65a0fe315dd347e09b1f2826a1df5a'
- 'a4e1e8a8a90b6434b80d8ec859747e0c')
+ '5c65a0fe315dd347e09b1f2826a1df5a')
sha512sums=('SKIP'
- '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
- 'ee96c9c3c29cfd7bffc1ee72fecf6bdd9a4ac7245afa11e7b28432e8695fc9d16d241cb8330029e5460cc54898258b87bc73d99fc1bf9743ce9bb718a85f5806')
+ '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.
diff --git a/workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch b/workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch
deleted file mode 100644
index 597eff7bc707..000000000000
--- a/workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- src/gallium/auxiliary/gallivm/lp_bld.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/gallium/auxiliary/gallivm/lp_bld.h
-+++ b/src/gallium/auxiliary/gallivm/lp_bld.h
-@@ -81,7 +81,7 @@
- #define LLVMInsertBasicBlock ILLEGAL_LLVM_FUNCTION
- #define LLVMCreateBuilder ILLEGAL_LLVM_FUNCTION
-
--#if LLVM_VERSION_MAJOR >= 8
-+#if LLVM_VERSION_MAJOR >= 8 && LLVM_VERSION_MAJOR < 15
- #define GALLIVM_HAVE_CORO 1
- #else
- #define GALLIVM_HAVE_CORO 0