<!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>[119216] trunk/dports/multimedia/xine-lib</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="https://trac.macports.org/changeset/119216">119216</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-04-20 12:53:24 -0700 (Sun, 20 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xine-lib: fix build error "clobbers must be last on the x87 stack" with clang</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaxinelibPortfile">trunk/dports/multimedia/xine-lib/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaxinelibfilespatchsrcpostgoommmxhdiff">trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaxinelibfilespatchsrcpostgoommmxcdiff">trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff</a></li>
<li><a href="#trunkdportsmultimediaxinelibfilessrc_post_goom_ifscdiff">trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaxinelibPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/xine-lib/Portfile (119215 => 119216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/xine-lib/Portfile 2014-04-20 19:37:03 UTC (rev 119215)
+++ trunk/dports/multimedia/xine-lib/Portfile 2014-04-20 19:53:24 UTC (rev 119216)
</span><span class="lines">@@ -43,13 +43,7 @@
</span><span class="cx"> port:xorg-libXvMC \
</span><span class="cx"> port:xorg-xcb-util
</span><span class="cx">
</span><del>-if {[string match "*clang*" ${configure.compiler}]} {
- # disable use of MMX in these files; workaround for
- # "error: clobbers must be last on the x87 stack"
- # https://bugs.xine-project.org/show_bug.cgi?id=502
- patchfiles-append src_post_goom_ifs.c.diff
- patchfiles-append patch-src-post-goom-mmx.c.diff
-}
</del><ins>+patchfiles-append patch-src-post-goom-mmx.h.diff
</ins><span class="cx">
</span><span class="cx"> # bad register name `%rax'
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportsmultimediaxinelibfilespatchsrcpostgoommmxcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff (119215 => 119216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff 2014-04-20 19:37:03 UTC (rev 119215)
+++ trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff 2014-04-20 19:53:24 UTC (rev 119216)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- src/post/goom/mmx.c.orig 2012-02-05 13:17:02.000000000 -0600
-+++ src/post/goom/mmx.c 2013-09-26 07:36:28.000000000 -0500
-@@ -1,6 +1,6 @@
- #include "config.h"
-
--#ifdef HAVE_MMX
-+#if 0
-
- #define BUFFPOINTNB 16
- #define BUFFPOINTMASK 0xffff
</del></span></pre></div>
<a id="trunkdportsmultimediaxinelibfilespatchsrcpostgoommmxhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff (0 => 119216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff 2014-04-20 19:53:24 UTC (rev 119216)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+https://bugs.xine-project.org/show_bug.cgi?id=502
+http://anonscm.debian.org/hg/xine-lib/xine-lib-1.2/rev/3361d91b9fda
+--- src/post/goom/mmx.h.orig Sun Apr 20 16:17:32 2014 +0300
++++ src/post/goom/mmx.h Sun Apr 20 18:05:27 2014 +0300
+@@ -730,8 +730,7 @@
+
+ #else
+
+-#define emms() __asm__ __volatile__ ("emms"::: \
+- "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
++#define emms() __asm__ __volatile__ ("emms")
+
+ #endif
+
+
+
+
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaxinelibfilessrc_post_goom_ifscdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff (119215 => 119216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff 2014-04-20 19:37:03 UTC (rev 119215)
+++ trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff 2014-04-20 19:53:24 UTC (rev 119216)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/post/goom/ifs.c.orig 2009-12-01 08:29:12.000000000 +1100
-+++ src/post/goom/ifs.c 2012-05-22 06:21:56.000000000 +1000
-@@ -517,7 +517,7 @@ static void ifs_update (PluginInfo *goom
- points = draw_ifs (goomInfo, &nbpt, fx_data);
- nbpt--;
-
--#ifdef HAVE_MMX
-+#if 0
- movd_m2r (couleursl, mm1);
- punpckldq_r2r (mm1, mm1);
- for (i = 0; i < nbpt; i += increment) {
</del></span></pre>
</div>
</div>
</body>
</html>