patch added to solve build failure, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/5320
This commit is contained in:
parent
d596359ca1
commit
030eee4e34
5
.SRCINFO
5
.SRCINFO
@ -1,6 +1,6 @@
|
|||||||
pkgbase = mesa-git
|
pkgbase = mesa-git
|
||||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||||
pkgver = 21.2.0_devel.142376.c70f45c7596
|
pkgver = 21.3.0_devel.144688.2587fa1570e
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://www.mesa3d.org
|
url = https://www.mesa3d.org
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
@ -60,9 +60,12 @@ pkgbase = mesa-git
|
|||||||
conflicts = vulkan-swrast
|
conflicts = vulkan-swrast
|
||||||
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
|
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
|
||||||
source = LICENSE
|
source = LICENSE
|
||||||
|
source = 12715 - use hasParamAttr instead of hasAttribute.patch
|
||||||
md5sums = SKIP
|
md5sums = SKIP
|
||||||
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
|
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
|
||||||
|
md5sums = 87cc71137f5fa8b686ff4f562dbf65d5
|
||||||
sha512sums = SKIP
|
sha512sums = SKIP
|
||||||
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
|
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
|
||||||
|
sha512sums = 47886f0916dbf68b5cad7cd6aacfc61955d1352bff9431b0958aa17b0280e18d03b3690be872f10156a1d206560b11cf8835446df82f118ffa138acd551e47b8
|
||||||
|
|
||||||
pkgname = mesa-git
|
pkgname = mesa-git
|
||||||
|
24
12715 - use hasParamAttr instead of hasAttribute.patch
Normal file
24
12715 - use hasParamAttr instead of hasAttribute.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
--- a/src/amd/llvm/ac_llvm_helper.cpp
|
||||||
|
+++ b/src/amd/llvm/ac_llvm_helper.cpp
|
||||||
|
@@ -60,7 +60,7 @@
|
||||||
|
llvm::Argument *A = llvm::unwrap<llvm::Argument>(arg);
|
||||||
|
llvm::AttributeList AS = A->getParent()->getAttributes();
|
||||||
|
unsigned ArgNo = A->getArgNo();
|
||||||
|
- return AS.hasAttribute(ArgNo + 1, llvm::Attribute::InReg);
|
||||||
|
+ return AS.hasParamAttr(ArgNo, llvm::Attribute::InReg);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
--- a/src/gallium/frontends/clover/llvm/codegen/common.cpp
|
||||||
|
+++ b/src/gallium/frontends/clover/llvm/codegen/common.cpp
|
||||||
|
@@ -233,8 +233,8 @@ namespace {
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
- const bool needs_sign_ext = f.getAttributes().hasAttribute(
|
||||||
|
- arg.getArgNo() + 1, ::llvm::Attribute::SExt);
|
||||||
|
+ const bool needs_sign_ext = f.getAttributes().hasParamAttr(
|
||||||
|
+ arg.getArgNo(), ::llvm::Attribute::SExt);
|
||||||
|
|
||||||
|
args.emplace_back(module::argument::scalar, arg_api_size,
|
||||||
|
target_size, target_align,
|
13
PKGBUILD
13
PKGBUILD
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
pkgname=mesa-git
|
pkgname=mesa-git
|
||||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||||
pkgver=21.2.0_devel.142376.c70f45c7596
|
pkgver=21.3.0_devel.144688.2587fa1570e
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
makedepends=('git' 'python-mako' 'xorgproto'
|
makedepends=('git' 'python-mako' 'xorgproto'
|
||||||
@ -26,11 +26,14 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-laye
|
|||||||
url="https://www.mesa3d.org"
|
url="https://www.mesa3d.org"
|
||||||
license=('custom')
|
license=('custom')
|
||||||
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
|
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
|
||||||
'LICENSE')
|
'LICENSE'
|
||||||
|
"12715 - use hasParamAttr instead of hasAttribute.patch")
|
||||||
md5sums=('SKIP'
|
md5sums=('SKIP'
|
||||||
'5c65a0fe315dd347e09b1f2826a1df5a')
|
'5c65a0fe315dd347e09b1f2826a1df5a'
|
||||||
|
'87cc71137f5fa8b686ff4f562dbf65d5')
|
||||||
sha512sums=('SKIP'
|
sha512sums=('SKIP'
|
||||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
|
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
|
||||||
|
'47886f0916dbf68b5cad7cd6aacfc61955d1352bff9431b0958aa17b0280e18d03b3690be872f10156a1d206560b11cf8835446df82f118ffa138acd551e47b8')
|
||||||
|
|
||||||
# NINJAFLAGS is an env var used to pass commandline options to ninja
|
# 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.
|
# NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
|
||||||
@ -95,8 +98,10 @@ prepare() {
|
|||||||
if [ -d _build ]; then
|
if [ -d _build ]; then
|
||||||
rm -rf _build
|
rm -rf _build
|
||||||
fi
|
fi
|
||||||
|
patch --directory=mesa --forward --strip=1 --input="${srcdir}/12715 - use hasParamAttr instead of hasAttribute.patch"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
build () {
|
build () {
|
||||||
meson setup mesa _build \
|
meson setup mesa _build \
|
||||||
-D b_ndebug=true \
|
-D b_ndebug=true \
|
||||||
|
Loading…
Reference in New Issue
Block a user