[gnome-continuous] manifest: patch for mesa to fix the build failure

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 7473f34f9268ebfea3a3e71fb29917e41a7a6bdf
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Mar 4 22:37:10 2017 +0000

    manifest: patch for mesa to fix the build failure

 manifest.json                 |    6 ++--
 patches/mesa-wayland-drm.path |   60 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 42303f3..ff96a29 100644
--- a/manifest.json
+++ b/manifest.json
@@ -386,13 +386,13 @@
                  "patches": ["python-mako-buildsys.patch"]},
 
                 {"src": "fd-mesa:mesa",
-                "tag": "b3135c3cf36226e391227be4c546a6a0abae6d9d",
-                "tag-reason": "Build failure with commit e135ce6f08841aaa26685964e5ba3cfb19fd3d36",
                  "cflags": {
                      "x86_64": "-g -m64 -mtune=generic",
                      "i686": "-g -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables"
                  },
-                 "patches": ["mesa-nv50-fix-build.patch", "mesa-llvm-config-dir.patch"],
+                 "patches": ["mesa-nv50-fix-build.patch",
+                            "mesa-wayland-drm.patch",
+                            "mesa-llvm-config-dir.patch"],
                  "config-opts": [
                      "--host=x86_64-gnomeostree-linux",
                      "--disable-asm",
diff --git a/patches/mesa-wayland-drm.path b/patches/mesa-wayland-drm.path
new file mode 100644
index 0000000..32b5863
--- /dev/null
+++ b/patches/mesa-wayland-drm.path
@@ -0,0 +1,60 @@
+From patchwork Sat Mar  4 21:42:18 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [Mesa-dev] automake: move wayland-drm prior to Vulkan
+From: Emil Velikov <emil l velikov gmail com>
+X-Patchwork-Id: 142180
+Message-Id: <20170304214218 23847-1-emil l velikov gmail com>
+To: mesa-dev lists freedesktop org
+Cc: =?UTF-8?q?Vedran=20Mileti=C4=87?= <vedran miletic net>,
+ emil l velikov gmail com
+Date: Sat,  4 Mar 2017 21:42:18 +0000
+
+From: Emil Velikov <emil velikov collabora com>
+
+Earlier commit was picked from a larger series, but did not consider
+that it removed the vulkan <> wayland-drm interdependency.
+
+Rather than reverting everything, temporarily move wayland-drm further
+up to resolve the issue. Since it [wayland-drm] does not have any
+in-mesa dependencies that's perfectly safe.
+
+Cc: Vedran Miletić <vedran miletic net>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100060
+Fixes: e135ce6f088 ("vulkan: Build common Vulkan code earlier")
+Signed-off-by: Emil Velikov <emil l velikov gmail com>
+---
+Vedran, can you please give this a test ?
+---
+ src/Makefile.am | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cab68b72d6..25b9253fc3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -75,6 +75,11 @@ endif
+ # include only conditionally ?
+ SUBDIRS += compiler
+ 
++## Optionally required by GBM, EGL and Vulkan
++if HAVE_PLATFORM_WAYLAND
++SUBDIRS += egl/wayland/wayland-drm
++endif
++
+ if HAVE_VULKAN_COMMON
+ SUBDIRS += vulkan
+ endif
+@@ -98,11 +103,6 @@ if HAVE_DRI_GLX
+ SUBDIRS += glx
+ endif
+ 
+-## Optionally required by GBM and EGL
+-if HAVE_PLATFORM_WAYLAND
+-SUBDIRS += egl/wayland/wayland-drm
+-endif
+-
+ ## Optionally required by EGL (aka PLATFORM_GBM)
+ if HAVE_GBM
+ SUBDIRS += gbm