<!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>[117994] trunk/dports/audio/pulseaudio</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/117994">117994</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-03-18 11:12:22 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>pulseaudio: i386 build fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudiopulseaudioPortfile">trunk/dports/audio/pulseaudio/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaudiopulseaudiofilesi386patch">trunk/dports/audio/pulseaudio/files/i386.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudiopulseaudioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/pulseaudio/Portfile (117993 => 117994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/pulseaudio/Portfile 2014-03-18 17:15:24 UTC (rev 117993)
+++ trunk/dports/audio/pulseaudio/Portfile 2014-03-18 18:12:22 UTC (rev 117994)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> # https://bugs.freedesktop.org/show_bug.cgi?id=67795
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup muniversal 1.0
</ins><span class="cx">
</span><span class="cx"> name pulseaudio
</span><span class="cx"> version 5.0
</span><span class="lines">@@ -61,7 +62,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-man-Makefile.am.diff
</del><ins>+patchfiles patch-man-Makefile.am.diff i386.patch
</ins><span class="cx">
</span><span class="cx"> # reconfigure with our intltool.m4 using upstream autogen.sh
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsaudiopulseaudiofilesi386patch"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/pulseaudio/files/i386.patch (0 => 117994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/pulseaudio/files/i386.patch (rev 0)
+++ trunk/dports/audio/pulseaudio/files/i386.patch 2014-03-18 18:12:22 UTC (rev 117994)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+--- src/pulsecore/svolume_mmx.c.orig 2014-03-18 11:04:37.000000000 -0700
++++ src/pulsecore/svolume_mmx.c 2014-03-18 11:05:08.000000000 -0700
+@@ -34,7 +34,7 @@
+
+ #include "sample-util.h"
+
+-#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
+ /* in s: 2 int16_t samples
+ * in v: 2 int32_t volumes, fixed point 16:16
+ * out s: contains scaled and clamped int16_t samples.
+@@ -240,15 +240,15 @@ static void pa_volume_s16re_mmx(int16_t
+ );
+ }
+
+-#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
++#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
+
+ void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) {
+-#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
+ if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) {
+ pa_log_info("Initialising MMX optimized volume functions.");
+
+ pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_mmx);
+ pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_mmx);
+ }
+-#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
++#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
+ }
+--- src/pulsecore/svolume_sse.c.orig 2014-03-18 11:04:30.000000000 -0700
++++ src/pulsecore/svolume_sse.c 2014-03-18 11:04:58.000000000 -0700
+@@ -34,7 +34,7 @@
+
+ #include "sample-util.h"
+
+-#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
+
+ #define VOLUME_32x16(s,v) /* .. | vh | vl | */ \
+ " pxor %%xmm4, %%xmm4 \n\t" /* .. | 0 | 0 | */ \
+@@ -251,15 +251,15 @@ static void pa_volume_s16re_sse2(int16_t
+ );
+ }
+
+-#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
++#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
+
+ void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) {
+-#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
+ if (flags & PA_CPU_X86_SSE2) {
+ pa_log_info("Initialising SSE2 optimized volume functions.");
+
+ pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_sse2);
+ pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_sse2);
+ }
+-#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
++#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>