Title: [167567] trunk/Tools
- Revision
- 167567
- Author
- [email protected]
- Date
- 2014-04-20 10:40:40 -0700 (Sun, 20 Apr 2014)
Log 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
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (167566 => 167567)
--- trunk/Tools/ChangeLog 2014-04-20 13:58:25 UTC (rev 167566)
+++ trunk/Tools/ChangeLog 2014-04-20 17:40:40 UTC (rev 167567)
@@ -1,3 +1,17 @@
+2014-04-20 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[GTK] Add llvmpipe (Mesa) to the JHBuild moduleset and force it when running layout tests
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (167566 => 167567)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-04-20 13:58:25 UTC (rev 167566)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-04-20 17:40:40 UTC (rev 167567)
@@ -103,11 +103,6 @@
environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
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"):
# Turn off GLib memory optimisations https://wiki.gnome.org/Valgrind.
Modified: trunk/Tools/gtk/jhbuild.modules (167566 => 167567)
--- trunk/Tools/gtk/jhbuild.modules 2014-04-20 13:58:25 UTC (rev 167566)
+++ trunk/Tools/gtk/jhbuild.modules 2014-04-20 17:40:40 UTC (rev 167567)
@@ -29,7 +29,6 @@
<dep package="gst-plugins-bad"/>
<dep package="gst-libav"/>
<dep package="xserver"/>
- <dep package="mesa"/>
</dependencies>
</metamodule>
@@ -49,8 +48,6 @@
href=""
<repository type="tarball" name="xorg"
href=""
- <repository type="tarball" name="ftp.freedesktop.org"
- href=""
<repository type="tarball" name="xmlsoft.org"
href=""
<repository type="tarball" name="gstreamer"
@@ -334,11 +331,4 @@
hash="sha256:3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011"/>
</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>
Modified: trunk/Tools/gtk/jhbuildrc (167566 => 167567)
--- trunk/Tools/gtk/jhbuildrc 2014-04-20 13:58:25 UTC (rev 167566)
+++ trunk/Tools/gtk/jhbuildrc 2014-04-20 17:40:40 UTC (rev 167567)
@@ -31,8 +31,3 @@
# We always enable introspection so that we can sniff out problems with our
# 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'))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
