From 03ad9988492f52bcd8f4e693b196240cccb0b5ba Mon Sep 17 00:00:00 2001
From: "commit-queue@webkit.org"
 <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 23 Oct 2015 17:55:09 +0000
Subject: [PATCH] [GTK] update-webkitgtk-libs should use mesa tarball

https://bugs.webkit.org/show_bug.cgi?id=150470

update-webkitgtk-libs downloads all build dependencies; in fixing
bug 148941 mesa was switched from ftp to git access.  Now an http
tarball is available, which is preferred over accessing via git.

Patch by Mark Salisbury <mark.salisbury@hp.com> on 2015-10-23
Reviewed by Philippe Normand

* gtk/jhbuild.modules:
Mesa access changed to http tarball.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191498 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Tools/ChangeLog           | 15 +++++++++++++++
 Tools/gtk/jhbuild.modules |  7 +++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e91d28d84513..a6a6500eaa26 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2015-10-23  Mark Salisbury  <mark.salisbury@hp.com>
+
+        [GTK] update-webkitgtk-libs should use mesa tarball
+
+        https://bugs.webkit.org/show_bug.cgi?id=150470
+
+        update-webkitgtk-libs downloads all build dependencies; in fixing
+        bug 148941 mesa was switched from ftp to git access.  Now an http
+        tarball is available, which is preferred over accessing via git.
+
+        Reviewed by Philippe Normand
+
+        * gtk/jhbuild.modules:
+        Mesa access changed to http tarball.
+
 2015-10-22  Sam Weinig  <sam@webkit.org>
 
         Navigations on the same host (but with different schemes and ports) should not trigger universal links
diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index 0fe2649f8543..1796666d9834 100644
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -61,6 +61,8 @@
       href="http://download.savannah.gnu.org/releases/"/>
   <repository type="git" name="freedesktop-git"
       href="http://anongit.freedesktop.org/git"/>
+  <repository type="tarball" name="people.freedesktop.org"
+      href="http://people.freedesktop.org"/>
 
   <autotools id="cairo"
              autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no"
@@ -362,9 +364,10 @@
   <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
     <!--- WARNING: At jhbuildrc, when we define the path to the Gallium llvmpipe software rasterizer (needed by XvfbDriver),
           we assume that the directory is named "Mesa". So, don't change the checkoutdir name even if you update the version.  -->
-    <branch module="git/mesa/mesa.git" version="10.5.4" tag="mesa-10.5.4"
+    <branch module="/~brianp/mesa/10.5.4/mesa-10.5.4.tar.xz" version="10.5.4"
             checkoutdir="Mesa"
-            repo="freedesktop-git">
+            repo="people.freedesktop.org"
+            hash="sha256:b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803">
     </branch>
   </autotools>
 
-- 
2.36.0