removed buildpatch as it has landed in master

3 files changed, 4 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dad533fc5bf8..78d68123843d 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.101298.afde9294b5
+	pkgver = 18.1.0_devel.101351.922cd38172
 	pkgrel = 1
 	url = http://mesa3d.sourceforge.net
 	arch = x86_64
@@ -46,10 +46,8 @@ 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 0d6860e9b420..46435043a7af 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.101298.afde9294b5
+pkgver=18.1.0_devel.101351.922cd38172
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -27,16 +27,13 @@ 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 -fi
 }
 
@@ -58,7 +55,7 @@ build () {
                --prefix=/usr \
                --sysconfdir=/etc \
                --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
-               --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+               --with-dri-drivers=i915,i965,r200,radeon,nouveau \
                --with-platforms=x11,drm,wayland \
                --with-vulkan-drivers=intel,radeon \
                --enable-texture-float \
diff --git a/ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch b/ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch
deleted file mode 100644
index fa72a6225271..000000000000
--- a/ac-nir-Fix-include-for-LLVMAddPromoteMemoryToRegisterPass.patch
+++ /dev/null
@@ -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,