<!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>[172549] 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/172549">172549</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-13 19:52:22 -0700 (Wed, 13 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[EFL] Bump up and patch dependencies to allow building for aarch64
https://bugs.webkit.org/show_bug.cgi?id=135885

Patch by Akos Kiss &lt;akiss@inf.u-szeged.hu&gt; on 2014-08-13
Reviewed by Gyuyoung Kim.

The currently used versions of pixman, libffi, glib, glib-networking,
and fontconfig fail to configure for aarch64, so they are bumped up to
the latest stable version.

Gstreamer-plugins-base configures for aarch64 but incorrectly recogizes
ARM NEON assembly support, so it is patched with a change that has been
accepted by upstream.

* efl/jhbuild.modules:
* efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsefljhbuildmodules">trunk/Tools/efl/jhbuild.modules</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolseflpatchesgstpreventneoncheckinconfigurefrompassingunderaarch64patch">trunk/Tools/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172548 => 172549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-08-14 01:22:58 UTC (rev 172548)
+++ trunk/Tools/ChangeLog        2014-08-14 02:52:22 UTC (rev 172549)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-08-13  Akos Kiss  &lt;akiss@inf.u-szeged.hu&gt;
+
+        [EFL] Bump up and patch dependencies to allow building for aarch64
+        https://bugs.webkit.org/show_bug.cgi?id=135885
+
+        Reviewed by Gyuyoung Kim.
+
+        The currently used versions of pixman, libffi, glib, glib-networking,
+        and fontconfig fail to configure for aarch64, so they are bumped up to
+        the latest stable version.
+
+        Gstreamer-plugins-base configures for aarch64 but incorrectly recogizes
+        ARM NEON assembly support, so it is patched with a change that has been
+        accepted by upstream.
+
+        * efl/jhbuild.modules:
+        * efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch: Added.
+
</ins><span class="cx"> 2014-08-13  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;https://webkit.org/b/135911&gt; WebKit should build on Yosemite with the public SDK.
</span></span></pre></div>
<a id="trunkToolsefljhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuild.modules (172548 => 172549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuild.modules        2014-08-14 01:22:58 UTC (rev 172548)
+++ trunk/Tools/efl/jhbuild.modules        2014-08-14 02:52:22 UTC (rev 172549)
</span><span class="lines">@@ -66,10 +66,10 @@
</span><span class="cx"> 
</span><span class="cx">   &lt;autotools id=&quot;pixman&quot; autogen-sh=&quot;configure&quot;
</span><span class="cx">              autogenargs=&quot;--enable-gtk=no&quot;&gt;
</span><del>-    &lt;branch module=&quot;releases/pixman-0.24.0.tar.gz&quot; version=&quot;0.24.0&quot;
</del><ins>+    &lt;branch module=&quot;releases/pixman-0.32.6.tar.gz&quot; version=&quot;0.32.6&quot;
</ins><span class="cx">             repo=&quot;cairographics.org&quot;
</span><del>-            hash=&quot;sha256:a5647c7158f103eedff5fba799018f4169f6b26b573ab7685812ebc9a1c5d2e4&quot;
-            md5sum=&quot;a2d0b120509bdccb10aa7f4bec3730e4&quot;&gt;
</del><ins>+            hash=&quot;sha256:3dfed13b8060eadabf0a4945c7045b7793cc7e3e910e748a8bb0f0dc3e794904&quot;
+            md5sum=&quot;3a30859719a41bd0f5cccffbfefdd4c2&quot;&gt;
</ins><span class="cx">     &lt;/branch&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -84,10 +84,10 @@
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">   &lt;autotools id=&quot;libffi&quot; autogen-sh=&quot;configure&quot;&gt;
</span><del>-    &lt;branch module=&quot;/pub/libffi/libffi-3.0.11.tar.gz&quot; version=&quot;3.0.11&quot;
</del><ins>+    &lt;branch module=&quot;/pub/libffi/libffi-3.1.tar.gz&quot; version=&quot;3.1&quot;
</ins><span class="cx">              repo=&quot;sourceware.org&quot;
</span><del>-             hash=&quot;sha256:70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283&quot;
-             md5sum=&quot;f69b9693227d976835b4857b1ba7d0e3&quot;/&gt;
</del><ins>+             hash=&quot;sha256:97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb&quot;
+             md5sum=&quot;f5898b29bbfd70502831a212d9249d10&quot;/&gt;
</ins><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">   &lt;!-- FIXME: Original download url doesn't work in Korea. So, Bug 133303 changes the url for now.
</span><span class="lines">@@ -104,19 +104,20 @@
</span><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">       &lt;dep package=&quot;libffi&quot;/&gt;
</span><span class="cx">     &lt;/dependencies&gt;
</span><del>-    &lt;branch module=&quot;/pub/GNOME/sources/glib/2.38/glib-2.38.0.tar.xz&quot; version=&quot;2.38.0&quot;
</del><ins>+    &lt;branch module=&quot;/pub/GNOME/sources/glib/2.41/glib-2.41.2.tar.xz&quot; version=&quot;2.41.2&quot;
</ins><span class="cx">             repo=&quot;ftp.gnome.org&quot;
</span><del>-            hash=&quot;sha256:7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32&quot;/&gt;
</del><ins>+            hash=&quot;sha256:da1f7258655f0e196b9304cb9515784634f3797437923e236bb3466348811c96&quot;
+            md5sum=&quot;9636f60e99b98fd0fdb5239f905ac008&quot;/&gt;
</ins><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">   &lt;autotools id=&quot;glib-networking&quot;&gt;
</span><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">       &lt;dep package=&quot;glib&quot;/&gt;
</span><span class="cx">     &lt;/dependencies&gt;
</span><del>-    &lt;branch module=&quot;/pub/GNOME/sources/glib-networking/2.33/glib-networking-2.33.2.tar.xz&quot; version=&quot;2.33.2&quot;
</del><ins>+    &lt;branch module=&quot;/pub/GNOME/sources/glib-networking/2.41/glib-networking-2.41.4.tar.xz&quot; version=&quot;2.41.4&quot;
</ins><span class="cx">             repo=&quot;ftp.gnome.org&quot;
</span><del>-            hash=&quot;e298cff3935eb752be290bbf734e457f1870bdb5370ee292606e6040a82074e7&quot;
-            md5sum=&quot;5abb364f2a0babe2ec1e3a6d59f69043&quot;/&gt;
</del><ins>+            hash=&quot;sha256:930ad618865dcf81765d0f48cb6f13e22d76203efa59d30604aed0384ce80fd7&quot;
+            md5sum=&quot;f88e163322c0834f9781d6224771ab2e&quot;/&gt;
</ins><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">   &lt;autotools id=&quot;libsoup&quot;
</span><span class="lines">@@ -137,17 +138,17 @@
</span><span class="cx">     &lt;branch repo=&quot;llvm.org&quot; module=&quot;trunk&quot; checkoutdir=&quot;llvm&quot; version=&quot;r206311&quot; revision=&quot;206311&quot;/&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><del>-  &lt;autotools id=&quot;fontconfig&quot; autogen-sh=&quot;configure&quot;&gt;
</del><ins>+  &lt;autotools id=&quot;fontconfig&quot; 
+             autogen-sh=&quot;configure&quot;
+             autogenargs=&quot;--enable-libxml2&quot;&gt;
</ins><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">       &lt;dep package=&quot;freetype6&quot;/&gt;
</span><span class="cx">       &lt;dep package=&quot;libxml2&quot;/&gt;
</span><span class="cx">     &lt;/dependencies&gt;
</span><del>-    &lt;branch module=&quot;software/fontconfig/release/fontconfig-2.8.0.tar.gz&quot; version=&quot;2.8.0&quot;
</del><ins>+    &lt;branch module=&quot;software/fontconfig/release/fontconfig-2.11.1.tar.gz&quot; version=&quot;2.11.1&quot;
</ins><span class="cx">             repo=&quot;freedesktop.org&quot;
</span><del>-            hash=&quot;sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335&quot;
-            md5sum=&quot;77e15a92006ddc2adbb06f840d591c0e&quot;&gt;
-      &lt;patch file=&quot;fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch&quot; strip=&quot;1&quot;/&gt;
-    &lt;/branch&gt;
</del><ins>+            hash=&quot;sha256:b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d&quot;
+            md5sum=&quot;e75e303b4f7756c2b16203a57ac87eba&quot;/&gt;
</ins><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">  &lt;autotools id=&quot;harfbuzz&quot; autogen-sh=&quot;configure&quot;&gt;
</span><span class="lines">@@ -218,14 +219,16 @@
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">   &lt;autotools id=&quot;gst-plugins-base&quot;
</span><del>-             autogen-sh=&quot;configure&quot;
</del><ins>+             autogen-sh=&quot;autogen.sh&quot;
</ins><span class="cx">              autogenargs=&quot;--disable-examples --enable-theora --enable-vorbis&quot;&gt;
</span><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">       &lt;dep package=&quot;gstreamer&quot;/&gt;
</span><span class="cx">     &lt;/dependencies&gt;
</span><span class="cx">     &lt;branch repo=&quot;gstreamer&quot;
</span><span class="cx">             module=&quot;gst-plugins-base/gst-plugins-base-1.2.1.tar.xz&quot; version=&quot;1.2.1&quot;
</span><del>-            hash=&quot;sha256:de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f&quot;/&gt;
</del><ins>+            hash=&quot;sha256:de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f&quot;&gt;
+        &lt;patch file=&quot;gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch&quot; strip=&quot;1&quot;/&gt;
+    &lt;/branch&gt;
</ins><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx">   &lt;autotools id=&quot;gst-plugins-good&quot;
</span></span></pre></div>
<a id="trunkToolseflpatchesgstpreventneoncheckinconfigurefrompassingunderaarch64patch"></a>
<div class="addfile"><h4>Added: trunk/Tools/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch (0 => 172549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch                                (rev 0)
+++ trunk/Tools/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch        2014-08-14 02:52:22 UTC (rev 172549)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+From ad090272c831b5c62f0b310c776e76e3b1ffc88d Mon Sep 17 00:00:00 2001
+From: Iain Lane &lt;iain.lane@canonical.com&gt;
+Date: Fri, 15 Nov 2013 14:17:03 +0000
+Subject: [PATCH] Prevent the NEON check in configure from passing under
+ aarch64.
+
+The test verifies that the NEON C intrinsics work, but the rest of the
+codebase uses lots of direct ARMv7 NEON assembly. The same intrinsics
+work in A64, but the assembly is slightly different.
+
+Prevent the check from passing so that we don't use this where it won't
+work.
+
+Patch originally by William Grant &lt;wgrant@ubuntu.com&gt;
+
+https://bugzilla.gnome.org/show_bug.cgi?id=712367
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index e5c223f..0495371 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -190,6 +190,7 @@ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+   #include &lt;arm_neon.h&gt;
+   int32x4_t testfunc(int16_t *a, int16_t *b) {
++      asm volatile (&quot;vmull.s16 q0, d0, d0&quot; : : : &quot;q0&quot;);
+       return vmull_s16(vld1_s16(a), vld1_s16(b));
+   }
+ ]])],
+-- 
+1.8.4.3
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>