Merge changes from upstream mesa-git

Merge remote-tracking branch 'origin/master'

1 files changed, 6 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 417a2025ed97..d05dca662d40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=mesa-aco-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=19.2.0_devel.112337.bb75c73e962
+pkgver=19.2.0_devel.112439.11a3679e3ab
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -29,20 +29,21 @@ provides=("mesa=$pkgver-$pkgrel"
           "mesa-vdpau=$pkgver-$pkgrel"
           "vulkan-driver=$pkgver-$pkgrel"
           "opencl-mesa=$pkgver-$pkgrel"
+          "mesa-vulkan-layer=$pkgver-$pkgrel"
           "opengl-driver"
           "opencl-driver")
-conflicts=('mesa' 'mesa-git' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau')
+conflicts=('mesa' 'mesa-git' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-vulkan-layer')
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa-aco::git+https://github.com/daniel-schuermann/mesa'
         'LICENSE'
-        'targets-opencl-Add_clangASTMatchers_library_as_dependency.patch')
+)
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-         '73c3573455404a1eb6a6504ce6ff21f5')
+)
 sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
-            '29241b93f07e6e3473b6c3e690f69cbe3594c2d1257e97325e47f54d35c446ea9262d4ac9c4094cb545a9b7722aa9e07588815418df872ef707a4fa9ffe002d9')
+)
 
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja
@@ -105,8 +106,6 @@ prepare() {
     if [  -d _build ]; then
         rm -rf _build
     fi
-    cd mesa-aco
-    patch --forward --strip=1 --input="$srcdir"/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch
 }
 
 build () {