add patch to solve opencl build with latest clang trunk

3 files changed, 31 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aed6253c7ed3..5d9f73b4af61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 19.2.0_devel.111394.d68218dbca9
+	pkgver = 19.2.0_devel.112337.bb75c73e962
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -37,13 +37,13 @@ pkgbase = mesa-git
 	depends = glslang
 	depends = llvm-libs-minimal-git
 	optdepends = opengl-man-pages: for the OpenGL API man pages
-	provides = mesa=19.2.0_devel.111394.d68218dbca9-1
-	provides = vulkan-intel=19.2.0_devel.111394.d68218dbca9-1
-	provides = vulkan-radeon=19.2.0_devel.111394.d68218dbca9-1
-	provides = libva-mesa-driver=19.2.0_devel.111394.d68218dbca9-1
-	provides = mesa-vdpau=19.2.0_devel.111394.d68218dbca9-1
-	provides = vulkan-driver=19.2.0_devel.111394.d68218dbca9-1
-	provides = opencl-mesa=19.2.0_devel.111394.d68218dbca9-1
+	provides = mesa=19.2.0_devel.112337.bb75c73e962-1
+	provides = vulkan-intel=19.2.0_devel.112337.bb75c73e962-1
+	provides = vulkan-radeon=19.2.0_devel.112337.bb75c73e962-1
+	provides = libva-mesa-driver=19.2.0_devel.112337.bb75c73e962-1
+	provides = mesa-vdpau=19.2.0_devel.112337.bb75c73e962-1
+	provides = vulkan-driver=19.2.0_devel.112337.bb75c73e962-1
+	provides = opencl-mesa=19.2.0_devel.112337.bb75c73e962-1
 	provides = opengl-driver
 	provides = opencl-driver
 	conflicts = mesa
@@ -54,10 +54,13 @@ pkgbase = mesa-git
 	conflicts = mesa-vdpau
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa
 	source = LICENSE
+	source = targets-opencl-Add_clangASTMatchers_library_as_dependency.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+	md5sums = 73c3573455404a1eb6a6504ce6ff21f5
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
+	sha512sums = 29241b93f07e6e3473b6c3e690f69cbe3594c2d1257e97325e47f54d35c446ea9262d4ac9c4094cb545a9b7722aa9e07588815418df872ef707a4fa9ffe002d9
 
 pkgname = mesa-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3409ac1eacbe..3ffc59655d31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=mesa-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=19.2.0_devel.111394.d68218dbca9
+pkgver=19.2.0_devel.112337.bb75c73e962
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -25,11 +25,14 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-drive
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
-        'LICENSE')
+        'LICENSE'
+        'targets-opencl-Add_clangASTMatchers_library_as_dependency.patch')
 md5sums=('SKIP'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+         '5c65a0fe315dd347e09b1f2826a1df5a'
+         '73c3573455404a1eb6a6504ce6ff21f5')
 sha512sums=('SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
+            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            '29241b93f07e6e3473b6c3e690f69cbe3594c2d1257e97325e47f54d35c446ea9262d4ac9c4094cb545a9b7722aa9e07588815418df872ef707a4fa9ffe002d9')
 
 # 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.
@@ -88,6 +91,8 @@ prepare() {
     if [  -d _build ]; then
         rm -rf _build
     fi
+    cd mesa
+    patch --forward --strip=1 --input="$srcdir"/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch
 }
 
 build () {
diff --git a/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch b/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch
new file mode 100644
index 000000000000..bb02ae62e66f
--- /dev/null
+++ b/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch
@@ -0,0 +1,11 @@
+diff --unified --recursive --text mesa.orig/src/gallium/targets/opencl/meson.build mesa.new/src/gallium/targets/opencl/meson.build
+--- mesa.orig/src/gallium/targets/opencl/meson.build	2019-06-29 20:56:04.000000000 +0200
++++ mesa.new/src/gallium/targets/opencl/meson.build	2019-06-29 21:10:45.934703892 +0200
+@@ -51,6 +51,7 @@
+     cpp.find_library('clangSema', dirs : llvm_libdir),
+     cpp.find_library('clangAnalysis', dirs : llvm_libdir),
+     cpp.find_library('clangAST', dirs : llvm_libdir),
++    cpp.find_library('clangASTMatchers', dirs : llvm_libdir),
+     cpp.find_library('clangEdit', dirs : llvm_libdir),
+     cpp.find_library('clangLex', dirs : llvm_libdir),
+     cpp.find_library('clangBasic', dirs : llvm_libdir),