<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170040] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170040">170040</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2014-06-16 19:26:36 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add llvmpipe (Mesa) to the JHBuild moduleset and force it when running layout tests
https://bugs.webkit.org/show_bug.cgi?id=131472
Reviewed by Martin Robinson.
This patch reapplies <a href="http://trac.webkit.org/projects/webkit/changeset/167510">r167510</a> with fixes to add llvm as a dependency for llvmpipe.
* Scripts/webkitpy/port/xvfbdriver.py:
(XvfbDriver._start): Use the LLVMPIPE_LIBGL_PATH to set the LD_LIBRARY_PATH
when running WebKitTestRunner with the Xvfb driver.
* gtk/install-dependencies: Add LLVM as a dependency to build llvmpipe.
* gtk/jhbuild.modules: Add Mesa to the modulelist so that the llvmpipe libGL is build, but not
installed.
* gtk/jhbuildrc: Set the LLVMPIPE_LIBGL_PATH environment variable so that the test driver knows
how to properly set the LD_LIBRARY_PATH variable. We do this because it is much easier to
calculate the path in the jhbuildrc than in the test driver code. This simplifies things a great
deal.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriverpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py</a></li>
<li><a href="#trunkToolsgtkinstalldependencies">trunk/Tools/gtk/install-dependencies</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
<li><a href="#trunkToolsgtkjhbuildrc">trunk/Tools/gtk/jhbuildrc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170039 => 170040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-17 02:17:56 UTC (rev 170039)
+++ trunk/Tools/ChangeLog 2014-06-17 02:26:36 UTC (rev 170040)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-06-16 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [GTK] Add llvmpipe (Mesa) to the JHBuild moduleset and force it when running layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=131472
+
+ Reviewed by Martin Robinson.
+
+ This patch reapplies r167510 with fixes to add llvm as a dependency for llvmpipe.
+
+ * Scripts/webkitpy/port/xvfbdriver.py:
+ (XvfbDriver._start): Use the LLVMPIPE_LIBGL_PATH to set the LD_LIBRARY_PATH
+ when running WebKitTestRunner with the Xvfb driver.
+ * gtk/install-dependencies: Add LLVM as a dependency to build llvmpipe.
+ * gtk/jhbuild.modules: Add Mesa to the modulelist so that the llvmpipe libGL is build, but not
+ installed.
+ * gtk/jhbuildrc: Set the LLVMPIPE_LIBGL_PATH environment variable so that the test driver knows
+ how to properly set the LD_LIBRARY_PATH variable. We do this because it is much easier to
+ calculate the path in the jhbuildrc than in the test driver code. This simplifies things a great
+ deal.
+
</ins><span class="cx"> 2014-06-16 Tanay C <tanay.c@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove deprecated API warnings in WebKit/Tools/MiniBrowser/efl/main.c
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py (170039 => 170040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-06-17 02:17:56 UTC (rev 170039)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-06-17 02:26:36 UTC (rev 170040)
</span><span class="lines">@@ -77,6 +77,13 @@
</span><span class="cx"> display_id = self._next_free_display()
</span><span class="cx"> self._lock_file = "/tmp/.X%d-lock" % display_id
</span><span class="cx">
</span><ins>+ server_name = self._port.driver_name()
+ environment = self._port.setup_environ_for_server(server_name)
+
+ 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', ''))
+
</ins><span class="cx"> run_xvfb = ["Xvfb", ":%d" % display_id, "-screen", "0", "800x600x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
</span><span class="cx"> with open(os.devnull, 'w') as devnull:
</span><span class="cx"> self._xvfb_process = self._port.host.executive.popen(run_xvfb, stderr=devnull)
</span><span class="lines">@@ -85,8 +92,6 @@
</span><span class="cx"> # worker because the Xvfb display isn't ready yet. Halting execution a bit should avoid that.
</span><span class="cx"> time.sleep(self._startup_delay_secs)
</span><span class="cx">
</span><del>- server_name = self._port.driver_name()
- environment = self._port.setup_environ_for_server(server_name)
</del><span class="cx"> # We must do this here because the DISPLAY number depends on _worker_number
</span><span class="cx"> environment['DISPLAY'] = ":%d" % display_id
</span><span class="cx"> self._driver_tempdir = self._port.host.filesystem.mkdtemp(prefix='%s-' % self._port.driver_name())
</span></span></pre></div>
<a id="trunkToolsgtkinstalldependencies"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/install-dependencies (170039 => 170040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/install-dependencies 2014-06-17 02:17:56 UTC (rev 170039)
+++ trunk/Tools/gtk/install-dependencies 2014-06-17 02:26:36 UTC (rev 170040)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> libtiff5-dev \
</span><span class="cx"> libxfont-dev \
</span><span class="cx"> libxkbfile-dev \
</span><ins>+ llvm \
</ins><span class="cx"> python-dev \
</span><span class="cx"> ragel \
</span><span class="cx"> x11proto-bigreqs-dev \
</span><span class="lines">@@ -206,6 +207,7 @@
</span><span class="cx"> libpciaccess-devel \
</span><span class="cx"> libtiff-devel \
</span><span class="cx"> libxkbfile-devel \
</span><ins>+ llvm \
</ins><span class="cx"> mesa-libEGL-devel \
</span><span class="cx"> ragel \
</span><span class="cx"> xorg-x11-font-utils \
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (170039 => 170040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2014-06-17 02:17:56 UTC (rev 170039)
+++ trunk/Tools/gtk/jhbuild.modules 2014-06-17 02:26:36 UTC (rev 170040)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> <dep package="gst-plugins-bad"/>
</span><span class="cx"> <dep package="gst-libav"/>
</span><span class="cx"> <dep package="xserver"/>
</span><ins>+ <dep package="mesa"/>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> </metamodule>
</span><span class="cx">
</span><span class="lines">@@ -48,6 +49,8 @@
</span><span class="cx"> href="http://www.freedesktop.org"/>
</span><span class="cx"> <repository type="tarball" name="xorg"
</span><span class="cx"> href="http://xorg.freedesktop.org"/>
</span><ins>+ <repository type="tarball" name="ftp.freedesktop.org"
+ href="ftp://ftp.freedesktop.org"/>
</ins><span class="cx"> <repository type="tarball" name="xmlsoft.org"
</span><span class="cx"> href="ftp://xmlsoft.org"/>
</span><span class="cx"> <repository type="tarball" name="gstreamer"
</span><span class="lines">@@ -331,4 +334,11 @@
</span><span class="cx"> hash="sha256:3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011"/>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><ins>+ <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
+ <branch module="/pub/mesa/10.2.1/MesaLib-10.2.1.tar.bz2" version="10.2.1"
+ checkoutdir="Mesa-10.2.1"
+ repo="ftp.freedesktop.org"
+ hash="sha256:461277909207da689d8152cfbf9e182ea6f70e1e672ab64c67df83725c8d2b54"/>
+ </autotools>
+
</ins><span class="cx"> </moduleset>
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuildrc (170039 => 170040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuildrc 2014-06-17 02:17:56 UTC (rev 170039)
+++ trunk/Tools/gtk/jhbuildrc 2014-06-17 02:26:36 UTC (rev 170040)
</span><span class="lines">@@ -31,3 +31,8 @@
</span><span class="cx"> # We always enable introspection so that we can sniff out problems with our
</span><span class="cx"> # annotations sooner rather than later.
</span><span class="cx"> autogenargs='--enable-introspection'
</span><ins>+
+if use_lib64:
+ os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.2.1', 'lib64'))
+else:
+ os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.2.1', 'lib'))
</ins></span></pre>
</div>
</div>
</body>
</html>