summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2018-04-01 12:32:22 +0200
committerLW-archlinux2018-04-01 12:32:22 +0200
commit05a3d109a8b9b879d5c5d2f2116fa163fb575b2a (patch)
tree5ecbeea045f17f444f5f0e8185c6f9a9e8cb3945
parent888da532ed415babf8a4c8fb32187f39ec0bf207 (diff)
downloadaur-05a3d109a8b9b879d5c5d2f2116fa163fb575b2a.tar.gz
patch added to solve build failure
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch42
3 files changed, 50 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46116618761..dad533fc5bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 18.1.0_devel.100911.6332893594
+ pkgver = 18.1.0_devel.101298.afde9294b5
pkgrel = 1
url = http://mesa3d.sourceforge.net
arch = x86_64
@@ -46,8 +46,10 @@ pkgbase = lib32-mesa-git
conflicts = lib32-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 = lib32-mesa-git
diff --git a/PKGBUILD b/PKGBUILD
index 0297c39d97a..0d6860e9b42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgbase=lib32-mesa-git
pkgname=('lib32-mesa-git')
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=18.1.0_devel.100911.6332893594
+pkgver=18.1.0_devel.101298.afde9294b5
pkgrel=1
arch=('x86_64')
makedepends=('python2-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -27,13 +27,16 @@ 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')
+ '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+ '294fe4727e61d8f1970c48003a4ba3dc10291bedc58090b2c53ea74088fd673ec0b00b2449a816d229a565c3acbd190fe9d567896752bbfc7e6412e920699f85')
prepare() {
cd mesa
+ patch -Np1 -i ../ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch
autoreconf -fi
}
diff --git a/ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch b/ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch
new file mode 100644
index 00000000000..fa72a622527
--- /dev/null
+++ b/ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch
@@ -0,0 +1,42 @@
+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,