[gnome-continuous] manifest: switch mesa to egl-drm branch

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit 2e83ca3848afe45d569f77138c4985d07846ecc0
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Tue Jul 22 14:58:17 2014 +0200

    manifest: switch mesa to egl-drm branch

 manifest.json                     |    8 +++++++-
 patches/mesa-nv50-fix-build.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 97772ca..97770c2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -341,7 +341,12 @@
                 "config-opts": ["--disable-documentation"]},
 
                 {"src": "fd-mesa:mesa",
-                 "branch": "10.0",
+                 "branch": "egl-drm",
+                 "cflags": {
+                     "x86_64": "-g -m64 -mtune=generic -fno-rtti",
+                     "i686": "-g -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -fno-rtti"
+                 },
+                 "patches": ["mesa-nv50-fix-build.patch"],
                  "config-opts": [
                      "--enable-pic",
                      "--disable-asm",
@@ -356,6 +361,7 @@
                      "--with-egl-platforms=wayland,x11,drm",
                      "--enable-shared-glapi",
                      "--enable-gbm",
+                     "--enable-gallium-gbm",
                      "--enable-xa",
                      "--with-gallium-drivers=svga,r300,r600,nouveau,swrast",
                      "--enable-gallium-llvm",
diff --git a/patches/mesa-nv50-fix-build.patch b/patches/mesa-nv50-fix-build.patch
new file mode 100644
index 0000000..3c6dc1e
--- /dev/null
+++ b/patches/mesa-nv50-fix-build.patch
@@ -0,0 +1,26 @@
+From 81830c22e435b3afdb7da1d89e552db667d37cb0 Mon Sep 17 00:00:00 2001
+From: Vadim Rutkovsky <vrutkovs redhat com>
+Date: Tue, 22 Jul 2014 11:44:04 +0200
+Subject: [PATCH] Build nouveau with -fno-rtti
+
+Origin: http://pkgs.fedoraproject.org/cgit/mesa.git/plain/mesa-10.0-nv50-fix-build.patch
+---
+ src/gallium/drivers/nouveau/codegen/nv50_ir.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
+index ca3c806..54ce6f8 100644
+--- a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
++++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
+@@ -739,7 +739,7 @@ Instruction::clone(ClonePolicy<Function>& pol, Instruction *i) const
+    if (!i)
+       i = new_Instruction(pol.context(), op, dType);
+ #ifndef NDEBUG // non-conformant assert, so this is required
+-   assert(typeid(*i) == typeid(*this));
++   //assert(typeid(*i) == typeid(*this));
+ #endif
+ 
+    pol.set<Instruction>(this, i);
+-- 
+1.9.3
+