build patch now in master, removed
This commit is contained in:
parent
cb211a7654
commit
771601344f
4
.SRCINFO
4
.SRCINFO
@ -1,6 +1,6 @@
|
||||
pkgbase = mesa-git
|
||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||
pkgver = 18.1.0_devel.101298.afde9294b5
|
||||
pkgver = 18.1.0_devel.101338.a58fdc61e9
|
||||
pkgrel = 1
|
||||
url = http://mesa3d.sourceforge.net
|
||||
arch = x86_64
|
||||
@ -49,10 +49,8 @@ pkgbase = mesa-git
|
||||
conflicts = mesa-vdpau
|
||||
source = mesa::git://anongit.freedesktop.org/mesa/mesa
|
||||
source = LICENSE
|
||||
source = ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch
|
||||
sha512sums = SKIP
|
||||
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
|
||||
sha512sums = 294fe4727e61d8f1970c48003a4ba3dc10291bedc58090b2c53ea74088fd673ec0b00b2449a816d229a565c3acbd190fe9d567896752bbfc7e6412e920699f85
|
||||
|
||||
pkgname = mesa-git
|
||||
|
||||
|
7
PKGBUILD
7
PKGBUILD
@ -12,7 +12,7 @@
|
||||
pkgbase=mesa-git
|
||||
pkgname=('mesa-git')
|
||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||
pkgver=18.1.0_devel.101298.afde9294b5
|
||||
pkgver=18.1.0_devel.101338.a58fdc61e9
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'xorgproto'
|
||||
@ -27,15 +27,12 @@ url="http://mesa3d.sourceforge.net"
|
||||
license=('custom')
|
||||
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
|
||||
'LICENSE'
|
||||
'ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch'
|
||||
)
|
||||
sha512sums=('SKIP'
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
|
||||
'294fe4727e61d8f1970c48003a4ba3dc10291bedc58090b2c53ea74088fd673ec0b00b2449a816d229a565c3acbd190fe9d567896752bbfc7e6412e920699f85')
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
|
||||
|
||||
prepare() {
|
||||
cd mesa
|
||||
patch -Np1 -i ../ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch
|
||||
autoreconf -vfi
|
||||
}
|
||||
|
||||
|
@ -1,42 +0,0 @@
|
||||
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
|
||||
index c6b4e8b532..2f0864da46 100644
|
||||
--- a/src/amd/vulkan/radv_nir_to_llvm.c
|
||||
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
|
||||
@@ -32,6 +32,9 @@
|
||||
#include <llvm-c/Core.h>
|
||||
#include <llvm-c/TargetMachine.h>
|
||||
#include <llvm-c/Transforms/Scalar.h>
|
||||
+#if HAVE_LLVM >= 0x0700
|
||||
+#include <llvm-c/Transforms/Utils.h>
|
||||
+#endif
|
||||
|
||||
#include "sid.h"
|
||||
#include "gfx9d.h"
|
||||
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||
index 6ddc509a81..dae9d01552 100644
|
||||
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||
@@ -40,6 +40,9 @@
|
||||
|
||||
#include <llvm-c/Analysis.h>
|
||||
#include <llvm-c/Transforms/Scalar.h>
|
||||
+#if HAVE_LLVM >= 0x0700
|
||||
+#include <llvm-c/Transforms/Utils.h>
|
||||
+#endif
|
||||
#include <llvm-c/BitWriter.h>
|
||||
|
||||
|
||||
diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
|
||||
index 79fdebe838..622fd26950 100644
|
||||
--- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
|
||||
+++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
|
||||
@@ -40,6 +40,9 @@
|
||||
#include <stdio.h>
|
||||
#include <llvm-c/Transforms/IPO.h>
|
||||
#include <llvm-c/Transforms/Scalar.h>
|
||||
+#if HAVE_LLVM >= 0x0700
|
||||
+#include <llvm-c/Transforms/Utils.h>
|
||||
+#endif
|
||||
|
||||
enum si_llvm_calling_convention {
|
||||
RADEON_LLVM_AMDGPU_VS = 87,
|
Loading…
Reference in New Issue
Block a user