[117994] trunk/dports/audio/pulseaudio

[jeremyhu at macports.org]

Revision: 117994
          https://trac.macports.org/changeset/117994
Author:   jeremyhu at macports.org
Date:     2014-03-18 11:12:22 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
pulseaudio: i386 build fix

Modified Paths:
--------------
    trunk/dports/audio/pulseaudio/Portfile

Added Paths:
-----------
    trunk/dports/audio/pulseaudio/files/i386.patch

Modified: trunk/dports/audio/pulseaudio/Portfile
===================================================================
--- 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)
@@ -5,6 +5,7 @@
 #       https://bugs.freedesktop.org/show_bug.cgi?id=67795
 
 PortSystem      1.0
+PortGroup       muniversal 1.0
 
 name            pulseaudio
 version         5.0
@@ -61,7 +62,7 @@
     }
 }
 
-patchfiles      patch-man-Makefile.am.diff
+patchfiles      patch-man-Makefile.am.diff i386.patch
 
 # reconfigure with our intltool.m4 using upstream autogen.sh
 

Added: trunk/dports/audio/pulseaudio/files/i386.patch
===================================================================
--- 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)
@@ -0,0 +1,60 @@
+--- 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__) */
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140318/8de62677/attachment.html>