Changeset 167567 in webkit

Timestamp:

Apr 20, 2014 10:40:40 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r167510.
​https://bugs.webkit.org/show_bug.cgi?id=131915

broke GTK Debug bot (Requested by philn on #webkit).

Reverted changeset:

"[GTK] Add llvmpipe (Mesa) to the JHBuild moduleset and force
it when running layout tests"
​https://bugs.webkit.org/show_bug.cgi?id=131472
​http://trac.webkit.org/changeset/167510

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/gtk.py (modified) (1 diff)
• gtk/jhbuild.modules (modified) (3 diffs)
• gtk/jhbuildrc (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167510.
+        https://bugs.webkit.org/show_bug.cgi?id=131915
+
+        broke GTK Debug bot (Requested by philn on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Add llvmpipe (Mesa) to the JHBuild moduleset and force
+        it when running layout tests"
+        https://bugs.webkit.org/show_bug.cgi?id=131472
+        http://trac.webkit.org/changeset/167510
+
 2014-04-18  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/gtk.py

@@ -104 +104 @@
         environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib')
         environment['AUDIO_RESOURCES_PATH'] = self.path_from_webkit_base('Source', 'WebCore', 'platform', 'audio', 'resources')
-
-        llvmpipe_libgl_path = os.environ.get('LLVMPIPE_LIBGL_PATH')
-        if llvmpipe_libgl_path:
-            environment['LD_LIBRARY_PATH'] = '%s:%s' % (llvmpipe_libgl_path, os.environ.get('LD_LIBRARY_PATH', ''))
-
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
         if self.get_option("leaks"):

trunk/Tools/gtk/jhbuild.modules

@@ -30 +30 @@
       <dep package="gst-libav"/>
       <dep package="xserver"/>
-      <dep package="mesa"/>
     </dependencies>
   </metamodule>
@@ -50 +49 @@
   <repository type="tarball" name="xorg"
       href="http://xorg.freedesktop.org"/>
-  <repository type="tarball" name="ftp.freedesktop.org"
-      href="ftp://ftp.freedesktop.org"/>
   <repository type="tarball" name="xmlsoft.org"
       href="ftp://xmlsoft.org"/>
@@ -335 +332 @@
   </autotools>
 
-  <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri" skip-install="true">
-    <branch module="/pub/mesa/10.0.4/MesaLib-10.0.4.tar.bz2" version="10.0.4"
-            checkoutdir="Mesa-10.0.4"
-            repo="ftp.freedesktop.org"
-            hash="sha256:ff6eb552becb25a318e53ac56b95a8c2d49e83ad674d87f52e811c0a20c25a40"/>
-  </autotools>
-
 </moduleset>

trunk/Tools/gtk/jhbuildrc

@@ -32 +32 @@
 # annotations sooner rather than later.
 autogenargs='--enable-introspection'
-
-if use_lib64:
-    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.0.4', 'lib64'))
-else:
-    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.0.4', 'lib'))