added patch for clang compiler invocation error, unfortunately that gives new errors. disabled building opencl-clover for now

3 files changed, 35 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79c6bf4b86b7..ad7789821a2e 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.113971.74470baebbd
+	pkgver = 19.3.0_devel.114998.966a455bb91
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -22,8 +22,7 @@ pkgbase = mesa-git
 	makedepends = wayland-protocols
 	makedepends = meson
 	makedepends = ninja
-	makedepends = llvm=8.0.1
-	makedepends = clang=8.0.1
+	makedepends = llvm-minimal-git
 	depends = libdrm
 	depends = libxxf86vm
 	depends = libxdamage
@@ -36,14 +35,14 @@ pkgbase = mesa-git
 	depends = lm_sensors
 	depends = libclc
 	depends = glslang
-	depends = llvm-libs=8.0.1
+	depends = llvm-libs-minimal-git
 	optdepends = opengl-man-pages: for the OpenGL API man pages
-	provides = mesa=19.2.0_devel.113971.74470baebbd-1
-	provides = vulkan-intel=19.2.0_devel.113971.74470baebbd-1
-	provides = vulkan-radeon=19.2.0_devel.113971.74470baebbd-1
-	provides = vulkan-mesa-layer=19.2.0_devel.113971.74470baebbd-1
-	provides = libva-mesa-driver=19.2.0_devel.113971.74470baebbd-1
-	provides = mesa-vdpau=19.2.0_devel.113971.74470baebbd-1
+	provides = mesa=19.3.0_devel.114998.966a455bb91-1
+	provides = vulkan-intel=19.3.0_devel.114998.966a455bb91-1
+	provides = vulkan-radeon=19.3.0_devel.114998.966a455bb91-1
+	provides = vulkan-mesa-layer=19.3.0_devel.114998.966a455bb91-1
+	provides = libva-mesa-driver=19.3.0_devel.114998.966a455bb91-1
+	provides = mesa-vdpau=19.3.0_devel.114998.966a455bb91-1
 	provides = vulkan-driver
 	provides = opencl-
 	provides = opengl-driver
@@ -57,10 +56,13 @@ pkgbase = mesa-git
 	conflicts = mesa-vdpau
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa
 	source = LICENSE
+	source = ArrayRefized-CompilerInvocation-CreateFromArgs.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+	md5sums = 52394ac3164a6e2f568a10ec09839a25
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
+	sha512sums = 80ff36cc13c884a07f7fe8d5997014094c18a9d47c206afa14cb73dc964c6cffb9e1427939111354ee519c553887fe1dc2bae5a6911cf3d6b7f326a28fa28f31
 
 pkgname = mesa-git
 
diff --git a/ArrayRefized-CompilerInvocation-CreateFromArgs.patch b/ArrayRefized-CompilerInvocation-CreateFromArgs.patch
new file mode 100644
index 000000000000..2ada98599fe0
--- /dev/null
+++ b/ArrayRefized-CompilerInvocation-CreateFromArgs.patch
@@ -0,0 +1,14 @@
+diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 

+b/src/gallium/state_trackers/clover/llvm/invocation.cpp

+index 0a677ce2eaa..0ce3e970303 100644

+--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp

++++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp

+@@ -200,7 +200,7 @@ namespace {

+       const std::string &device_clc_version = dev.device_clc_version();

+

+       if (!clang::CompilerInvocation::CreateFromArgs(

+-             c->getInvocation(), copts.data(), copts.data() + copts.size(), diag))

++             c->getInvocation(), copts, diag))

+          throw invalid_build_options_error();

+

+       diag_buffer->FlushDiagnostics(diag);
diff --git a/PKGBUILD b/PKGBUILD
index b8e859c9afbc..114648f75909 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.113971.74470baebbd
+pkgver=19.3.0_devel.114998.966a455bb91
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -25,14 +25,15 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-laye
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
-        'LICENSE'
+                'LICENSE'
+                'ArrayRefized-CompilerInvocation-CreateFromArgs.patch'
 )
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-)
+         '52394ac3164a6e2f568a10ec09839a25')
 sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
-)
+            '80ff36cc13c884a07f7fe8d5997014094c18a9d47c206afa14cb73dc964c6cffb9e1427939111354ee519c553887fe1dc2bae5a6911cf3d6b7f326a28fa28f31')
 
 # 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.
@@ -91,6 +92,9 @@ prepare() {
     if [  -d _build ]; then
         rm -rf _build
     fi
+    
+    cd mesa
+    patch --forward --strip=1 --input="$srcdir"/ArrayRefized-CompilerInvocation-CreateFromArgs.patch
 }
 
 build () {
@@ -123,7 +127,7 @@ build () {
        -D lmsensors=true \
        -D osmesa=gallium \
        -D shared-glapi=true \
-       -D gallium-opencl=icd \
+       -D gallium-opencl=disabled \
        -D valgrind=false \
        -D vulkan-overlay-layer=true \
        -D tools=[]