From 18ee692fc4fb64391483eb880e4fca6afd939176 Mon Sep 17 00:00:00 2001 From: Reza Jahanbakhshi Date: Mon, 9 May 2022 14:39:38 +0200 Subject: [PATCH] coroutine patch is no longer necessary. --- .SRCINFO | 5 +---- PKGBUILD | 11 ++++------- ...round--LLVM15-FTBFS-no-more-Coroutines.h.patch | 15 --------------- 3 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch diff --git a/.SRCINFO b/.SRCINFO index 1839c60..6fb8dd3 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 f6ace0a..f6d7d9d 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 597eff7..0000000 --- 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