<!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>[172905] 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/172905">172905</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2014-08-25 01:02:01 -0700 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] JHBuild module gst-plugins-base fails to build on x86 with GCC 4.9
https://bugs.webkit.org/show_bug.cgi?id=136152
Reviewed by Philippe Normand.
* gtk/jhbuild.modules: Apply gst-plugins-base-fix-build-gcc-4.9-x86.patch.
* gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch: Added.
Cherry pick upstream patches daa194 and 4e3d101.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsgtkpatchesgstpluginsbasefixbuildgcc49x86patch">trunk/Tools/gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172904 => 172905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-25 07:56:32 UTC (rev 172904)
+++ trunk/Tools/ChangeLog 2014-08-25 08:02:01 UTC (rev 172905)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-25 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] JHBuild module gst-plugins-base fails to build on x86 with GCC 4.9
+ https://bugs.webkit.org/show_bug.cgi?id=136152
+
+ Reviewed by Philippe Normand.
+
+ * gtk/jhbuild.modules: Apply gst-plugins-base-fix-build-gcc-4.9-x86.patch.
+ * gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch: Added.
+ Cherry pick upstream patches daa194 and 4e3d101.
+
</ins><span class="cx"> 2014-08-24 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> GenericHashTraits::peek() is producing copies of passed-in temporary values
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (172904 => 172905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2014-08-25 07:56:32 UTC (rev 172904)
+++ trunk/Tools/gtk/jhbuild.modules 2014-08-25 08:02:01 UTC (rev 172905)
</span><span class="lines">@@ -277,7 +277,9 @@
</span><span class="cx"> <branch module="gst-plugins-base/gst-plugins-base-1.2.1.tar.xz" version="1.2.1"
</span><span class="cx"> repo="gstreamer"
</span><span class="cx"> hash="sha256:de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f"
</span><del>- md5sum="2e75fb03ed7e4d24d88601fcac4d57aa"/>
</del><ins>+ md5sum="2e75fb03ed7e4d24d88601fcac4d57aa">
+ <patch file="gst-plugins-base-fix-build-gcc-4.9-x86.patch" strip="1"/>
+ </branch>
</ins><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="gst-plugins-good" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
</span></span></pre></div>
<a id="trunkToolsgtkpatchesgstpluginsbasefixbuildgcc49x86patch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch (0 => 172905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch (rev 0)
+++ trunk/Tools/gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch 2014-08-25 08:02:01 UTC (rev 172905)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+From de61ce80e57b7df1680312eac2143bc1eb314361 Mon Sep 17 00:00:00 2001
+From: Carlos Alberto Lopez Perez <clopez@igalia.com>
+Date: Fri, 22 Aug 2014 10:11:19 +0000
+Subject: [PATCH] Fix build on x86 with GCC 4.9. Apply the following two
+ upstream patches:
+
+ From daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 Mon Sep 17 00:00:00 2001
+ From: Antoine Jacoutot <ajacoutot@gnome.org>
+ Date: Mon, 20 Jan 2014 15:44:09 +0100
+ Subject: audioresample: Fix build on x86 if emmintrin.h is available but can't
+ be used
+
+ On i386, EMMINTRIN is defined but not usable without SSE so check for
+ __SSE__ and __SSE2__ as well.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=670690
+
+ From 4e3d101aa854cfee633a9689efeb75e5001baa5e Mon Sep 17 00:00:00 2001
+ From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+ Date: Mon, 20 Jan 2014 16:11:04 +0100
+ Subject: audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H for SSE2
+---
+ gst/audioresample/resample.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
+index 98d006c..4410bdd 100644
+--- a/gst/audioresample/resample.c
++++ b/gst/audioresample/resample.c
+@@ -77,13 +77,13 @@
+ #define EXPORT G_GNUC_INTERNAL
+
+ #ifdef _USE_SSE
+-#ifndef HAVE_XMMINTRIN_H
++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
+ #undef _USE_SSE
+ #endif
+ #endif
+
+ #ifdef _USE_SSE2
+-#ifndef HAVE_EMMINTRIN_H
++#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H)
+ #undef _USE_SSE2
+ #endif
+ #endif
+--
+2.1.0
+
</ins></span></pre>
</div>
</div>
</body>
</html>